Skip to content

Remove syntax and syntax_pos thread locals - #48811

Merged
bors merged 1 commit into
rust-lang:masterfrom
Zoxc:syntax-globals
Mar 14, 2018
Merged

Remove syntax and syntax_pos thread locals#48811
bors merged 1 commit into
rust-lang:masterfrom
Zoxc:syntax-globals

Conversation

@Zoxc

@ZoxcZoxc commented Mar 7, 2018

Copy link
Copy Markdown
Contributor

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-highfiverust-highfive added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Mar 7, 2018
@bors

bors commented Mar 8, 2018

Copy link
Copy Markdown
Collaborator

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

@Zoxc
Zoxcforce-pushed the syntax-globals branch 2 times, most recently from d201f5b to 813469cCompareMarch 9, 2018 04:56
@bors

bors commented Mar 11, 2018

Copy link
Copy Markdown
Collaborator

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

@michaelwoerister

michaelwoerister commented Mar 12, 2018

Copy link
Copy Markdown
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

bors commented Mar 12, 2018

Copy link
Copy Markdown
Collaborator

📌 Commit 20c1f28 has been approved by michaelwoerister

@borsbors 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
Zoxcforce-pushed the syntax-globals branch 3 times, most recently from 2f80aea to eb10e3fCompareMarch 12, 2018 20:15
@Zoxc

Zoxc commented Mar 13, 2018

Copy link
Copy Markdown
ContributorAuthor

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

@michaelwoerister

michaelwoerister commented Mar 13, 2018

Copy link
Copy Markdown
Member

@bors r+

@bors

bors commented Mar 13, 2018

Copy link
Copy Markdown
Collaborator

📌 Commit eb10e3f has been approved by michaelwoerister

@bors

bors commented Mar 14, 2018

Copy link
Copy Markdown
Collaborator

🔒 Merge conflict

@borsbors 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

Zoxc commented Mar 14, 2018

Copy link
Copy Markdown
ContributorAuthor

@bors r=michaelwoerister

@bors

bors commented Mar 14, 2018

Copy link
Copy Markdown
Collaborator

📌 Commit cbdf4ec has been approved by michaelwoerister

@borsbors 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

bors commented Mar 14, 2018

Copy link
Copy Markdown
Collaborator

⌛ Testing commit cbdf4ec with merge d089fe9...

bors added a commit that referenced this pull request Mar 14, 2018
@bors
Auto merge of#48811- Zoxc:syntax-globals, r=michaelwoerister
d089fe9
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

bors commented Mar 14, 2018

Copy link
Copy Markdown
Collaborator

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

@bors
bors merged commit cbdf4ec into rust-lang:masterMar 14, 2018
This was referenced Mar 14, 2018
Merged
Merged
Merged
Merged
@Zoxc
Zoxc deleted the syntax-globals branch March 14, 2018 16:38
@michaelwoeristermichaelwoerister mentioned this pull request Mar 16, 2018
Merged
@aturonaturon mentioned this pull request Aug 16, 2019
Closed
37 tasks
Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

No reviews

Assignees

@michaelwoeristermichaelwoerister

Labels

S-waiting-on-borsStatus: Waiting on bors to run and complete tests. Bors will change the label on completion.

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

4 participants

@Zoxc@bors@michaelwoerister@rust-highfive