mikros/rust
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 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 {
fn hash<H: core::hash::Hasher>(&self , state: &mut H) {
core::mem::discriminant(self ).hash(state);
fn hash<H: core::hash::Hasher>(&self , ra_expand_state: &mut H) {
core::mem::discriminant(self ).hash(ra_expand_state);
match self {
Command::Move {
x: x, y: y,
}
=> {
x.hash(state);
y.hash(state);
x.hash(ra_expand_state);
y.hash(ra_expand_state);
}
, Command::Do(f0, )=> {
f0.hash(state);
f0.hash(ra_expand_state);
}
, Command::Jump=> {}
,

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

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