Add a test suite for stringify macro #92238

dtolnay · 2021-12-24T00:31:19Z

This attempts to cover the behavior of stringify! on various interpolated syntax tree nodes.

The pretty printer has a history of unsightly whitespace (double spaces, missing spaces, spaces where there shouldn't be spaces) — #91437, #91562, #91568. There are several such issues left; the test cases that I consider to be currently behaving incorrectly are marked with // FIXME in the PR.

rust-highfive · 2021-12-24T00:31:22Z

r? @Mark-Simulacrum

(rust-highfive has picked a reviewer for you, use r? to override)

Mark-Simulacrum · 2021-12-28T03:17:15Z

src/test/ui/macros/stringify.rs

+    assert_eq!(stringify_expr!(async move || self), "async move || self");
+    assert_eq!(stringify_expr!(static || self), "static || self");
+    assert_eq!(stringify_expr!(static move || self), "static move || self");
+    #[rustfmt::skip] // https://github.com/rust-lang/rustfmt/issues/5149


FWIW src/test/ui isn't formatted by x.py fmt, and is in the ignore list in rustfmt.toml, so in theory this isn't necessary but seems OK for now.

👍 good call. I hit this because I wrote this whole file in a standalone main.rs to iterate faster than x.py, and just moved the whole finished thing into src/test/ui.

Mark-Simulacrum · 2021-12-28T03:19:53Z

@bors r+ rollup

This seems like a good set of tests to me, regardless of whether we necessarily agree to the FIXMEs -- they all looked like places I'd want to see changes as well but I didn't spend too long on that evaluation as it seems not directly relevant to this PR's approval.

bors · 2021-12-28T03:19:54Z

📌 Commit 55fc986 has been approved by Mark-Simulacrum

…acrum Add a test suite for stringify macro This attempts to cover the behavior of `stringify!` on various interpolated syntax tree nodes. The pretty printer has a history of unsightly whitespace (double spaces, missing spaces, spaces where there shouldn't be spaces) — rust-lang#91437, rust-lang#91562, rust-lang#91568. There are several such issues left; the test cases that I consider to be currently behaving incorrectly are marked with `// FIXME` in the PR.

…askrgr Rollup of 7 pull requests Successful merges: - rust-lang#92076 (Ignore other `PredicateKind`s in rustdoc auto trait finder) - rust-lang#92219 (Remove VCVARS_BAT) - rust-lang#92238 (Add a test suite for stringify macro) - rust-lang#92330 (Add myself to .mailmap) - rust-lang#92333 (Tighten span when suggesting lifetime on path) - rust-lang#92335 (Document units for `std::column`) - rust-lang#92344 (:arrow_up: rust-analyzer) Failed merges: r? `@ghost` `@rustbot` modify labels: rollup

Remove pretty printer space inside block with only outer attrs Follow-up to rust-lang#92238 fixing one of the FIXMEs. ```rust macro_rules! repro { ($expr:expr) => { stringify!($expr) }; } fn main() { println!("{}", repro!(#[attr] {})); } ``` Before:&ensp;`#[attr] { }` After:&ensp;`#[attr] {}`

Print space after formal generic params in fn type Follow-up to rust-lang#92238 fixing one of the FIXMEs. ```rust macro_rules! repro { ($ty:ty) => { stringify!($ty) }; } fn main() { println!("{}", repro!(for<'a> fn(&'a u8))); } ``` Before:&ensp;`for<'a>fn(&'a u8)` After:&ensp;`for<'a> fn(&'a u8)` The pretty printer's `print_formal_generic_params` already prints formal generic params correctly with a space, we just need to call it when printing BareFn types instead of reimplementing the printing incorrectly without a space. https://github.com/rust-lang/rust/blob/83b15bfe1c15f325bc186ebfe3691b729ed59f2b/compiler/rustc_ast_pretty/src/pprust/state.rs#L1394-L1400

Fix spacing of pretty printed const item without body Follow-up to rust-lang#92238 fixing one of the FIXMEs. ```rust macro_rules! repro { ($item:item) => { stringify!($item) }; } fn main() { println!("{}", repro!(extern "C" { static S: i32; })); } ``` Before:&ensp;`extern "C" { static S: i32 ; }` After:&ensp;`extern "C" { static S: i32; }`

Fix double space in pretty printed TryBlock Follow-up to rust-lang#92238 fixing one of the FIXMEs. ```rust macro_rules! repro { ($expr:expr) => { stringify!($expr) }; } fn main() { println!("{}", repro!(try {})); } ``` Before:&ensp;<code>try  {}</code> After:&ensp;<code>try {}</code> The `head` helper already appends a space: https://github.com/rust-lang/rust/blob/2b67c30bfece00357d5fc09d99b49f21066f04ba/compiler/rustc_ast_pretty/src/pprust/state.rs#L654-L664 so doing `head` followed by `space` resulted in a double space: https://github.com/rust-lang/rust/blob/2b67c30bfece00357d5fc09d99b49f21066f04ba/compiler/rustc_ast_pretty/src/pprust/state.rs#L2241-L2242

Fix whitespace in pretty printed PatKind::Range Follow-up to rust-lang#92238 fixing one of the FIXMEs. ```rust macro_rules! repro { ($pat:pat) => { stringify!($pat) }; } fn main() { println!("{}", repro!(0..=1)); } ``` Before:&ensp;`0 ..=1` After:&ensp;`0..=1` The canonical spacing applied by rustfmt has no space after the lower expr. Rustc's parser diagnostics also do not put a space there: https://github.com/rust-lang/rust/blob/df96fb166f59431e3de443835e50d5b8a7a4adb0/compiler/rustc_parse/src/parser/pat.rs#L754

…erister Fix spacing in pretty printed PatKind::Struct with no fields Follow-up to rust-lang#92238 fixing one of the FIXMEs. ```rust macro_rules! repro { ($pat:pat) => { stringify!($pat) }; } fn main() { println!("{}", repro!(Struct {})); } ``` Before:&ensp;<code>Struct {  }</code> After:&ensp;<code>Struct {}</code>

Fix spacing and ordering of words in pretty printed Impl Follow-up to rust-lang#92238 fixing one of the FIXMEs. ```rust macro_rules! repro { ($item:item) => { stringify!($item) }; } fn main() { println!("{}", repro!(impl<T> Struct<T> {})); println!("{}", repro!(impl<T> const Trait for T {})); } ``` Before:&ensp;`impl <T> Struct<T> {}` After:&ensp;`impl<T> Struct<T> {}` Before:&ensp;`impl const <T> Trait for T {}` 😿 After:&ensp;`impl<T> const Trait for T {}`

Add a test suite for stringify macro

a51326f

rust-highfive assigned Mark-Simulacrum Dec 24, 2021

rustbot added the T-compiler Relevant to the compiler team, which will review and decide on the PR/issue. label Dec 24, 2021

rust-highfive added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Dec 24, 2021

This comment has been minimized.

Sign in to view

dtolnay added 2 commits December 23, 2021 16:54

Format with rust-lang/rust's rustfmt settings

ac43ba8

Fix tidy line length lint in stringify tests

55fc986

dtolnay mentioned this pull request Dec 24, 2021

Fix static async closure qualifier order rust-lang/rustfmt#5150

Merged

Mark-Simulacrum reviewed Dec 28, 2021

View reviewed changes

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 Dec 28, 2021

matthiaskrgr mentioned this pull request Dec 28, 2021

Rollup of 7 pull requests #92346

Closed

matthiaskrgr mentioned this pull request Dec 28, 2021

Rollup of 7 pull requests #92352

Merged

bors merged commit 0b0666e into rust-lang:master Dec 28, 2021

rustbot added this to the 1.59.0 milestone Dec 28, 2021

dtolnay deleted the stringifytest branch December 28, 2021 20:21

This was referenced Dec 28, 2021

Remove pretty printer space inside block with only outer attrs #92371

Merged

Print space after formal generic params in fn type #92372

Merged

This was referenced Dec 29, 2021

Fix double space in pretty printed TryBlock #92412

Merged

Fix spacing of pretty printed const item without body #92414

Merged

Fix spacing and ordering of words in pretty printed Impl #92417

Merged

This was referenced Dec 29, 2021

Fix spacing in pretty printed PatKind::Struct with no fields #92418

Merged

Fix whitespace in pretty printed PatKind::Range #92420

Merged

dtolnay added the A-pretty Area: Pretty printing (including `-Z unpretty`) label Dec 28, 2023

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Add a test suite for stringify macro #92238

Add a test suite for stringify macro #92238

dtolnay commented Dec 24, 2021

rust-highfive commented Dec 24, 2021

This comment has been minimized.

Mark-Simulacrum Dec 28, 2021

dtolnay Dec 29, 2021

Mark-Simulacrum commented Dec 28, 2021

bors commented Dec 28, 2021

Add a test suite for stringify macro #92238

Add a test suite for stringify macro #92238

Conversation

dtolnay commented Dec 24, 2021

rust-highfive commented Dec 24, 2021

This comment has been minimized.

Mark-Simulacrum Dec 28, 2021

Choose a reason for hiding this comment

dtolnay Dec 29, 2021

Choose a reason for hiding this comment

Mark-Simulacrum commented Dec 28, 2021

bors commented Dec 28, 2021