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

rustfmt: load nested out-of-line mods correctly #86424

Merged
merged 1 commit into from
Jun 21, 2021

Conversation

calebcartwright
Copy link
Member

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

@rust-highfive
Copy link
Collaborator

Some changes occurred in src/tools/rustfmt.

cc @calebcartwright

@rust-highfive rust-highfive added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Jun 18, 2021
@Mark-Simulacrum
Copy link
Member

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

@bors
Copy link
Contributor

bors commented Jun 21, 2021

📌 Commit d2f2237 has been approved by Mark-Simulacrum

@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 Jun 21, 2021
@Mark-Simulacrum Mark-Simulacrum added the beta-nominated Nominated for backporting to the compiler in the beta channel. label Jun 21, 2021
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
@bors bors merged commit a81f55f into rust-lang:master Jun 21, 2021
@rustbot rustbot added this to the 1.55.0 milestone Jun 21, 2021
@calebcartwright calebcartwright deleted the rustfmt-mod-resolution branch June 21, 2021 23:20
@apiraino apiraino added T-rustdoc Relevant to the rustdoc team, which will review and decide on the PR/issue. and removed T-rustdoc Relevant to the rustdoc team, which will review and decide on the PR/issue. labels Jun 23, 2021
@apiraino
Copy link
Contributor

@Mark-Simulacrum any T- label for this patch to decide for the backport - or is this under control?

@Mark-Simulacrum Mark-Simulacrum added the T-compiler Relevant to the compiler team, which will review and decide on the PR/issue. label Jun 23, 2021
@Mark-Simulacrum
Copy link
Member

I would say compiler is probably best team but ultimately we can likely unilaterally accept this otherwise.

@apiraino
Copy link
Contributor

Beta backport accepted as per compiler team on Zulip

@rustbot label +beta-accepted

@apiraino apiraino added the beta-accepted Accepted for backporting to the compiler in the beta channel. label Jun 24, 2021
@cuviper cuviper mentioned this pull request Jul 2, 2021
@cuviper cuviper modified the milestones: 1.55.0, 1.54.0 Jul 2, 2021
@cuviper cuviper removed the beta-nominated Nominated for backporting to the compiler in the beta channel. label Jul 2, 2021
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
Labels
beta-accepted Accepted for backporting to the compiler in the beta channel. S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. T-compiler Relevant 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