Skip to content

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

Merged
bors merged 2 commits into
rust-lang:masterfrom
Zoxc:edition-cleanup
May 22, 2019
Merged

Move edition outside the hygiene lock and avoid accessing it#59742
bors merged 2 commits into
rust-lang:masterfrom
Zoxc:edition-cleanup

Conversation

@Zoxc

@ZoxcZoxc commented Apr 5, 2019

Copy link
Copy Markdown
Contributor

@rust-highfiverust-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
@rust-highfive

This comment has been minimized.

Sign in to view
@rust-highfive

This comment has been minimized.

Sign in to view
@rust-highfive

This comment has been minimized.

Sign in to view
petrochenkov
petrochenkov reviewed Apr 7, 2019
View reviewed changes
Comment threadsrc/librustc_resolve/macros.rs Outdated
petrochenkov
petrochenkov reviewed Apr 7, 2019
View reviewed changes
Comment threadsrc/libsyntax_ext/lib.rs Outdated
petrochenkov
petrochenkov reviewed Apr 7, 2019
View reviewed changes
Comment threadsrc/librustdoc/test.rs Outdated
petrochenkov
petrochenkov reviewed Apr 7, 2019
View reviewed changes
Comment threadsrc/libsyntax/ext/base.rs Outdated
petrochenkov
petrochenkov reviewed Apr 7, 2019
View reviewed changes
Comment threadsrc/libsyntax/std_inject.rs Outdated
petrochenkov
petrochenkov reviewed Apr 7, 2019
View reviewed changes
Comment threadsrc/libsyntax_pos/edition.rs Outdated
petrochenkov
petrochenkov reviewed Apr 7, 2019
View reviewed changes
Comment threadsrc/libsyntax_pos/hygiene.rs Outdated
@petrochenkovpetrochenkov 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
Zoxcforce-pushed the edition-cleanup branch 2 times, most recently from 14e7688 to 47b2bb3CompareApril 9, 2019 06:47
@Zoxc

Zoxc commented Apr 9, 2019

Copy link
Copy Markdown
ContributorAuthor

I've addressed your comments.

@rust-highfive

This comment has been minimized.

Sign in to view
@petrochenkov

petrochenkov commented Apr 9, 2019

Copy link
Copy Markdown
Contributor

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

@Zoxc
Zoxcforce-pushed the edition-cleanup branch 2 times, most recently from 71f2f0f to 3b1d944CompareApril 10, 2019 03:50
@petrochenkov

petrochenkov commented Apr 10, 2019

Copy link
Copy Markdown
Contributor

@bors r+

@bors

bors commented Apr 10, 2019

Copy link
Copy Markdown
Collaborator

📌 Commit 3b1d94443c883e79fda0f2464816353796ecc4ec has been approved by petrochenkov

@bors

bors commented Apr 10, 2019

Copy link
Copy Markdown
Collaborator

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

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

Centril commented May 22, 2019

Copy link
Copy Markdown
Contributor

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 ofrust-lang#59742- Zoxc:edition-cleanup, r=petrochenkov
a8d1b81
Move `edition` outside the hygiene lock and avoid accessing it
r? @petrochenkov
@CentrilCentril 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

bors commented May 22, 2019

Copy link
Copy Markdown
Collaborator

⌛ Testing commit 0b37900 with merge dbfe70d...

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

Reviewers

@petrochenkovpetrochenkovpetrochenkov left review comments

Assignees

@petrochenkovpetrochenkov

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.

8 participants

@Zoxc@rust-highfive@petrochenkov@bors@rust-timer@kennytm@Dylan-DPC-zz@Centril