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

Update rustfmt to 1.3.2 #62432

Closed
wants to merge 1 commit into from
Closed

Update rustfmt to 1.3.2 #62432

wants to merge 1 commit into from

Conversation

topecongiro
Copy link
Contributor

This PR is a successor of #62244.

r? @Centril

@rust-highfive
Copy link
Collaborator

⚠️ Warning ⚠️

  • These commits modify submodules.

@rust-highfive rust-highfive added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Jul 6, 2019
@Centril
Copy link
Contributor

Centril commented Jul 6, 2019

@bors delegate=topecongiro

@bors r+

@bors
Copy link
Contributor

bors commented Jul 6, 2019

📌 Commit 5eb662f has been approved by Centril

@bors
Copy link
Contributor

bors commented Jul 6, 2019

✌️ @topecongiro can now approve this pull request

@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 Jul 6, 2019
Centril added a commit to Centril/rust that referenced this pull request Jul 6, 2019
@Centril
Rollup merge of rust-lang#62432 - topecongiro:rustfmt-1.3.2, r=Centril
b731e32 
Update rustfmt to 1.3.2

This PR is a successor of rust-lang#62244.

r? @Centril
@Centril Centril mentioned this pull request Jul 6, 2019
Closed
Centril added a commit to Centril/rust that referenced this pull request Jul 6, 2019
@Centril
Rollup merge of rust-lang#62442 - Centril:rollup-dsvmzve, r=Centril
821a939 
Rollup of 4 pull requests [1]

Successful merges:

 - rust-lang#62243 (Improve documentation for built-in macros)
 - rust-lang#62422 (Remove some uses of mem::uninitialized)
 - rust-lang#62432 (Update rustfmt to 1.3.2)
 - rust-lang#62436 (normalize use of backticks/lowercase in compiler messages for librustc_mir)

Failed merges:

r? @ghost
Centril added a commit to Centril/rust that referenced this pull request Jul 6, 2019
@Centril
Rollup merge of rust-lang#62432 - topecongiro:rustfmt-1.3.2, r=Centril
479409b 
Update rustfmt to 1.3.2

This PR is a successor of rust-lang#62244.

r? @Centril
@Centril Centril mentioned this pull request Jul 6, 2019
Closed
Centril added a commit to Centril/rust that referenced this pull request Jul 6, 2019
@Centril
Rollup merge of rust-lang#62432 - topecongiro:rustfmt-1.3.2, r=Centril
9fbc336 
Update rustfmt to 1.3.2

This PR is a successor of rust-lang#62244.

r? @Centril
@Centril Centril mentioned this pull request Jul 6, 2019
Closed
bors added a commit that referenced this pull request Jul 6, 2019
@bors
Auto merge of #62449 - Centril:rollup-fbqhf11, r=Centril
240ee60 
Rollup of 6 pull requests

Successful merges:

 - #60081 (Refactor unicode.py script)
 - #61862 (Make the Weak::{into,as}_raw methods)
 - #62243 (Improve documentation for built-in macros)
 - #62422 (Remove some uses of mem::uninitialized)
 - #62432 (Update rustfmt to 1.3.2)
 - #62436 (normalize use of backticks/lowercase in compiler messages for librustc_mir)

Failed merges:

r? @ghost
Centril added a commit to Centril/rust that referenced this pull request Jul 7, 2019
@Centril
Rollup merge of rust-lang#62432 - topecongiro:rustfmt-1.3.2, r=Centril
a2128bd 
Update rustfmt to 1.3.2

This PR is a successor of rust-lang#62244.

r? @Centril
@Centril Centril mentioned this pull request Jul 7, 2019
Closed
@bors
Copy link
Contributor

bors commented Jul 7, 2019

🔒 Merge conflict

This pull request and the master branch diverged in a way that cannot be automatically merged. Please rebase on top of the latest master branch, and let the reviewer approve again.

How do I rebase?

Assuming self is your fork and upstream is this repository, you can resolve the conflict following these steps:

  1. git checkout rustfmt-1.3.2 (switch to your branch)
  2. git fetch upstream master (retrieve the latest master)
  3. git rebase upstream/master -p (rebase on top of it)
  4. Follow the on-screen instruction to resolve conflicts (check git status if you got lost).
  5. git push self rustfmt-1.3.2 --force-with-lease (update this PR)

You may also read Git Rebasing to Resolve Conflicts by Drew Blessing for a short tutorial.

Please avoid the "Resolve conflicts" button on GitHub. It uses git merge instead of git rebase which makes the PR commit history more difficult to read.

Sometimes step 4 will complete without asking for resolution. This is usually due to difference between how Cargo.lock conflict is handled during merge and rebase. This is normal, and you should still perform step 5 to update this PR.

Error message 
warning: Cannot merge binary files: Cargo.lock (HEAD vs. heads/homu-tmp)
Auto-merging Cargo.lock
CONFLICT (content): Merge conflict in Cargo.lock
Automatic merge failed; fix conflicts and then commit the result.

@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 Jul 7, 2019
@topecongiro
Copy link
Contributor Author

@bors r+

@bors
Copy link
Contributor

bors commented Jul 7, 2019

📌 Commit 6fc2299e0641789cfcce4fa2e261f0bc1afdb0b8 has been approved by topecongiro

@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 Jul 7, 2019
@bors
Copy link
Contributor

bors commented Jul 8, 2019

🔒 Merge conflict

This pull request and the master branch diverged in a way that cannot be automatically merged. Please rebase on top of the latest master branch, and let the reviewer approve again.

How do I rebase?

Assuming self is your fork and upstream is this repository, you can resolve the conflict following these steps:

  1. git checkout rustfmt-1.3.2 (switch to your branch)
  2. git fetch upstream master (retrieve the latest master)
  3. git rebase upstream/master -p (rebase on top of it)
  4. Follow the on-screen instruction to resolve conflicts (check git status if you got lost).
  5. git push self rustfmt-1.3.2 --force-with-lease (update this PR)

You may also read Git Rebasing to Resolve Conflicts by Drew Blessing for a short tutorial.

Please avoid the "Resolve conflicts" button on GitHub. It uses git merge instead of git rebase which makes the PR commit history more difficult to read.

Sometimes step 4 will complete without asking for resolution. This is usually due to difference between how Cargo.lock conflict is handled during merge and rebase. This is normal, and you should still perform step 5 to update this PR.

Error message 
warning: Cannot merge binary files: Cargo.lock (HEAD vs. heads/homu-tmp)
Auto-merging Cargo.lock
CONFLICT (content): Merge conflict in Cargo.lock
Automatic merge failed; fix conflicts and then commit the result.

@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 Jul 8, 2019
@topecongiro
Copy link
Contributor Author

@bors r+

@bors
Copy link
Contributor

bors commented Jul 8, 2019

📌 Commit ad26337 has been approved by topecongiro

@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 Jul 8, 2019
Centril added a commit to Centril/rust that referenced this pull request Jul 8, 2019
@Centril
Rollup merge of rust-lang#62432 - topecongiro:rustfmt-1.3.2, r=topeco…
9cab39d 
…ngiro

Update rustfmt to 1.3.2

This PR is a successor of rust-lang#62244.

r? @Centril
@Centril Centril mentioned this pull request Jul 8, 2019
Closed
@Centril
Copy link
Contributor

Centril commented Jul 8, 2019

Failed in #62498 (comment), @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 Jul 8, 2019
@topecongiro
Copy link
Contributor Author

Looks like there is a bug on Windows platform. Will try again later once it gets fixed.

@topecongiro topecongiro deleted the rustfmt-1.3.2 branch July 14, 2019 01:19
@topecongiro topecongiro mentioned this pull request Jul 15, 2019
Merged
bors added a commit that referenced this pull request Jul 17, 2019
@bors
Auto merge of #62688 - topecongiro:rustfmt-1.3.3, r=alexcrichton
2eb0bc5 
Update rustfmt to 1.3.3

This PR updates rustfmt to 1.3.3 which fixes the bug in #62432 (comment).
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees

@Centril Centril

Labels
S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author.
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
4 participants
@topecongiro @rust-highfive @Centril @bors