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.

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

Bump Rustfmt and RLS #73506

Merged
merged 1 commit into from
Jun 20, 2020
Merged

Bump Rustfmt and RLS #73506

merged 1 commit into from
Jun 20, 2020

Conversation

Xanewok
Copy link
Member

@Xanewok Xanewok commented Jun 19, 2020

Fixes #73406
Fixes #73199
Fixes #73407
Fixes #73200

cc @calebcartwright @topecongiro

r? @ghost

Let's see what CI says first

@Xanewok
Copy link
Member Author

Xanewok commented Jun 19, 2020

@bors p=1

@Xanewok
Copy link
Member Author

Xanewok commented Jun 19, 2020

x86_64-gnu-tools run is green, let's give this a go:

@bors r+

@bors
Copy link
Contributor

bors commented Jun 19, 2020

📌 Commit f4b2a20 has been approved by Xanewok

@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 Jun 19, 2020
@Xanewok
Copy link
Member Author

Xanewok commented Jun 19, 2020

@bors r? @Xanewok

@bors
Copy link
Contributor

bors commented Jun 20, 2020

⌛ Testing commit f4b2a20 with merge 9ed845707329efa031b118df9b8f169f3607bac6...

@Manishearth
Copy link
Member

@bors yield retry

@Manishearth
Copy link
Member

@bors yield

@Manishearth
Copy link
Member

@bors force

@Manishearth Manishearth reopened this Jun 20, 2020
bors added a commit to rust-lang-ci/rust that referenced this pull request Jun 20, 2020
…arth

Rollup of 16 pull requests

Successful merges:

 - rust-lang#71420 (Specialization is unsound)
 - rust-lang#71899 (Refactor `try_find` a little)
 - rust-lang#72689 (add str to common types)
 - rust-lang#72791 (update coerce docs and unify relevant tests)
 - rust-lang#72934 (forbid mutable references in all constant contexts except for const-fns)
 - rust-lang#73027 (Make `need_type_info_err` more conservative)
 - rust-lang#73347 (Diagnose use of incompatible sanitizers)
 - rust-lang#73359 (shim.rs: avoid creating `Call` terminators calling `Self`)
 - rust-lang#73399 (Clean up E0668 explanation)
 - rust-lang#73436 (Clean up E0670 explanation)
 - rust-lang#73440 (Add src/librustdoc as an alias for src/tools/rustdoc)
 - rust-lang#73442 (pretty/mir: const value enums with no variants)
 - rust-lang#73452 (Unify region variables when projecting associated types)
 - rust-lang#73458 (Use alloc::Layout in DroplessArena API)
 - rust-lang#73484 (Update the doc for std::prelude to the correct behavior)
 - rust-lang#73506 (Bump Rustfmt and RLS)

Failed merges:

r? @ghost
@Manishearth
Copy link
Member

@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 Jun 20, 2020
@Manishearth
Copy link
Member

@bors r=Xanewok retry

@bors
Copy link
Contributor

bors commented Jun 20, 2020

📌 Commit f4b2a20 has been approved by Xanewok

@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 Jun 20, 2020
@bors bors merged commit 3e40cca into rust-lang:master Jun 20, 2020
@Xanewok Xanewok deleted the update-rls branch June 20, 2020 10:23
@cuviper cuviper added this to the 1.46 milestone May 2, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion.
Projects
None yet
4 participants