Rearrange rustc_ast_pretty#155383
Merged
rust-bors[bot] merged 2 commits intorust-lang:mainfrom Apr 17, 2026
Merged
Conversation
For no apparent reason it's in a different file to `Token` itself. This commit moves it.
`rustc_ast_pretty::pp` defines `Printer` and has a 346 line `impl Printer` block for it. `rustc_ast_pretty::pp::convenience` has another `impl Printer` block with 85 lines. `rustc_ast_pretty::helpers` has another `impl Printer` block with 45 lines. This commit merges the two small `impl Printer` blocks into the bigger one, because there is no good reason for them to be separate. Doing this eliminates the `rustc_ast_pretty::pp::convenience` and `rustc_ast_pretty::helpers` modules; no great loss given that they were small and had extremely generic names.
rustbot
added
S-waiting-on-review
Collaborator
|
|
WaffleLapkin
approved these changes
Apr 16, 2026
Member
|
@bors r+ rollup |
Contributor
rust-bors
bot
added
S-waiting-on-bors
JonathanBrouwer
added a commit
to JonathanBrouwer/rust
that referenced
this pull request
Apr 16, 2026
…etty, r=WaffleLapkin Rearrange `rustc_ast_pretty` `rustc_ast_pretty` has two modules, `pp::convenience` and `helpers`, that are small and silly. This PR eliminates them. Details in the individual commits. r? @WaffleLapkin
JonathanBrouwer
added a commit
to JonathanBrouwer/rust
that referenced
this pull request
Apr 16, 2026
…etty, r=WaffleLapkin Rearrange `rustc_ast_pretty` `rustc_ast_pretty` has two modules, `pp::convenience` and `helpers`, that are small and silly. This PR eliminates them. Details in the individual commits. r? @WaffleLapkin
GuillaumeGomez
added a commit
to GuillaumeGomez/rust
that referenced
this pull request
Apr 16, 2026
…etty, r=WaffleLapkin Rearrange `rustc_ast_pretty` `rustc_ast_pretty` has two modules, `pp::convenience` and `helpers`, that are small and silly. This PR eliminates them. Details in the individual commits. r? @WaffleLapkin
rust-bors bot
pushed a commit
that referenced
this pull request
Apr 17, 2026
Rollup of 13 pull requests Successful merges: - #152980 (c-variadic: fix implementation on `avr`) - #154491 (Extend `core::char`'s documentation of casing issues (and fix a rustdoc bug)) - #155354 (Remove AttributeSafety from BUILTIN_ATTRIBUTES) - #154970 (rustdoc: preserve `doc(cfg)` on locally re-exported type aliases) - #155095 (changed the information provided by (mut x) to mut x (Fix 155030)) - #155358 (ImproperCTypes: Move erasing_region_normalisation into helper function) - #155377 (tests/debuginfo/basic-stepping.rs: Remove FIXME related to ZSTs) - #155383 (Rearrange `rustc_ast_pretty`) - #155384 (triagebot: notify on diagnostic attribute changes) - #155386 (Use `box_new` diagnostic item for Box::new suggestions) - #155391 (Small refactor of `QueryJob::latch` method) - #155395 (Tweak how the "copy path" rustdoc button works to allow some accessibility tool to work with rustdoc) - #155396 (`as_ref_unchecked` docs link fix)
rust-bors bot
pushed a commit
that referenced
this pull request
Apr 17, 2026
Rollup of 19 pull requests Successful merges: - #141633 (Suggest to bind `self.x` to `x` when field `x` may be in format string) - #152980 (c-variadic: fix implementation on `avr`) - #154491 (Extend `core::char`'s documentation of casing issues (and fix a rustdoc bug)) - #155318 (Use mutable pointers for Unix path buffers) - #155335 (Bump bootstrap to 1.96 beta) - #155354 (Remove AttributeSafety from BUILTIN_ATTRIBUTES) - #154970 (rustdoc: preserve `doc(cfg)` on locally re-exported type aliases) - #155095 (changed the information provided by (mut x) to mut x (Fix 155030)) - #155305 (Make `convert_while_ascii` unsafe) - #155358 (ImproperCTypes: Move erasing_region_normalisation into helper function) - #155377 (tests/debuginfo/basic-stepping.rs: Remove FIXME related to ZSTs) - #155383 (Rearrange `rustc_ast_pretty`) - #155384 (triagebot: notify on diagnostic attribute changes) - #155386 (Use `box_new` diagnostic item for Box::new suggestions) - #155391 (Small refactor of `QueryJob::latch` method) - #155395 (Tweak how the "copy path" rustdoc button works to allow some accessibility tool to work with rustdoc) - #155396 (`as_ref_unchecked` docs link fix) - #155411 (compiletest: Remove the `//@ should-ice` directive) - #155413 (fix: typo in `std::fs::hard_link` documentation)
rust-timer
added a commit
that referenced
this pull request
Apr 17, 2026
Rollup merge of #155383 - nnethercote:rearrange-rustc_ast_pretty, r=WaffleLapkin Rearrange `rustc_ast_pretty` `rustc_ast_pretty` has two modules, `pp::convenience` and `helpers`, that are small and silly. This PR eliminates them. Details in the individual commits. r? @WaffleLapkin
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
3 participants
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.
rustc_ast_prettyhas two modules,pp::convenienceandhelpers, that are small and silly. This PR eliminates them. Details in the individual commits.r? @WaffleLapkin