Skip to content
New issue

Have a question about this project? # for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “#”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? # to your account

Remove syntax and syntax_pos thread locals #48811

Merged
merged 1 commit into from
Mar 14, 2018
Merged

Conversation

Zoxc
Copy link
Contributor

@Zoxc Zoxc commented Mar 7, 2018

This moves syntax and syntax_pos globals into a struct which are pointed to by thread locals. Most of the changes here are indentation changes in test. It would probably be a good idea to ignore whitespace changes while reviewing. Some indentation is unchanged to avoid merge conflicts.

r? @michaelwoerister

@rust-highfive rust-highfive added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Mar 7, 2018
@Zoxc Zoxc force-pushed the syntax-globals branch from 36c0250 to 0d3c306 Compare March 7, 2018 05:24
@bors
Copy link
Collaborator

bors commented Mar 8, 2018

☔ The latest upstream changes (presumably #46882) made this pull request unmergeable. Please resolve the merge conflicts.

@Zoxc Zoxc force-pushed the syntax-globals branch 2 times, most recently from d201f5b to 813469c Compare March 9, 2018 04:56
@bors
Copy link
Collaborator

bors commented Mar 11, 2018

☔ The latest upstream changes (presumably #48549) made this pull request unmergeable. Please resolve the merge conflicts.

@michaelwoerister
Copy link
Member

Thanks, @Zoxc! I think this is an improvement overall.

This attribute marking machinery seems quite fishy. We should look into making that not use global state.

@bors r+

@bors
Copy link
Collaborator

bors commented Mar 12, 2018

📌 Commit 20c1f28 has been approved by michaelwoerister

@bors bors added S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. and removed S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. labels Mar 12, 2018
@Zoxc Zoxc force-pushed the syntax-globals branch 3 times, most recently from 2f80aea to eb10e3f Compare March 12, 2018 20:15
@Zoxc
Copy link
Contributor Author

Zoxc commented Mar 13, 2018

I removed the &Globals argument from syntax::with_globals, now it just gives you a new set of globals.

@michaelwoerister
Copy link
Member

@bors r+

@bors
Copy link
Collaborator

bors commented Mar 13, 2018

📌 Commit eb10e3f has been approved by michaelwoerister

@bors
Copy link
Collaborator

bors commented Mar 14, 2018

🔒 Merge conflict

@bors bors added S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. and removed S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. labels Mar 14, 2018
@Zoxc
Copy link
Contributor Author

Zoxc commented Mar 14, 2018

@bors r=michaelwoerister

@bors
Copy link
Collaborator

bors commented Mar 14, 2018

📌 Commit cbdf4ec has been approved by michaelwoerister

@bors bors added S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. and removed S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. labels Mar 14, 2018
@bors
Copy link
Collaborator

bors commented Mar 14, 2018

⌛ Testing commit cbdf4ec with merge d089fe9...

bors added a commit that referenced this pull request Mar 14, 2018
Remove syntax and syntax_pos thread locals

This moves `syntax` and `syntax_pos` globals into a struct which are pointed to by thread locals. Most of the changes here are indentation changes in test. It would probably be a good idea to ignore whitespace changes while reviewing. Some indentation is unchanged to avoid merge conflicts.

r? @michaelwoerister
@bors
Copy link
Collaborator

bors commented Mar 14, 2018

☀️ Test successful - status-appveyor, status-travis
Approved by: michaelwoerister
Pushing d089fe9 to master...

# for free to join this conversation on GitHub. Already have an account? # to comment
Labels
S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants