Improve `-Zunpretty=hir` for parsed attrs #138063

compiler-errors · 2025-03-05T15:25:16Z

Rename print_something to should_render to make it distinct from print_attribute in that it doesn't print anything, it's just a way to probe if a type renders anything.
Fixes a few bugs in the PrintAttribute derive. Namely, the __printed_anything variable was entangled with the should_render call, leading us to always render field names but never render commas.
Remove the outermost "" from the attr.
Debug print Symbols. I know that this is redundant for some parsed attributes, but there's no good way to distinguish symbols that are ident-like and symbols which are cooked string literals. We could perhaps conditionally to fall back to a debug printing if the symbol doesn't match an ident? But seems like overkill.

Based on #138060, only review the commits not in that one.

rustbot · 2025-03-05T15:25:20Z

rustbot has assigned @lcnr.
They will have a look at your PR within the next two weeks and either review your PR or reassign to another reviewer.

Use r? to explicitly pick a reviewer

rustbot · 2025-03-05T15:25:23Z

Some changes occurred in compiler/rustc_attr_data_structures

cc @jdonszelmann

compiler-errors · 2025-03-05T15:25:39Z

@bors delegate=jdonszelmann

bors · 2025-03-05T15:25:42Z

✌️ @jdonszelmann, you can now approve this pull request!

If @compiler-errors told you to "r=me" after making some further change, please make that change, then do @bors r=@compiler-errors

compiler-errors · 2025-03-05T15:26:10Z

tests/ui/unpretty/deprecated-attr.stdout

@@ -5,17 +5,21 @@ extern crate std;
 //@ compile-flags: -Zunpretty=hir
 //@ check-pass

-#[deprecated]
+#[attr = Deprecation {deprecation: Deprecation {since: Unspecified}}]


some of the spacing is a bit tighter than i'd like, but the pp_hir machinery is annoying lol

compiler-errors · 2025-03-05T15:27:08Z

compiler/rustc_hir_pretty/src/lib.rs

            hir::Attribute::Parsed(pa) => {
-                self.word("#[attr=\"");
+                self.word("#[attr = ");


this isn't grammatical (#[attr = {}]) but renders better than a string :)

I do prefer it though, so nice change :)

jdonszelmann · 2025-03-05T15:39:24Z

compiler/rustc_attr_data_structures/src/lib.rs

                if parens {
                    p.word("(");
                }

-                let mut printed_anything = $t.print_something();
+                let mut printed_anything = $t.should_render();


is printed_anything doing anything here? I may have misremembered my own code but can't find a usage atm

jdonszelmann · 2025-03-05T15:39:45Z

compiler/rustc_attr_data_structures/src/lib.rs


                $t.print_attribute(p);

                $(
-                    if printed_anything && $ts.print_something() {
+                    if $ts.should_render() {


the check isn't here anymore, which could be correct

oh yes, that is necessary, but we need to push the if printed_anything into the block like the other fixes.

jdonszelmann · 2025-03-05T15:40:51Z

compiler/rustc_attr_data_structures/src/lib.rs

@@ -126,7 +126,7 @@ macro_rules! print_tup {
                let ($t, $($ts),*) = self;
                let parens = print_tup!(num_should_render $t $($ts)*) > 1;
                if parens {
-                    p.word("(");
+                    p.popen();


oh didn't know these existed, neat :3

jdonszelmann · 2025-03-05T15:41:13Z

compiler/rustc_hir_pretty/src/lib.rs

            hir::Attribute::Parsed(pa) => {
-                self.word("#[attr=\"");
+                self.word("#[attr = ");


I do prefer it though, so nice change :)

jdonszelmann · 2025-03-05T15:44:47Z

compiler/rustc_macros/src/print_attribute.rs

@@ -35,6 +37,7 @@ fn print_fields(name: &Ident, fields: &Fields) -> (TokenStream, TokenStream, Tok
                        return;
                    }

+                    __p.nbsp();
                    __p.word("{");


I guess we could add some spaces (when #disps.len() > 0) here at the braces to make things slightly less tight?

It may lead to other spacing awkwardness, so let's keep it as is.

bors · 2025-03-07T17:55:09Z

☔ The latest upstream changes (presumably #138155) made this pull request unmergeable. Please resolve the merge conflicts.

jdonszelmann · 2025-03-07T19:06:05Z

I see ya did the spaces change anyway, nice! Looks like that addresses everything @bors r+

bors · 2025-03-07T19:06:08Z

📌 Commit 9ae9453 has been approved by jdonszelmann

It is now in the queue for this repository.

compiler-errors · 2025-03-07T19:07:20Z

@bors rollup since this does not really affect stable code

…tty, r=jdonszelmann Improve `-Zunpretty=hir` for parsed attrs 0. Rename `print_something` to `should_render` to make it distinct from `print_attribute` in that it doesn't print anything, it's just a way to probe if a type renders anything. 1. Fixes a few bugs in the `PrintAttribute` derive. Namely, the `__printed_anything` variable was entangled with the `should_render` call, leading us to always render field names but never render commas. 2. Remove the outermost `""` from the attr. 3. Debug print `Symbol`s. I know that this is redundant for some parsed attributes, but there's no good way to distinguish symbols that are ident-like and symbols which are cooked string literals. We could perhaps *conditionally* to fall back to a debug printing if the symbol doesn't match an ident? But seems like overkill. Based on rust-lang#138060, only review the commits not in that one.

…mpiler-errors Rollup of 10 pull requests Successful merges: - rust-lang#135651 (Support for `wasm32-wali-linux-musl` Tier-3 target) - rust-lang#136642 (Put the alloc unit tests in a separate alloctests package) - rust-lang#137337 (Add verbatim linker to AIXLinker) - rust-lang#137549 (Clean up various LLVM FFI things in codegen_llvm) - rust-lang#137957 (Remove i586-pc-windows-msvc) - rust-lang#138063 (Improve `-Zunpretty=hir` for parsed attrs) - rust-lang#138137 (setTargetTriple now accepts Triple rather than string) - rust-lang#138141 (tests: fix some typos in comment) - rust-lang#138150 (Streamline HIR intravisit `visit_id` calls for items) - rust-lang#138173 (Delay bug for negative auto trait rather than ICEing) r? `@ghost` `@rustbot` modify labels: rollup

…tty, r=jdonszelmann Improve `-Zunpretty=hir` for parsed attrs 0. Rename `print_something` to `should_render` to make it distinct from `print_attribute` in that it doesn't print anything, it's just a way to probe if a type renders anything. 1. Fixes a few bugs in the `PrintAttribute` derive. Namely, the `__printed_anything` variable was entangled with the `should_render` call, leading us to always render field names but never render commas. 2. Remove the outermost `""` from the attr. 3. Debug print `Symbol`s. I know that this is redundant for some parsed attributes, but there's no good way to distinguish symbols that are ident-like and symbols which are cooked string literals. We could perhaps *conditionally* to fall back to a debug printing if the symbol doesn't match an ident? But seems like overkill. Based on rust-lang#138060, only review the commits not in that one.

…mpiler-errors Rollup of 8 pull requests Successful merges: - rust-lang#136642 (Put the alloc unit tests in a separate alloctests package) - rust-lang#137337 (Add verbatim linker to AIXLinker) - rust-lang#137363 (compiler: factor Windows x86-32 ABI impl into its own file) - rust-lang#137685 (self-contained linker: conservatively default to `-znostart-stop-gc` on x64 linux) - rust-lang#138000 (atomic: clarify that failing conditional RMW operations are not 'writes') - rust-lang#138063 (Improve `-Zunpretty=hir` for parsed attrs) - rust-lang#138137 (setTargetTriple now accepts Triple rather than string) - rust-lang#138173 (Delay bug for negative auto trait rather than ICEing) r? `@ghost` `@rustbot` modify labels: rollup

compiler-errors · 2025-03-08T00:22:06Z

@bors r-

jdonszelmann · 2025-03-08T12:18:23Z

fix hir pretty printing

diff --git a/tests/pretty/hir-pretty-attr.pp b/tests/pretty/hir-pretty-attr.pp
index 586810b0046..d8cc8c424ca 100644
--- a/tests/pretty/hir-pretty-attr.pp
+++ b/tests/pretty/hir-pretty-attr.pp
@@ -6,6 +6,6 @@ extern crate std;
 //@ pretty-mode:hir
 //@ pp-exact:hir-pretty-attr.pp

-#[attr="Repr([ReprC, ReprPacked(Align(4 bytes)), ReprTransparent])")]
+#[attr = Repr([ReprC, ReprPacked(Align(4 bytes)), ReprTransparent])]

what is a PR but a series of patches anyway. can't push, can comment 🤷

compiler-errors · 2025-03-08T18:38:38Z

@bors r=jdonszelmann

bors · 2025-03-08T18:38:41Z

📌 Commit 9c7821b has been approved by jdonszelmann

It is now in the queue for this repository.

compiler-errors · 2025-03-08T19:56:23Z

@bors r-

rustbot · 2025-03-09T01:59:32Z

Some changes occurred in tests/rustdoc-json

cc @aDotInTheVoid

compiler-errors · 2025-03-09T06:56:41Z

@bors r=jdonszelmann

bors · 2025-03-09T06:56:44Z

📌 Commit 382b76d has been approved by jdonszelmann

It is now in the queue for this repository.

compiler-errors force-pushed the improve-attr-unpretty branch from 750e283 to 914ad9e Compare March 5, 2025 15:25

rustbot assigned lcnr Mar 5, 2025

rustbot added A-attributes Area: Attributes (`#[…]`, `#![…]`) S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. T-compiler Relevant to the compiler team, which will review and decide on the PR/issue. labels Mar 5, 2025

compiler-errors unassigned lcnr Mar 5, 2025

compiler-errors commented Mar 5, 2025

View reviewed changes

compiler-errors added S-blocked Status: Blocked on something else such as an RFC or other implementation work. and removed S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. labels Mar 5, 2025

jdonszelmann reviewed Mar 5, 2025

View reviewed changes

compiler-errors force-pushed the improve-attr-unpretty branch from 914ad9e to 9ae9453 Compare March 7, 2025 18:42

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-blocked Status: Blocked on something else such as an RFC or other implementation work. labels Mar 7, 2025

compiler-errors mentioned this pull request Mar 7, 2025

Rollup of 10 pull requests #138180

Closed

compiler-errors mentioned this pull request Mar 7, 2025

Rollup of 8 pull requests #138185

Closed

bors added S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. and removed S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. labels Mar 8, 2025

compiler-errors force-pushed the improve-attr-unpretty branch from 9ae9453 to 9c7821b Compare March 8, 2025 18:38

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-author Status: This is awaiting some action (such as code changes or more information) from the author. labels Mar 8, 2025

bors added S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. and removed S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. labels Mar 8, 2025

compiler-errors added 2 commits March 9, 2025 01:59

Rename print_something to should_render

bbfc44c

Fix pretty printing of parsed attrs in hir_pretty

382b76d

compiler-errors force-pushed the improve-attr-unpretty branch from 9c7821b to 382b76d Compare March 9, 2025 01:59

rustbot added A-rustdoc-json Area: Rustdoc JSON backend A-rustdoc-search Area: Rustdoc's search feature labels Mar 9, 2025

rustbot added the T-rustdoc-frontend Relevant to the rustdoc-frontend team, which will review and decide on the web UI/UX output. label Mar 9, 2025

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-author Status: This is awaiting some action (such as code changes or more information) from the author. labels Mar 9, 2025

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Improve `-Zunpretty=hir` for parsed attrs #138063

Improve `-Zunpretty=hir` for parsed attrs #138063

compiler-errors commented Mar 5, 2025 •

edited

Loading

rustbot commented Mar 5, 2025

rustbot commented Mar 5, 2025

compiler-errors commented Mar 5, 2025

bors commented Mar 5, 2025

compiler-errors Mar 5, 2025 •

edited

Loading

compiler-errors Mar 5, 2025

jdonszelmann Mar 5, 2025

jdonszelmann Mar 5, 2025

jdonszelmann Mar 5, 2025

compiler-errors Mar 5, 2025

jdonszelmann Mar 5, 2025

jdonszelmann Mar 5, 2025

jdonszelmann Mar 5, 2025

compiler-errors Mar 5, 2025

bors commented Mar 7, 2025

jdonszelmann commented Mar 7, 2025

bors commented Mar 7, 2025

compiler-errors commented Mar 7, 2025

compiler-errors commented Mar 8, 2025

jdonszelmann commented Mar 8, 2025 •

edited

Loading

compiler-errors commented Mar 8, 2025

bors commented Mar 8, 2025

compiler-errors commented Mar 8, 2025

rustbot commented Mar 9, 2025

compiler-errors commented Mar 9, 2025

bors commented Mar 9, 2025

Improve -Zunpretty=hir for parsed attrs #138063

Are you sure you want to change the base?

Improve -Zunpretty=hir for parsed attrs #138063

Conversation

compiler-errors commented Mar 5, 2025 • edited Loading

rustbot commented Mar 5, 2025

rustbot commented Mar 5, 2025

compiler-errors commented Mar 5, 2025

bors commented Mar 5, 2025

compiler-errors Mar 5, 2025 • edited Loading

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

bors commented Mar 7, 2025

jdonszelmann commented Mar 7, 2025

bors commented Mar 7, 2025

compiler-errors commented Mar 7, 2025

compiler-errors commented Mar 8, 2025

jdonszelmann commented Mar 8, 2025 • edited Loading

compiler-errors commented Mar 8, 2025

bors commented Mar 8, 2025

compiler-errors commented Mar 8, 2025

rustbot commented Mar 9, 2025

compiler-errors commented Mar 9, 2025

bors commented Mar 9, 2025

Improve `-Zunpretty=hir` for parsed attrs #138063

Improve `-Zunpretty=hir` for parsed attrs #138063

compiler-errors commented Mar 5, 2025 •

edited

Loading

compiler-errors Mar 5, 2025 •

edited

Loading

jdonszelmann commented Mar 8, 2025 •

edited

Loading