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

syntax: move stuff around #65916

Merged
merged 9 commits into from
Nov 8, 2019
Merged

syntax: move stuff around #65916

merged 9 commits into from
Nov 8, 2019

Conversation

Centril
Copy link
Contributor

@Centril Centril commented Oct 29, 2019

@rust-highfive

This comment has been minimized.

Sign in to view
davidtwco
davidtwco requested changes Oct 29, 2019
View reviewed changes
Copy link
Member

@davidtwco davidtwco left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I'd like to see the last commit's changes squashed into the relevant commits that introduced the issues, but otherwise, r=me.

@Centril
Copy link
Contributor Author

Centril commented Oct 30, 2019

Squashed -- was easier than I feared. :)

@bors r=davidtwco

@bors
Copy link
Contributor

bors commented Oct 30, 2019

📌 Commit 27adef62d6e8f73e5645eb8ad7f5bbcb9d595122 has been approved by davidtwco

@bors bors added the S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. label Oct 30, 2019
@Centril Centril mentioned this pull request Oct 30, 2019
Closed
@Centril
Copy link
Contributor Author

Centril commented Oct 30, 2019

I'm not even going to try getting this through CI now that the toolstate week is in effect. :)

@bors r-

@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 Oct 30, 2019
@Centril Centril added S-blocked Status: Marked as blocked ❌ on something else such as an RFC or other implementation work. and removed S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. labels Oct 30, 2019
@bors

This comment has been minimized.

Sign in to view
@Centril Centril force-pushed the split-syntax-3 branch 2 times, most recently from 2d04b43 to 948674b Compare November 6, 2019 06:09
@Centril
Copy link
Contributor Author

Centril commented Nov 6, 2019

Toolstate should be breakable again, @bors r=davidtwco

@bors
Copy link
Contributor

bors commented Nov 6, 2019

📌 Commit 948674b6e94af25d7c64dbd91ba235467140457a has been approved by davidtwco

@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-blocked Status: Marked as blocked ❌ on something else such as an RFC or other implementation work. labels Nov 6, 2019
@bors

This comment has been minimized.

Sign in to view
@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 Nov 6, 2019
@Centril
Copy link
Contributor Author

Centril commented Nov 6, 2019

@bors r=davidtwco

@bors
Copy link
Contributor

bors commented Nov 6, 2019

📌 Commit 7514dcdb8e8cf50a0ca6415d1b513e424b7c3144 has been approved by davidtwco

@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 Nov 6, 2019
@bors

This comment has been minimized.

Sign in to view
@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 Nov 7, 2019
@Centril
Copy link
Contributor Author

Centril commented Nov 7, 2019

@bors r=davidtwco

@bors
Copy link
Contributor

bors commented Nov 7, 2019

📌 Commit cc9c139 has been approved by davidtwco

@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 Nov 7, 2019
Centril added a commit to Centril/rust that referenced this pull request Nov 7, 2019
@Centril
Rollup merge of rust-lang#65916 - Centril:split-syntax-3, r=davidtwco
28c1136 
syntax: move stuff around

Part of rust-lang#65324.

r? @davidtwco
cc @estebank @petrochenkov
@Centril Centril mentioned this pull request Nov 7, 2019
Merged
bors added a commit that referenced this pull request Nov 7, 2019
@bors
Auto merge of #66189 - Centril:rollup-3bsf45s, r=Centril
3f0f2bf 
Rollup of 5 pull requests

Successful merges:

 - #63793 (Have tidy ensure that we document all `unsafe` blocks in libcore)
 - #64696 ([rustdoc] add sub settings)
 - #65916 (syntax: move stuff around)
 - #66087 (Update some build-pass ui tests to use check-pass where applicable)
 - #66182 (invalid_value lint: fix help text)

Failed merges:

r? @ghost
@petrochenkov petrochenkov mentioned this pull request Nov 7, 2019
Merged
bors added a commit that referenced this pull request Nov 7, 2019
@bors
Auto merge of #66189 - Centril:rollup-3bsf45s, r=Centril
e8f43b7 
Rollup of 5 pull requests

Successful merges:

 - #63793 (Have tidy ensure that we document all `unsafe` blocks in libcore)
 - #64696 ([rustdoc] add sub settings)
 - #65916 (syntax: move stuff around)
 - #66087 (Update some build-pass ui tests to use check-pass where applicable)
 - #66182 (invalid_value lint: fix help text)

Failed merges:

r? @ghost
@bors bors merged commit cc9c139 into rust-lang:master Nov 8, 2019
tesuji added a commit to tesuji/rust-clippy that referenced this pull request Nov 8, 2019
@tesuji
rustup rust-lang/rust#65916
1243368
@tesuji tesuji mentioned this pull request Nov 8, 2019
Merged
bors added a commit to rust-lang/rust-clippy that referenced this pull request Nov 8, 2019
@bors
Auto merge of #4792 - lzutao:rustup-65916, r=Manishearth
4896a9c 
 rustup rust-lang/rust#65916

cc rust-lang/rust#65916
changelog: none
tesuji added a commit to tesuji/rust-clippy that referenced this pull request Nov 8, 2019
@tesuji
rustup rust-lang/rust#65916
acbe224
bors added a commit to rust-lang/rust-clippy that referenced this pull request Nov 8, 2019
@bors
Auto merge of #4792 - lzutao:rustup-65916, r=Manishearth
4192dbe 
 rustup rust-lang/rust#65916

cc rust-lang/rust#65916
changelog: none
@Centril Centril deleted the split-syntax-3 branch November 8, 2019 04:51
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@davidtwco davidtwco davidtwco requested changes

Assignees

@davidtwco davidtwco

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.
4 participants
@Centril @rust-highfive @bors @davidtwco