Skip to content

syntax: move stuff around - #65916

Merged
bors merged 9 commits into
rust-lang:masterfrom
Centril:split-syntax-3
Nov 8, 2019
Merged

syntax: move stuff around#65916
bors merged 9 commits into
rust-lang:masterfrom
Centril:split-syntax-3

Conversation

@Centril

Copy link
Copy Markdown
Contributor

@rust-highfive

This comment has been minimized.

@davidtwcodavidtwco left a comment

Copy link
Copy Markdown
Member

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

Squashed -- was easier than I feared. :)

@bors r=davidtwco

@bors

bors commented Oct 30, 2019

Copy link
Copy Markdown
Collaborator

📌 Commit 27adef62d6e8f73e5645eb8ad7f5bbcb9d595122 has been approved by davidtwco

@borsbors 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
@CentrilCentril mentioned this pull request Oct 30, 2019
@Centril

Copy link
Copy Markdown
ContributorAuthor

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

@bors r-

@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 Oct 30, 2019
@CentrilCentril added S-blocked Status: 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.

@Centril
Centrilforce-pushed the split-syntax-3 branch 2 times, most recently from 2d04b43 to 948674bCompareNovember 6, 2019 06:09
@Centril

Copy link
Copy Markdown
ContributorAuthor

Toolstate should be breakable again, @bors r=davidtwco

@bors

bors commented Nov 6, 2019

Copy link
Copy Markdown
Collaborator

📌 Commit 948674b6e94af25d7c64dbd91ba235467140457a has been approved by davidtwco

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

This comment has been minimized.

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

Copy link
Copy Markdown
ContributorAuthor

@bors r=davidtwco

@bors

bors commented Nov 6, 2019

Copy link
Copy Markdown
Collaborator

📌 Commit 7514dcdb8e8cf50a0ca6415d1b513e424b7c3144 has been approved by davidtwco

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

This comment has been minimized.

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

Copy link
Copy Markdown
ContributorAuthor

@bors r=davidtwco

@bors

bors commented Nov 7, 2019

Copy link
Copy Markdown
Collaborator

📌 Commit cc9c139 has been approved by davidtwco

@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 Nov 7, 2019
Centril added a commit to Centril/rust that referenced this pull request Nov 7, 2019
@CentrilCentril mentioned this pull request Nov 7, 2019
bors added a commit that referenced this pull request Nov 7, 2019
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
@petrochenkovpetrochenkov mentioned this pull request Nov 7, 2019
bors added a commit that referenced this pull request Nov 7, 2019
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:masterNov 8, 2019
tesuji added a commit to tesuji/rust-clippy that referenced this pull request Nov 8, 2019
bors added a commit to rust-lang/rust-clippy that referenced this pull request Nov 8, 2019
tesuji added a commit to tesuji/rust-clippy that referenced this pull request Nov 8, 2019
bors added a commit to rust-lang/rust-clippy that referenced this pull request Nov 8, 2019
@Centril
Centril deleted the split-syntax-3 branch November 8, 2019 04:51
Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Labels

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

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants

@Centril@rust-highfive@bors@davidtwco