language-servers/rust-analyzer
1
0
Fork 0
mirror of https://github.com/rust-lang/rust-analyzer.git synced 2025-11-01 04:18:20 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

Fix 2024 syntax errors

Browse source
This commit is contained in:
BenjaminBrienen 2025-03-10 12:37:43 +01:00
parent 71ff7fbe22
commit aad66c7bf1
11 changed files with 35 additions and 28 deletions
Download patch file Download diff file Expand all files Collapse all files

26
crates/hir-expand/src/builtin/derive_macro.rs
View file

@ -117,7 +117,7 @@ impl VariantShape {
quote! {span => #it : #mapped , }
});
quote! {span =>
#path { ##fields }
#path { # #fields }
}
}
&VariantShape::Tuple(n) => {
@ -128,7 +128,7 @@ impl VariantShape {
}
});
quote! {span =>
#path ( ##fields )
#path ( # #fields )
}
}
VariantShape::Unit => path,
@ -523,7 +523,7 @@ fn expand_simple_derive_with_parsed(
let name = info.name;
quote! {invoc_span =>
impl < ##params #extra_impl_params > #trait_path for #name < ##args > where ##where_block { #trait_body }
impl < # #params #extra_impl_params > #trait_path for #name < # #args > where # #where_block { #trait_body }
}
}
@ -572,7 +572,7 @@ fn clone_expand(
quote! {span =>
fn clone(&self) -> Self {
match self {
##arms
# #arms
}
}
}
@ -650,7 +650,7 @@ fn debug_expand(
}
});
quote! {span =>
f.debug_struct(#name) ##for_fields .finish()
f.debug_struct(#name) # #for_fields .finish()
}
}
VariantShape::Tuple(n) => {
@ -660,7 +660,7 @@ fn debug_expand(
}
});
quote! {span =>
f.debug_tuple(#name) ##for_fields .finish()
f.debug_tuple(#name) # #for_fields .finish()
}
}
VariantShape::Unit => quote! {span =>
@ -703,7 +703,7 @@ fn debug_expand(
quote! {span =>
fn fmt(&self, f: &mut #krate::fmt::Formatter) -> #krate::fmt::Result {
match self {
##arms
# #arms
}
}
}
@ -736,7 +736,7 @@ fn hash_expand(
let it =
names.iter().map(|it| quote! {span => #it . hash(ra_expand_state); });
quote! {span => {
##it
# #it
} }
};
let fat_arrow = fat_arrow(span);
@ -754,7 +754,7 @@ fn hash_expand(
fn hash<H: #krate::hash::Hasher>(&self, ra_expand_state: &mut H) {
#check_discriminant
match self {
##arms
# #arms
}
}
}
@ -803,7 +803,7 @@ fn partial_eq_expand(
let t2 = tt::Ident::new(&format!("{}_other", first.sym), first.span);
quote!(span =>#t1 .eq( #t2 ))
};
quote!(span =>#first ##rest)
quote!(span =>#first # #rest)
}
};
quote! {span => ( #pat1 , #pat2 ) #fat_arrow #body , }
@ -814,7 +814,7 @@ fn partial_eq_expand(
quote! {span =>
fn eq(&self, other: &Self) -> bool {
match (self, other) {
##arms
# #arms
_unused #fat_arrow false
}
}
@ -891,7 +891,7 @@ fn ord_expand(
let fat_arrow = fat_arrow(span);
let mut body = quote! {span =>
match (self, other) {
##arms
# #arms
_unused #fat_arrow #krate::cmp::Ordering::Equal
}
};
@ -961,7 +961,7 @@ fn partial_ord_expand(
right,
quote! {span =>
match (self, other) {
##arms
# #arms
_unused #fat_arrow #krate::option::Option::Some(#krate::cmp::Ordering::Equal)
}
},

4
crates/hir-expand/src/builtin/fn_macro.rs
View file

@ -240,9 +240,9 @@ fn assert_expand(
let dollar_crate = dollar_crate(span);
let panic_args = rest.iter();
let mac = if use_panic_2021(db, span) {
quote! {call_site_span => #dollar_crate::panic::panic_2021!(##panic_args) }
quote! {call_site_span => #dollar_crate::panic::panic_2021!(# #panic_args) }
} else {
quote! {call_site_span => #dollar_crate::panic!(##panic_args) }
quote! {call_site_span => #dollar_crate::panic!(# #panic_args) }
};
let value = cond.value;
let expanded = quote! {call_site_span =>{

2
crates/hir-expand/src/builtin/quote.rs
View file

@ -61,7 +61,7 @@ macro_rules! quote_impl__ {
$crate::builtin::quote::__quote!($span $builder $($tail)*);
};
($span:ident $builder:ident ## $first:ident $($tail:tt)* ) => {{
($span:ident $builder:ident # # $first:ident $($tail:tt)* ) => {{
::std::iter::IntoIterator::into_iter($first).for_each(|it| $crate::builtin::quote::ToTokenTree::to_tokens(it, $span, $builder));
$crate::builtin::quote::__quote!($span $builder $($tail)*);
}};