Skip to content

Update RLS and Rustfmt (and Cargo) #50433

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
Merged
merged 1 commit into from
May 4, 2018
Merged

Update RLS and Rustfmt (and Cargo) #50433

merged 1 commit into from
May 4, 2018

Conversation

nrc
Copy link
Member

@nrc nrc commented May 3, 2018

Updates RLS and Rustfmt (the latter fixing tests). Cargo is updated too (to fix RLS tests), but that is covered by #50417, so probably won't do much.

r? @alexcrichton

@rust-highfive
Copy link
Contributor

warning Warning 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 May 3, 2018
@alexcrichton
Copy link
Member

@bors: r+ p=1

@bors
Copy link
Collaborator

bors commented May 3, 2018

📌 Commit 97c30ce has been approved by alexcrichton

@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 May 3, 2018
@kennytm
Copy link
Member

kennytm commented May 3, 2018

@bors p=4

@bors
Copy link
Collaborator

bors commented May 3, 2018

🔒 Merge conflict

@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 May 3, 2018
@bors
Copy link
Collaborator

bors commented May 3, 2018

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

@nrc
Copy link
Member Author

nrc commented May 4, 2018

@bors r=alexcrichton p=4

@bors
Copy link
Collaborator

bors commented May 4, 2018

📌 Commit 4952426 has been approved by alexcrichton

@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 May 4, 2018
@bors
Copy link
Collaborator

bors commented May 4, 2018

⌛ Testing commit 4952426 with merge 841e0cc...

bors added a commit that referenced this pull request May 4, 2018
@bors
Auto merge of #50433 - nrc:update, r=alexcrichton
841e0cc 
Update RLS and Rustfmt (and Cargo)

Updates RLS and Rustfmt (the latter fixing tests). Cargo is updated too (to fix RLS tests), but that is covered by #50417, so probably  won't do much.

r? @alexcrichton
@bors
Copy link
Collaborator

bors commented May 4, 2018

☀️ Test successful - status-appveyor, status-travis
Approved by: alexcrichton
Pushing 841e0cc to master...

@bors bors merged commit 4952426 into rust-lang:master May 4, 2018
@kennytm
Copy link
Member

kennytm commented May 4, 2018

rustfmt is still test-fail, same error as before.

[01:19:34] failures:
[01:19:34] 
[01:19:34] ---- test::verify_check_works stdout ----
[01:19:34] 	thread 'test::verify_check_works' panicked at 'No such file or directory (os error 2)', /cargo/registry/src/github.com-1ecc6299db9ec823/assert_cli-0.5.4/src/assert.rs:368:13
[01:19:34] note: Run with `RUST_BACKTRACE=1` for a backtrace.
[01:19:34] 
[01:19:34] ---- test::verify_diff_works stdout ----
[01:19:34] 	thread 'test::verify_diff_works' panicked at 'No such file or directory (os error 2)', /cargo/registry/src/github.com-1ecc6299db9ec823/assert_cli-0.5.4/src/assert.rs:368:13
[01:19:34] 
[01:19:34] 
[01:19:34] failures:
[01:19:34]     test::verify_check_works
[01:19:34]     test::verify_diff_works

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

@alexcrichton alexcrichton

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.
5 participants
@nrc @rust-highfive @alexcrichton @bors @kennytm