diff --git a/compiler/rustc_middle/src/ty/assoc.rs b/compiler/rustc_middle/src/ty/assoc.rs index 5af4eef40d436..7fefc2530c625 100644 --- a/compiler/rustc_middle/src/ty/assoc.rs +++ b/compiler/rustc_middle/src/ty/assoc.rs @@ -44,7 +44,6 @@ impl AssocItemContainer { #[derive(Copy, Clone, Debug, PartialEq, HashStable, Eq, Hash)] pub struct AssocItem { pub def_id: DefId, - #[stable_hasher(project(name))] pub ident: Ident, pub kind: AssocKind, pub vis: Visibility, diff --git a/src/test/incremental/hashes/inherent_impls.rs b/src/test/incremental/hashes/inherent_impls.rs index 3a59377e81969..13b1b4005e504 100644 --- a/src/test/incremental/hashes/inherent_impls.rs +++ b/src/test/incremental/hashes/inherent_impls.rs @@ -210,7 +210,7 @@ impl Foo { impl Foo { #[rustc_clean(cfg="cfail2")] #[rustc_clean(cfg="cfail3")] - #[rustc_clean(cfg="cfail5")] + #[rustc_clean(cfg="cfail5", except="associated_item")] #[rustc_clean(cfg="cfail6")] pub fn add_method_to_impl1(&self) { } @@ -704,7 +704,7 @@ impl Bar { #[rustc_clean(cfg="cfail3")] #[rustc_clean( cfg="cfail5", - except="generics_of,fn_sig,typeck,type_of,optimized_mir" + except="generics_of,fn_sig,typeck,type_of,optimized_mir,associated_item" )] #[rustc_clean(cfg="cfail6")] pub fn add_type_parameter_to_impl(&self) { } @@ -726,7 +726,7 @@ impl Bar { impl Bar { #[rustc_clean(cfg="cfail2", except="fn_sig,optimized_mir,typeck")] #[rustc_clean(cfg="cfail3")] - #[rustc_clean(cfg="cfail5", except="fn_sig,optimized_mir,typeck")] + #[rustc_clean(cfg="cfail5", except="fn_sig,optimized_mir,typeck,associated_item")] #[rustc_clean(cfg="cfail6")] pub fn change_impl_self_type(&self) { } } @@ -747,7 +747,7 @@ impl Bar { impl Bar { #[rustc_clean(cfg="cfail2")] #[rustc_clean(cfg="cfail3")] - #[rustc_clean(cfg="cfail5")] + #[rustc_clean(cfg="cfail5", except="associated_item")] #[rustc_clean(cfg="cfail6")] pub fn add_lifetime_bound_to_impl_parameter(&self) { } } @@ -768,7 +768,7 @@ impl Bar { impl Bar { #[rustc_clean(cfg="cfail2")] #[rustc_clean(cfg="cfail3")] - #[rustc_clean(cfg="cfail5")] + #[rustc_clean(cfg="cfail5", except="associated_item")] #[rustc_clean(cfg="cfail6")] pub fn add_trait_bound_to_impl_parameter(&self) { } } diff --git a/src/test/incremental/hashes/trait_defs.rs b/src/test/incremental/hashes/trait_defs.rs index 14d6fc87198c4..a612b54b3ecd9 100644 --- a/src/test/incremental/hashes/trait_defs.rs +++ b/src/test/incremental/hashes/trait_defs.rs @@ -405,7 +405,7 @@ trait TraitAddUnsafeModifier { trait TraitAddUnsafeModifier { #[rustc_clean(except="hir_owner,fn_sig", cfg="cfail2")] #[rustc_clean(cfg="cfail3")] - #[rustc_clean(except="hir_owner,fn_sig", cfg="cfail5")] + #[rustc_clean(except="hir_owner,fn_sig,associated_item", cfg="cfail5")] #[rustc_clean(cfg="cfail6")] unsafe fn method(); } @@ -430,7 +430,7 @@ trait TraitAddExternModifier { trait TraitAddExternModifier { #[rustc_clean(except="hir_owner,fn_sig", cfg="cfail2")] #[rustc_clean(cfg="cfail3")] - #[rustc_clean(except="hir_owner,fn_sig", cfg="cfail5")] + #[rustc_clean(except="hir_owner,fn_sig,associated_item", cfg="cfail5")] #[rustc_clean(cfg="cfail6")] extern "C" fn method(); } @@ -850,7 +850,7 @@ trait TraitAddInitializerToAssociatedConstant { #[rustc_clean(cfg="cfail2")] #[rustc_clean(cfg="cfail3")] - #[rustc_clean(cfg="cfail5")] + #[rustc_clean(except="associated_item", cfg="cfail5")] #[rustc_clean(cfg="cfail6")] fn method(); } diff --git a/src/test/incremental/hashes/trait_impls.rs b/src/test/incremental/hashes/trait_impls.rs index d623810115ee8..f7e93f40a15a7 100644 --- a/src/test/incremental/hashes/trait_impls.rs +++ b/src/test/incremental/hashes/trait_impls.rs @@ -1,3 +1,4 @@ +// ignore-tidy-linelength // This test case tests the incremental compilation hash (ICH) implementation // for let expressions. @@ -470,7 +471,7 @@ impl AddTypeParameterToImpl for Bar { )] #[rustc_clean(cfg="cfail3")] #[rustc_clean( - except="hir_owner,hir_owner_nodes,generics_of,fn_sig,type_of,typeck,optimized_mir", + except="hir_owner,hir_owner_nodes,generics_of,fn_sig,type_of,typeck,optimized_mir,associated_item", cfg="cfail5", )] #[rustc_clean(cfg="cfail6")] @@ -497,7 +498,7 @@ impl ChangeSelfTypeOfImpl for u32 { impl ChangeSelfTypeOfImpl for u64 { #[rustc_clean(except="fn_sig,typeck,optimized_mir", cfg="cfail2")] #[rustc_clean(cfg="cfail3")] - #[rustc_clean(except="fn_sig,typeck,optimized_mir", cfg="cfail5")] + #[rustc_clean(except="fn_sig,typeck,optimized_mir,associated_item", cfg="cfail5")] #[rustc_clean(cfg="cfail6")] fn id(self) -> Self { self } } @@ -522,7 +523,7 @@ impl AddLifetimeBoundToImplParameter for T { impl AddLifetimeBoundToImplParameter for T { #[rustc_clean(cfg="cfail2")] #[rustc_clean(cfg="cfail3")] - #[rustc_clean(cfg="cfail5")] + #[rustc_clean(except="associated_item", cfg="cfail5")] #[rustc_clean(cfg="cfail6")] fn id(self) -> Self { self } } @@ -547,7 +548,7 @@ impl AddTraitBoundToImplParameter for T { impl AddTraitBoundToImplParameter for T { #[rustc_clean(cfg="cfail2")] #[rustc_clean(cfg="cfail3")] - #[rustc_clean(cfg="cfail5")] + #[rustc_clean(except="associated_item", cfg="cfail5")] #[rustc_clean(cfg="cfail6")] fn id(self) -> Self { self } }