Remove syntax and syntax_pos thread locals#48811
Merged
bors merged 1 commit intorust-lang:masterfrom Mar 14, 2018
Merged
Conversation
Collaborator
|
☔ The latest upstream changes (presumably #46882) made this pull request unmergeable. Please resolve the merge conflicts. |
d201f5b to
813469c
Compare
Collaborator
|
☔ The latest upstream changes (presumably #48549) made this pull request unmergeable. Please resolve the merge conflicts. |
Member
Collaborator
|
📌 Commit 20c1f28 has been approved by |
2f80aea to
eb10e3f
Compare
Contributor
Author
|
I removed the |
Member
|
@bors r+ |
Collaborator
|
📌 Commit eb10e3f has been approved by |
Collaborator
|
🔒 Merge conflict |
Contributor
Author
|
@bors r=michaelwoerister |
Collaborator
|
📌 Commit cbdf4ec has been approved by |
Collaborator
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
Collaborator
|
☀️ Test successful - status-appveyor, status-travis |
This was referenced Mar 14, 2018
37 tasks
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
This moves
syntaxandsyntax_posglobals 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