Mirrors/rust-analyzer
2
0
Fork 0
mirror of https://github.com/rust-lang/rust-analyzer synced 2025-01-16 07:03:57 +00:00
Code Issues Projects Releases Packages Wiki Activity

Auto merge of #15040 - lnicola:hash-state-name, r=Veykril

Browse source 
fix: Use a more obscure hasher name in derive expansion

Closes #15039
This commit is contained in:
bors 2023-06-13 06:13:35 +00:00
commit 07bc6cbcad
2 changed files with 9 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
crates/hir-def/src/macro_expansion_tests/builtin_derive_macro.rs
View file

@ -396,18 +396,18 @@ enum Command {
} }
impl < > core::hash::Hash for Command< > where { impl < > core::hash::Hash for Command< > where {
fn hash<H: core::hash::Hasher>(&self , state: &mut H) { fn hash<H: core::hash::Hasher>(&self , ra_expand_state: &mut H) {
core::mem::discriminant(self ).hash(state); core::mem::discriminant(self ).hash(ra_expand_state);
match self { match self {
Command::Move { Command::Move {
x: x, y: y, x: x, y: y,
} }
=> { => {
x.hash(state); x.hash(ra_expand_state);
y.hash(state); y.hash(ra_expand_state);
} }
, Command::Do(f0, )=> { , Command::Do(f0, )=> {
f0.hash(state); f0.hash(ra_expand_state);
} }
, Command::Jump=> {} , Command::Jump=> {}
, ,

8
crates/hir-expand/src/builtin_derive_macro.rs
View file

@ -613,7 +613,7 @@ fn hash_expand(
span: tt::TokenId::unspecified(), span: tt::TokenId::unspecified(),
}; };
return quote! { return quote! {
fn hash<H: #krate::hash::Hasher>(&self, state: &mut H) { fn hash<H: #krate::hash::Hasher>(&self, ra_expand_state: &mut H) {
match #star self {} match #star self {}
} }
}; };
@ -621,7 +621,7 @@ fn hash_expand(
let arms = adt.shape.as_pattern(&adt.name).into_iter().zip(adt.shape.field_names()).map( let arms = adt.shape.as_pattern(&adt.name).into_iter().zip(adt.shape.field_names()).map(
|(pat, names)| { |(pat, names)| {
let expr = { let expr = {
let it = names.iter().map(|x| quote! { #x . hash(state); }); let it = names.iter().map(|x| quote! { #x . hash(ra_expand_state); });
quote! { { quote! { {
##it ##it
} } } }
@ -633,8 +633,8 @@ fn hash_expand(
}, },
); );
quote! { quote! {
fn hash<H: #krate::hash::Hasher>(&self, state: &mut H) { fn hash<H: #krate::hash::Hasher>(&self, ra_expand_state: &mut H) {
#krate::mem::discriminant(self).hash(state); #krate::mem::discriminant(self).hash(ra_expand_state);
match self { match self {
##arms ##arms
} }