user0/rust
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fix spacing for LIFETIME_IDENT near keywords and literals in test output

Browse source
This commit is contained in:
Tadeo Kondrak 2025-06-15 17:42:06 +02:00
parent 3f4a23e5a8
commit 0339a97ad2
3 changed files with 12 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/tools/rust-analyzer/crates/hir-def/src/macro_expansion_tests/mbe.rs
View file

@ -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);
}
"#]],
);

2
src/tools/rust-analyzer/crates/hir-def/src/macro_expansion_tests/mbe/regression.rs
View file

@ -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 {}
"#]],
);
}

12
src/tools/rust-analyzer/crates/hir-def/src/macro_expansion_tests/mod.rs
View file

@ -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![->]) => " ",