Skip to content
New issue

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

Sign up for GitHub

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

Already on GitHub? Sign in to your account

Jump to bottom

Move edition outside the hygiene lock and avoid accessing it #59742

Merged
merged 2 commits into from
May 22, 2019
Merged

Move edition outside the hygiene lock and avoid accessing it #59742

merged 2 commits into from
May 22, 2019

Conversation

Zoxc
Copy link
Contributor

@Zoxc Zoxc commented Apr 5, 2019

@rust-highfive rust-highfive added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Apr 5, 2019
@rust-highfive

This comment has been minimized.

Sign in to view
@Zoxc Zoxc force-pushed the edition-cleanup branch from ce1c03d to 94887d1 Compare April 6, 2019 01:12
@rust-highfive

This comment has been minimized.

Sign in to view
@Zoxc Zoxc force-pushed the edition-cleanup branch from 94887d1 to b98ac4f Compare April 6, 2019 05:12
@rust-highfive

This comment has been minimized.

Sign in to view
@Zoxc Zoxc force-pushed the edition-cleanup branch from b98ac4f to 5bf9e32 Compare April 7, 2019 10:49
@rust-highfive

This comment has been minimized.

Sign in to view
petrochenkov
petrochenkov reviewed Apr 7, 2019
View reviewed changes
src/librustdoc/test.rs Outdated Show resolved Hide resolved
@petrochenkov petrochenkov 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-review Status: Awaiting review from the assignee but also interested parties. labels Apr 7, 2019
@Zoxc Zoxc force-pushed the edition-cleanup branch 2 times, most recently from 14e7688 to 47b2bb3 Compare April 9, 2019 06:47
@Zoxc
Copy link
Contributor Author

Zoxc commented Apr 9, 2019

I've addressed your comments.

@rust-highfive

This comment has been minimized.

Sign in to view
@petrochenkov
Copy link
Contributor

r=me with the remaining comment addressed and CI failures fixed

@Zoxc Zoxc force-pushed the edition-cleanup branch 2 times, most recently from 71f2f0f to 3b1d944 Compare April 10, 2019 03:50
@petrochenkov
Copy link
Contributor

@bors r+

@bors
Copy link
Contributor

bors commented Apr 10, 2019

📌 Commit 3b1d94443c883e79fda0f2464816353796ecc4ec has been approved by petrochenkov

@bors
Copy link
Contributor

bors commented Apr 10, 2019

🌲 The tree is currently closed for pull requests below priority 15, this pull request will be tested once the tree is reopened

@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 Apr 10, 2019
@Centril Centril mentioned this pull request May 22, 2019
Closed
@Centril
Copy link
Contributor

Centril commented May 22, 2019

Rolled up; @bors retry

@bors

This comment has been minimized.

Sign in to view
@Centril

This comment has been minimized.

Sign in to view
@rust-highfive

This comment has been minimized.

Sign in to view
@Centril

This comment has been minimized.

Sign in to view
@bors

This comment has been minimized.

Sign in to view
Centril added a commit to Centril/rust that referenced this pull request May 22, 2019
@Centril
Rollup merge of rust-lang#59742 - Zoxc:edition-cleanup, r=petrochenkov
a8d1b81 
Move `edition` outside the hygiene lock and avoid accessing it

r? @petrochenkov
@Centril Centril mentioned this pull request May 22, 2019
Merged
@Centril

This comment has been minimized.

Sign in to view
@bors

This comment has been minimized.

Sign in to view
@Centril

This comment has been minimized.

Sign in to view
@bors

This comment has been minimized.

Sign in to view
@rust-highfive

This comment has been minimized.

Sign in to view
@Centril

This comment has been minimized.

Sign in to view
@bors

This comment has been minimized.

Sign in to view
@Centril

This comment has been minimized.

Sign in to view
bors added a commit that referenced this pull request May 22, 2019
@bors
Auto merge of #61027 - Centril:rollup-oewauf1, r=Centril
dbfe70d 
Rollup of 10 pull requests

Successful merges:

 - #59742 (Move `edition` outside the hygiene lock and avoid accessing it)
 - #60581 (convert custom try macro to `?`)
 - #60963 (Update boxed::Box docs on memory layout)
 - #60973 (Avoid symbol interning in `file_metadata`.)
 - #60982 (Do not fail on child without DefId)
 - #60991 (LocalDecl push returns Local len)
 - #60995 (Add stream_to_parser_with_base_dir)
 - #60998 (static_assert: make use of anonymous constants)
 - #61003 (Remove impls for `InternedString`/string equality.)
 - #61006 (adjust deprecation date of mem::uninitialized)

Failed merges:

r? @ghost
@rust-highfive

This comment has been minimized.

Sign in to view
@bors
Copy link
Contributor

bors commented May 22, 2019

⌛ Testing commit 0b37900 with merge dbfe70d...

@bors bors merged commit 0b37900 into rust-lang:master May 22, 2019
@pnkfelix pnkfelix mentioned this pull request May 23, 2019
Closed
@Zoxc Zoxc deleted the edition-cleanup branch May 24, 2019 04:32
@petrochenkov petrochenkov mentioned this pull request Jun 4, 2019
Merged
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@petrochenkov petrochenkov petrochenkov left review comments

Assignees

@petrochenkov petrochenkov

Labels
S-waiting-on-bors Status: 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.
8 participants
@Zoxc @rust-highfive @petrochenkov @bors @rust-timer @kennytm @Dylan-DPC-zz @Centril