rustfmt: load nested out-of-line mods correctly #86424
Merged
46
−1
Conversation
This file contains 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
|
Some changes occurred in src/tools/rustfmt. |
rust-highfive
added
the
S-waiting-on-review
|
@bors r rollup Nominating for beta-backport; we will (at least) want this fixed on 1.54. I am not sure about this warranting a stable backport, so will hold off there -- more testing on nightly seems warranted. |
|
📌 Commit d2f2237 has been approved by |
bors
added
S-waiting-on-bors
Mark-Simulacrum
added
the
beta-nominated
bors
added a commit
to rust-lang-ci/rust
that referenced
this pull request
Jun 21, 2021
Rollup of 9 pull requests Successful merges: - rust-lang#86192 (Make OR_PATTERNS_BACK_COMPAT be a 2021 future-incompatible lint) - rust-lang#86248 (Add a regression test for issue-85113) - rust-lang#86274 (Spaces) - rust-lang#86349 (Add regression test for issue rust-lang#78632) - rust-lang#86424 (rustfmt: load nested out-of-line mods correctly) - rust-lang#86472 (Fix CI to fetch master on beta channel) - rust-lang#86473 (Rustdoc: Account for const-unstable functions) - rust-lang#86495 (Improve `proc_macro::{Punct, Spacing}` documentation) - rust-lang#86503 (Fix rust.css fonts.) Failed merges: r? `@ghost` `@rustbot` modify labels: rollup
apiraino
added
T-rustdoc
|
@Mark-Simulacrum any |
Mark-Simulacrum
added
the
T-compiler
|
I would say compiler is probably best team but ultimately we can likely unilaterally accept this otherwise. |
apiraino
added
the
beta-accepted
Merged
cuviper
removed
the
beta-nominated
bors
added a commit
to rust-lang-ci/rust
that referenced
this pull request
Jul 2, 2021
[beta] backports - rustfmt: load nested out-of-line mods correctly rust-lang#86424 - Re-add support for parsing (and pretty-printing) inner-attributes in match body rust-lang#85193 - Revert "List trait impls before methods from deref in the sidebar ..." rust-lang#86564 - Revert "Don't load all extern crates unconditionally" rust-lang#85749 r? `@Mark-Simulacrum`
calebcartwright
pushed a commit
to calebcartwright/rust
that referenced
this pull request
Jul 26, 2021
…ion, r=Mark-Simulacrum rustfmt: load nested out-of-line mods correctly This should address rust-lang/rustfmt#4874 r? `@Mark-Simulacrum` Decided to make the change directly in tree here for expediency/to minimize any potential backporting issues, and because there's some subtree sync items I need to get resolved before pulling from r-l/rustfmt
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.
This should address rust-lang/rustfmt#4874
r? @Mark-Simulacrum
Decided to make the change directly in tree here for expediency/to minimize any potential backporting issues, and because there's some subtree sync items I need to get resolved before pulling from r-l/rustfmt