Skip to content

Update RLS and Rustfmt - #77590

Merged
bors merged 1 commit into
rust-lang:masterfrom
Xanewok:update-rls
Oct 7, 2020
Merged

Update RLS and Rustfmt#77590
bors merged 1 commit into
rust-lang:masterfrom
Xanewok:update-rls

Conversation

@Xanewok

Copy link
Copy Markdown
Contributor

@rust-highfive

Copy link
Copy Markdown
Contributor

⚠️Warning⚠️

  • These commits modify submodules.

@rust-highfiverust-highfive added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Oct 5, 2020

@dtolnaydtolnay 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.

Thank you!

@dtolnay

Copy link
Copy Markdown
Member

@bors r+

@bors

bors commented Oct 5, 2020

Copy link
Copy Markdown
Collaborator

📌 Commit 1b9c45b has been approved by dtolnay

@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-review Status: Awaiting review from the assignee but also interested parties. labels Oct 5, 2020
@dtolnaydtolnay added the beta-nominated Nominated for backporting to the compiler in the beta channel. label Oct 5, 2020
@dtolnay

Copy link
Copy Markdown
Member

Master is on 1.49.0 right now (since #77451), so I am nominating this for backport to beta 1.48.0 because the rustfmt bump includes support for some syntax that is newly introduced in 1.48.0. When adding syntax we should aim for the rustfmt which ships with the same version of rustc to not fail on the new syntax.

bors added a commit to rust-lang-ci/rust that referenced this pull request Oct 6, 2020
Rollup of 11 pull requests
Successful merges:
- rust-lang#76784 (Add some docs to rustdoc::clean::inline and def_id functions)
- rust-lang#76911 (fix VecDeque::iter_mut aliasing issues)
- rust-lang#77400 (Fix suggestions for x.py setup)
- rust-lang#77515 (Update to chalk 0.31)
- rust-lang#77568 (inliner: use caller param_env)
- rust-lang#77571 (Use matches! for core::char methods)
- rust-lang#77582 (Move `EarlyOtherwiseBranch` to mir-opt-level 2)
- rust-lang#77590 (Update RLS and Rustfmt)
- rust-lang#77605 (Fix rustc_def_path to show the full path and not the trimmed one)
- rust-lang#77614 (Let backends access span information)
- rust-lang#77624 (Add c as a shorthand check alternative for new options rust-lang#77603)
Failed merges:
r? `@ghost`
@Mark-SimulacrumMark-Simulacrum added the T-compiler Relevant to the compiler team, which will review and decide on the PR/issue. label Oct 6, 2020
@bors
bors merged commit 6951c31 into rust-lang:masterOct 7, 2020
@rustbotrustbot added this to the 1.49.0 milestone Oct 7, 2020
@Mark-SimulacrumMark-Simulacrum mentioned this pull request Oct 8, 2020
@spastorino

Copy link
Copy Markdown
Member

discussed in T-compiler meeting.

@rustbot modify labels: beta-accepted

@rustbotrustbot added the beta-accepted Accepted for backporting to the compiler in the beta channel. label Oct 8, 2020
@Mark-SimulacrumMark-Simulacrum removed the beta-nominated Nominated for backporting to the compiler in the beta channel. label Oct 8, 2020
@Mark-SimulacrumMark-Simulacrum modified the milestones: 1.49.0, 1.48.0Oct 8, 2020
bors added a commit to rust-lang-ci/rust that referenced this pull request Oct 8, 2020
…ulacrum
[beta] backports
This backports the following:
* Improve build-manifest to work with the improved promote-release rust-lang#77407
* Force posix-style quoting on lld, independent of host platform rust-lang#77543
* Fix miscompile in SimplifyBranchSame rust-lang#77549
* Update RLS and Rustfmt rust-lang#77590
* Move `EarlyOtherwiseBranch` to mir-opt-level 2 rust-lang#77582
Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Labels

beta-acceptedAccepted for backporting to the compiler in the beta channel.S-waiting-on-borsStatus: Waiting on bors to run and complete tests. Bors will change the label on completion.T-compilerRelevant to the compiler team, which will review and decide on the PR/issue.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

7 participants

@Xanewok@rust-highfive@dtolnay@bors@spastorino@Mark-Simulacrum@rustbot