Skip to content

Cleanup: move format! ui tests to where they belong#76301

Merged
bors merged 1 commit intorust-lang:masterfrom
matklad:fmt-test
Dec 5, 2020
Merged

Cleanup: move format! ui tests to where they belong#76301
bors merged 1 commit intorust-lang:masterfrom
matklad:fmt-test

Conversation

@matklad
Copy link
Contributor

@matklad matklad commented Sep 3, 2020

No description provided.

@rust-highfive
Copy link
Contributor

rust-highfive commented Sep 3, 2020

r? @nikomatsakis

(rust_highfive has picked a reviewer for you, use r? to override)

@rust-highfive rust-highfive added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Sep 3, 2020
@matklad matklad added the A-testsuite Area: The testsuite used to check the correctness of rustc label Sep 3, 2020
@matklad matklad mentioned this pull request Sep 3, 2020
Merged
@matklad
Copy link
Contributor Author

matklad commented Sep 3, 2020

for the curious: apparently, ifmt was the code name for the "new" formatting infra many years ago.

@matklad matklad force-pushed the fmt-test branch 3 times, most recently from 273f10d to 079b1c1 Compare September 3, 2020 21:49
@bors
Copy link
Collaborator

bors commented Sep 4, 2020

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

@jyn514 jyn514 added C-cleanup Category: PRs that clean code up or issues documenting cleanup. T-libs-api Relevant to the library API team, which will review and decide on the PR/issue. labels Sep 8, 2020
@jonas-schievink jonas-schievink 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 Sep 13, 2020
@jonas-schievink
Copy link
Contributor

jonas-schievink commented Sep 13, 2020

r=me with rebase

@lcnr lcnr assigned jonas-schievink and unassigned nikomatsakis Sep 21, 2020
@crlf0710 crlf0710 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-author Status: This is awaiting some action (such as code changes or more information) from the author. labels Oct 8, 2020
@camelid camelid 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-author Status: This is awaiting some action (such as code changes or more information) from the author. labels Oct 23, 2020
@crlf0710 crlf0710 added S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. 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-author Status: This is awaiting some action (such as code changes or more information) from the author. S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. labels Nov 13, 2020
@camelid
Copy link
Member

camelid commented Dec 4, 2020

@matklad All this needs is a rebase and then it can be merged!

@matklad
Copy link
Contributor Author

matklad commented Dec 4, 2020

oh wow, completely slipped my mind, thanks for the poke. I've re-applied this on top of new tree, now this just moves the files to a more logical directory

@bors r+ rollup

@bors
Copy link
Collaborator

bors commented Dec 4, 2020

📌 Commit 356ea6b has been approved by matklad

@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 Dec 4, 2020
@bors
Copy link
Collaborator

bors commented Dec 5, 2020

⌛ Testing commit 356ea6b with merge 533defdb7cbe4f7b1378401508719a4f450ae7da...

@bors
Copy link
Collaborator

bors commented Dec 5, 2020

💔 Test failed - checks-actions

@bors bors added S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. and removed S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. labels Dec 5, 2020
@jonas-schievink
Copy link
Contributor

jonas-schievink commented Dec 5, 2020

@bors retry

@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-review Status: Awaiting review from the assignee but also interested parties. labels Dec 5, 2020
@bors
Copy link
Collaborator

bors commented Dec 5, 2020

⌛ Testing commit 356ea6b with merge 0781b44...

@jonas-schievink
Copy link
Contributor

jonas-schievink commented Dec 5, 2020

@bors treeclosed=100

@camelid
Copy link
Member

camelid commented Dec 5, 2020

What happens if the tree is closed while a PR is being tested (like this one)? Will bors still merge it, or will it just wait for tests to finish and then stop?

@bors bors mentioned this pull request Dec 5, 2020
Merged
@bors
Copy link
Collaborator

bors commented Dec 5, 2020

☀️ Test successful - checks-actions
Approved by: matklad
Pushing 0781b44 to master...

@bors bors added the merged-by-bors This PR was explicitly merged by bors. label Dec 5, 2020
@bors bors merged commit 0781b44 into rust-lang:master Dec 5, 2020
@rustbot rustbot added this to the 1.50.0 milestone Dec 5, 2020
@camelid
Copy link
Member

camelid commented Dec 5, 2020

I guess bors answered my question 😄

@bors bors mentioned this pull request Dec 5, 2020
Merged
@jonas-schievink
Copy link
Contributor

jonas-schievink commented Dec 5, 2020

@bors treeclosed-

@bors bors mentioned this pull request Dec 5, 2020
Merged
@RalfJung
Copy link
Member

RalfJung commented Dec 5, 2020

The tree is still closed, somehow that command did not work?
@bors treeclosed-

@RalfJung
Copy link
Member

RalfJung commented Dec 5, 2020

@bors treeclosed=0

@mati865
Copy link
Member

mati865 commented Dec 9, 2020

FYI bors doesn't listen on closed PRs/issues.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

1 more reviewer

@jyn514 jyn514 jyn514 approved these changes

Reviewers whose approvals may not affect merge requirements

Assignees

@jonas-schievink jonas-schievink

Labels

A-testsuite Area: The testsuite used to check the correctness of rustc C-cleanup Category: PRs that clean code up or issues documenting cleanup. merged-by-bors This PR was explicitly merged by bors. S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. T-libs-api Relevant to the library API team, which will review and decide on the PR/issue.

Projects

None yet

Milestone

1.50.0

Development

Successfully merging this pull request may close these issues.