diff options
| author | Tadeo Kondrak <me@tadeo.ca> | 2025-06-15 17:42:06 +0200 |
|---|---|---|
| committer | Tadeo Kondrak <me@tadeo.ca> | 2025-06-15 17:43:45 +0200 |
| commit | 0339a97ad22dc185f71f5fd0267201f1525ca1ab (patch) | |
| tree | 3fcedb8019a7bc8911f301bd31bfc9e59d6d5b5d /src/tools | |
| parent | 3f4a23e5a8994b49ab67321177c6d5683f8d6494 (diff) | |
| download | rust-0339a97ad22dc185f71f5fd0267201f1525ca1ab.tar.gz rust-0339a97ad22dc185f71f5fd0267201f1525ca1ab.zip | |
Fix spacing for LIFETIME_IDENT near keywords and literals in test output
Diffstat (limited to 'src/tools')
3 files changed, 12 insertions, 4 deletions
diff --git a/src/tools/rust-analyzer/crates/hir-def/src/macro_expansion_tests/mbe.rs b/src/tools/rust-analyzer/crates/hir-def/src/macro_expansion_tests/mbe.rs index ef93a2a790d..c6d901ec93b 100644 --- a/src/tools/rust-analyzer/crates/hir-def/src/macro_expansion_tests/mbe.rs +++ b/src/tools/rust-analyzer/crates/hir-def/src/macro_expansion_tests/mbe.rs @@ -2046,7 +2046,7 @@ macro_rules! m { ($($x:expr)'a*) => (stringify!($($x)'b*)); } fn f() { - let _ = stringify!(0 'b1 'b2); + let _ = stringify!(0 'b 1 'b 2); } "#]], ); diff --git a/src/tools/rust-analyzer/crates/hir-def/src/macro_expansion_tests/mbe/regression.rs b/src/tools/rust-analyzer/crates/hir-def/src/macro_expansion_tests/mbe/regression.rs index 2cc3ca8c752..e2022c7967d 100644 --- a/src/tools/rust-analyzer/crates/hir-def/src/macro_expansion_tests/mbe/regression.rs +++ b/src/tools/rust-analyzer/crates/hir-def/src/macro_expansion_tests/mbe/regression.rs @@ -784,7 +784,7 @@ macro_rules! delegate_impl { } } } -impl <> Data for &'amut G where G: Data {} +impl <> Data for &'a mut G where G: Data {} "#]], ); } diff --git a/src/tools/rust-analyzer/crates/hir-def/src/macro_expansion_tests/mod.rs b/src/tools/rust-analyzer/crates/hir-def/src/macro_expansion_tests/mod.rs index b5321560918..15b31c1e7ed 100644 --- a/src/tools/rust-analyzer/crates/hir-def/src/macro_expansion_tests/mod.rs +++ b/src/tools/rust-analyzer/crates/hir-def/src/macro_expansion_tests/mod.rs @@ -308,8 +308,16 @@ fn pretty_print_macro_expansion( { " " } - (IDENT, _) if curr_kind.is_keyword(Edition::CURRENT) => " ", - (_, IDENT) if prev_kind.is_keyword(Edition::CURRENT) => " ", + (IDENT | LIFETIME_IDENT, _) + if curr_kind.is_keyword(Edition::CURRENT) || curr_kind.is_literal() => + { + " " + } + (_, IDENT | LIFETIME_IDENT) + if prev_kind.is_keyword(Edition::CURRENT) || prev_kind.is_literal() => + { + " " + } (T![>], IDENT) => " ", (T![>], _) if curr_kind.is_keyword(Edition::CURRENT) => " ", (T![->], _) | (_, T![->]) => " ", |