Conversation
Contributor
|
Member
|
@bors r+ |
Collaborator
|
📌 Commit 1b9c45b has been approved by |
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`
Merged
Member
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
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
refs: rust-lang/rls#1701
cc @calebcartwright
r? @dtolnay