From 1826a54aba36c1e8741f08a18349c505b7bad68a Mon Sep 17 00:00:00 2001 From: aerooneqq Date: Thu, 23 Apr 2026 12:23:56 +0300 Subject: [PATCH 1/5] WIP --- compiler/rustc_hir/src/hir.rs | 2 +- .../rustc_incremental/src/assert_dep_graph.rs | 6 +- .../rustc_incremental/src/persist/clean.rs | 2 +- compiler/rustc_middle/src/arena.rs | 1 + compiler/rustc_middle/src/hir/map.rs | 31 +- compiler/rustc_middle/src/hir/mod.rs | 58 +- compiler/rustc_middle/src/queries.rs | 47 +- compiler/rustc_middle/src/ty/context.rs | 30 +- tests/incremental/clean.rs | 4 +- tests/incremental/hash-module-order.rs | 4 +- tests/incremental/hashes/call_expressions.rs | 38 +- .../incremental/hashes/closure_expressions.rs | 24 +- tests/incremental/hashes/consts.rs | 18 +- tests/incremental/hashes/enum_constructors.rs | 60 +- tests/incremental/hashes/enum_defs.rs | 148 ++--- tests/incremental/hashes/exported_vs_not.rs | 14 +- tests/incremental/hashes/extern_mods.rs | 52 +- tests/incremental/hashes/for_loops.rs | 44 +- .../incremental/hashes/function_interfaces.rs | 96 ++-- tests/incremental/hashes/if_expressions.rs | 32 +- .../hashes/indexing_expressions.rs | 28 +- tests/incremental/hashes/inherent_impls.rs | 196 +++---- tests/incremental/hashes/inline_asm.rs | 24 +- tests/incremental/hashes/let_expressions.rs | 48 +- tests/incremental/hashes/loop_expressions.rs | 32 +- tests/incremental/hashes/match_expressions.rs | 52 +- tests/incremental/hashes/panic_exprs.rs | 18 +- tests/incremental/hashes/statics.rs | 52 +- .../incremental/hashes/struct_constructors.rs | 36 +- tests/incremental/hashes/struct_defs.rs | 80 +-- tests/incremental/hashes/trait_defs.rs | 400 ++++++------- tests/incremental/hashes/trait_impls.rs | 527 +++++++++--------- tests/incremental/hashes/type_defs.rs | 32 +- .../hashes/unary_and_binary_exprs.rs | 112 ++-- tests/incremental/hashes/while_let_loops.rs | 36 +- tests/incremental/hashes/while_loops.rs | 36 +- .../hygiene/auxiliary/cached_hygiene.rs | 2 +- .../ich_method_call_trait_scope.rs | 2 +- tests/incremental/ich_nested_items.rs | 2 +- tests/incremental/ich_resolve_results.rs | 4 +- tests/incremental/source_loc_macros.rs | 4 +- .../spans_significant_w_debuginfo.rs | 2 +- .../incremental/spans_significant_w_panic.rs | 2 +- tests/incremental/string_constant.rs | 2 +- ...ult-trait-shadow-cycle-issue-151358.stderr | 6 +- .../query-cycle-printing-issue-151358.stderr | 6 +- .../resolve/query-cycle-issue-124901.stderr | 6 +- 47 files changed, 1225 insertions(+), 1233 deletions(-) diff --git a/compiler/rustc_hir/src/hir.rs b/compiler/rustc_hir/src/hir.rs index 5608bd82fdacd..5d5422ee93399 100644 --- a/compiler/rustc_hir/src/hir.rs +++ b/compiler/rustc_hir/src/hir.rs @@ -1550,7 +1550,7 @@ impl Attribute { } /// Attributes owned by a HIR owner. -#[derive(Debug)] +#[derive(Debug, Clone)] pub struct AttributeMap<'tcx> { pub map: SortedMap, /// Preprocessed `#[define_opaque]` attribute. diff --git a/compiler/rustc_incremental/src/assert_dep_graph.rs b/compiler/rustc_incremental/src/assert_dep_graph.rs index 61ddd2ca566b1..92a5f4ea2d61f 100644 --- a/compiler/rustc_incremental/src/assert_dep_graph.rs +++ b/compiler/rustc_incremental/src/assert_dep_graph.rs @@ -113,11 +113,7 @@ impl<'tcx> IfThisChanged<'tcx> { for attr in attrs { if let Attribute::Parsed(AttributeKind::RustcIfThisChanged(span, dep_node)) = *attr { let dep_node = match dep_node { - None => DepNode::from_def_path_hash( - self.tcx, - def_path_hash, - DepKind::opt_hir_owner_nodes, - ), + None => DepNode::from_def_path_hash(self.tcx, def_path_hash, DepKind::owner), Some(n) => { match DepNode::from_label_string(self.tcx, n.as_str(), def_path_hash) { Ok(n) => n, diff --git a/compiler/rustc_incremental/src/persist/clean.rs b/compiler/rustc_incremental/src/persist/clean.rs index e999404c6cc8a..da09429111bc3 100644 --- a/compiler/rustc_incremental/src/persist/clean.rs +++ b/compiler/rustc_incremental/src/persist/clean.rs @@ -55,7 +55,7 @@ const BASE_FN: &[&str] = &[ /// DepNodes for Hir, which is pretty much everything const BASE_HIR: &[&str] = &[ // opt_hir_owner_nodes should be computed for all nodes - label_strs::opt_hir_owner_nodes, + label_strs::owner, ]; /// `impl` implementation of struct/trait diff --git a/compiler/rustc_middle/src/arena.rs b/compiler/rustc_middle/src/arena.rs index de6a105ee2b7b..e1abde88a9ef2 100644 --- a/compiler/rustc_middle/src/arena.rs +++ b/compiler/rustc_middle/src/arena.rs @@ -119,6 +119,7 @@ macro_rules! arena_types { [] crate_inherent_impls: rustc_middle::ty::CrateInherentImpls, [] hir_owner_nodes: rustc_hir::OwnerNodes<'tcx>, [decode] token_stream: rustc_ast::tokenstream::TokenStream, + [] owner_info: rustc_hir::OwnerInfo<'tcx>, ]); ) } diff --git a/compiler/rustc_middle/src/hir/map.rs b/compiler/rustc_middle/src/hir/map.rs index 4cc0ab6304162..2a77efda74986 100644 --- a/compiler/rustc_middle/src/hir/map.rs +++ b/compiler/rustc_middle/src/hir/map.rs @@ -12,6 +12,7 @@ use rustc_hir::def::{DefKind, Res}; use rustc_hir::def_id::{DefId, LOCAL_CRATE, LocalDefId, LocalModDefId}; use rustc_hir::definitions::{DefKey, DefPath, DefPathHash}; use rustc_hir::intravisit::Visitor; +use rustc_hir::lints::DelayedLints; use rustc_hir::*; use rustc_hir_pretty as pprust_hir; use rustc_span::def_id::StableCrateId; @@ -19,7 +20,7 @@ use rustc_span::{ErrorGuaranteed, Ident, Span, Symbol, kw, with_metavar_spans}; use crate::hir::{ModuleItems, nested_filter}; use crate::middle::debugger_visualizer::DebuggerVisualizerFile; -use crate::query::LocalCrate; +use crate::query::{IntoQueryKey, LocalCrate}; use crate::ty::TyCtxt; /// An iterator that walks up the ancestor tree of a given `HirId`. @@ -101,6 +102,34 @@ impl<'tcx> Iterator for ParentOwnerIterator<'tcx> { } impl<'tcx> TyCtxt<'tcx> { + pub fn local_def_id_to_hir_id(self, def_id: impl IntoQueryKey) -> HirId { + let def_id = def_id.into_query_key(); + match self.owner(def_id) { + MaybeOwner::Owner(_) => HirId::make_owner(def_id), + MaybeOwner::NonOwner(hir_id) => hir_id, + MaybeOwner::Phantom => bug!("No HirId for {:?}", def_id), + } + } + + pub fn opt_ast_lowering_delayed_lints(self, id: OwnerId) -> Option<&'tcx DelayedLints> { + self.owner(id.def_id).as_owner().map(|o| &o.delayed_lints) + } + + pub fn hir_attr_map(self, id: OwnerId) -> &'tcx AttributeMap<'tcx> { + self.owner(id.def_id).as_owner().map_or(AttributeMap::EMPTY, |o| &o.attrs) + } + + pub fn in_scope_traits_map( + self, + id: OwnerId, + ) -> Option<&'tcx ItemLocalMap<&'tcx [TraitCandidate<'tcx>]>> { + self.owner(id.def_id).as_owner().map(|owner_info| &owner_info.trait_map) + } + + pub fn opt_hir_owner_nodes(self, def_id: LocalDefId) -> Option<&'tcx OwnerNodes<'tcx>> { + self.owner(def_id).as_owner().map(|i| &i.nodes) + } + #[inline] fn expect_hir_owner_nodes(self, def_id: LocalDefId) -> &'tcx OwnerNodes<'tcx> { self.opt_hir_owner_nodes(def_id) diff --git a/compiler/rustc_middle/src/hir/mod.rs b/compiler/rustc_middle/src/hir/mod.rs index c81b0a7182558..ffeeefbae2d4c 100644 --- a/compiler/rustc_middle/src/hir/mod.rs +++ b/compiler/rustc_middle/src/hir/mod.rs @@ -62,27 +62,6 @@ impl<'hir> Crate<'hir> { ) -> Crate<'hir> { Crate { owners, delayed_ids, delayed_resolver, opt_hir_hash } } - - /// Serves as an entry point for getting `MaybeOwner`. As owner can either be in - /// `owners` of `hir_crate` or it can be delayed AST owner (i.e., delegations) - /// we need to firstly check in `hir_crate` and then delayed AST owners. - /// This method can be invoked when not all delayed AST owners are lowered. - pub fn owner(&self, tcx: TyCtxt<'hir>, def_id: LocalDefId) -> MaybeOwner<'hir> { - // Delayed LocalDefId can be in `self.owners` if there exists non-delayed LocalDefId - // which is greater than delayed LocalDefId, we use IndexVec for owners, - // so we will call ensure_contains_elem which will grow it. - if let Some(owner) = self.owners.get(def_id) - && (self.delayed_ids.is_empty() || !matches!(owner, MaybeOwner::Phantom)) - { - return *owner; - } - - if self.delayed_ids.contains(&def_id) { - tcx.ensure_done().lower_delayed_owner(def_id); - } - - tcx.delayed_owner(def_id) - } } impl HashStable for Crate<'_> { @@ -431,8 +410,7 @@ impl<'tcx> TyCtxt<'tcx> { HirId { owner: parent_owner_id, local_id: self - .hir_crate(()) - .owner(self, parent_owner_id.def_id) + .owner(parent_owner_id.def_id) .unwrap() .parenting .get(&owner_id.def_id) @@ -465,19 +443,28 @@ pub fn provide(providers: &mut Providers) { providers.hir_crate_items = map::hir_crate_items; providers.crate_hash = map::crate_hash; providers.hir_module_items = map::hir_module_items; - providers.local_def_id_to_hir_id = |tcx, def_id| match tcx.hir_crate(()).owner(tcx, def_id) { - MaybeOwner::Owner(_) => HirId::make_owner(def_id), - MaybeOwner::NonOwner(hir_id) => hir_id, - MaybeOwner::Phantom => bug!("No HirId for {:?}", def_id), + // Serves as an entry point for getting `MaybeOwner`. As owner can either be in + // `owners` of `hir_crate` or it can be delayed AST owner (i.e., delegations) + // we need to firstly check in `hir_crate` and then delayed AST owners. + // This method can be invoked when not all delayed AST owners are lowered. + providers.owner = |tcx, def_id| { + // Delayed LocalDefId can be in `self.owners` if there exists non-delayed LocalDefId + // which is greater than delayed LocalDefId, we use IndexVec for owners, + // so we will call ensure_contains_elem which will grow it. + let krate = tcx.hir_crate(()); + if let Some(owner) = krate.owners.get(def_id) + && (krate.delayed_ids.is_empty() || !matches!(owner, MaybeOwner::Phantom)) + { + return *owner; + } + + if krate.delayed_ids.contains(&def_id) { + tcx.ensure_done().lower_delayed_owner(def_id); + } + + tcx.delayed_owner(def_id) }; - providers.opt_hir_owner_nodes = - |tcx, id| tcx.hir_crate(()).owner(tcx, id).as_owner().map(|i| &i.nodes); providers.hir_owner_parent_q = |tcx, owner_id| tcx.hir_owner_parent_impl(owner_id); - providers.hir_attr_map = |tcx, id| { - tcx.hir_crate(()).owner(tcx, id.def_id).as_owner().map_or(AttributeMap::EMPTY, |o| &o.attrs) - }; - providers.opt_ast_lowering_delayed_lints = - |tcx, id| tcx.hir_crate(()).owner(tcx, id.def_id).as_owner().map(|o| &o.delayed_lints); providers.def_span = |tcx, def_id| tcx.hir_span(tcx.local_def_id_to_hir_id(def_id)); providers.def_ident_span = |tcx, def_id| { let hir_id = tcx.local_def_id_to_hir_id(def_id); @@ -517,7 +504,4 @@ pub fn provide(providers: &mut Providers) { |tcx, trait_id| tcx.resolutions(()).trait_impls.get(&trait_id).map_or(&[], |xs| &xs[..]); providers.expn_that_defined = |tcx, id| tcx.resolutions(()).expn_that_defined.get(&id).copied().unwrap_or(ExpnId::root()); - providers.in_scope_traits_map = |tcx, id| { - tcx.hir_crate(()).owner(tcx, id.def_id).as_owner().map(|owner_info| &owner_info.trait_map) - }; } diff --git a/compiler/rustc_middle/src/queries.rs b/compiler/rustc_middle/src/queries.rs index 7c6ab642b2736..b05f9345d73d2 100644 --- a/compiler/rustc_middle/src/queries.rs +++ b/compiler/rustc_middle/src/queries.rs @@ -68,7 +68,7 @@ use rustc_hir::def_id::{ CrateNum, DefId, DefIdMap, LocalDefId, LocalDefIdMap, LocalDefIdSet, LocalModDefId, }; use rustc_hir::lang_items::{LangItem, LanguageItems}; -use rustc_hir::{ItemLocalId, ItemLocalMap, PreciseCapturingArgKind, TraitCandidate}; +use rustc_hir::{ItemLocalId, PreciseCapturingArgKind}; use rustc_index::IndexVec; use rustc_lint_defs::LintId; use rustc_macros::rustc_queries; @@ -216,6 +216,11 @@ rustc_queries! { desc { "lowering the delayed AST owner `{}`", tcx.def_path_str(def_id) } } + query owner(def_id: LocalDefId) -> hir::MaybeOwner<'tcx> { + desc { "getting owner for `{}`", tcx.def_path_str(def_id) } + feedable + } + query delayed_owner(def_id: LocalDefId) -> hir::MaybeOwner<'tcx> { feedable desc { "getting child of lowered delayed AST owner `{}`", tcx.def_path_str(def_id) } @@ -238,12 +243,6 @@ rustc_queries! { cache_on_disk } - /// Returns HIR ID for the given `LocalDefId`. - query local_def_id_to_hir_id(key: LocalDefId) -> hir::HirId { - desc { "getting HIR ID of `{}`", tcx.def_path_str(key) } - feedable - } - /// Gives access to the HIR node's parent for the HIR owner `key`. /// /// This can be conveniently accessed by `tcx.hir_*` methods. @@ -252,36 +251,6 @@ rustc_queries! { desc { "getting HIR parent of `{}`", tcx.def_path_str(key) } } - /// Gives access to the HIR nodes and bodies inside `key` if it's a HIR owner. - /// - /// This can be conveniently accessed by `tcx.hir_*` methods. - /// Avoid calling this query directly. - query opt_hir_owner_nodes(key: LocalDefId) -> Option<&'tcx hir::OwnerNodes<'tcx>> { - desc { "getting HIR owner items in `{}`", tcx.def_path_str(key) } - feedable - } - - /// Gives access to the HIR attributes inside the HIR owner `key`. - /// - /// This can be conveniently accessed by `tcx.hir_*` methods. - /// Avoid calling this query directly. - query hir_attr_map(key: hir::OwnerId) -> &'tcx hir::AttributeMap<'tcx> { - desc { "getting HIR owner attributes in `{}`", tcx.def_path_str(key) } - feedable - } - - /// Gives access to lints emitted during ast lowering. - /// - /// This can be conveniently accessed by `tcx.hir_*` methods. - /// Avoid calling this query directly. - query opt_ast_lowering_delayed_lints(key: hir::OwnerId) -> Option<&'tcx hir::lints::DelayedLints> { - desc { "getting AST lowering delayed lints in `{}`", tcx.def_path_str(key) } - // This query has to be `no_hash` and `eval_always`, - // because it accesses `delayed_lints` which is not hashed as part of the HIR - no_hash - eval_always - } - /// Returns the *default* of the const pararameter given by `DefId`. /// /// E.g., given `struct Ty;` this returns `3` for `N`. @@ -1884,10 +1853,6 @@ rustc_queries! { query specializes(_: (DefId, DefId)) -> bool { desc { "computing whether impls specialize one another" } } - query in_scope_traits_map(_: hir::OwnerId) - -> Option<&'tcx ItemLocalMap<&'tcx [TraitCandidate<'tcx>]>> { - desc { "getting traits in scope at a block" } - } /// Returns whether the impl or associated function has the `default` keyword. /// Note: This will ICE on inherent impl items. Consider using `AssocItem::defaultness`. diff --git a/compiler/rustc_middle/src/ty/context.rs b/compiler/rustc_middle/src/ty/context.rs index d1f82af3416b6..e33e7a4e123db 100644 --- a/compiler/rustc_middle/src/ty/context.rs +++ b/compiler/rustc_middle/src/ty/context.rs @@ -36,7 +36,9 @@ use rustc_hir::definitions::{DefPathData, Definitions, PerParentDisambiguatorSta use rustc_hir::intravisit::VisitorExt; use rustc_hir::lang_items::LangItem; use rustc_hir::limit::Limit; -use rustc_hir::{self as hir, CRATE_HIR_ID, HirId, MaybeOwner, Node, TraitCandidate, find_attr}; +use rustc_hir::{ + self as hir, CRATE_HIR_ID, HirId, MaybeOwner, Node, OwnerInfo, TraitCandidate, find_attr, +}; use rustc_index::IndexVec; use rustc_macros::Diagnostic; use rustc_session::Session; @@ -759,24 +761,28 @@ impl<'tcx> TyCtxtFeed<'tcx, LocalDefId> { // Fills in all the important parts needed by HIR queries pub fn feed_hir(&self) { - self.local_def_id_to_hir_id(HirId::make_owner(self.def_id())); - let node = hir::OwnerNode::Synthetic; let bodies = Default::default(); - let attrs = hir::AttributeMap::EMPTY; + let attrs = hir::AttributeMap::EMPTY.clone(); let rustc_middle::hir::Hashes { opt_hash_including_bodies, .. } = self.tcx.hash_owner_nodes(node, &bodies, &attrs.map, attrs.define_opaque); let node = node.into(); - self.opt_hir_owner_nodes(Some(self.tcx.arena.alloc(hir::OwnerNodes { - opt_hash_including_bodies, - nodes: IndexVec::from_elem_n( - hir::ParentedNode { parent: hir::ItemLocalId::INVALID, node }, - 1, - ), - bodies, + + self.owner(hir::MaybeOwner::Owner(self.tcx.arena.alloc(OwnerInfo { + attrs, + nodes: hir::OwnerNodes { + opt_hash_including_bodies, + nodes: IndexVec::from_elem_n( + hir::ParentedNode { parent: hir::ItemLocalId::INVALID, node }, + 1, + ), + bodies, + }, + parenting: Default::default(), + delayed_lints: Default::default(), + trait_map: Default::default(), }))); - self.feed_owner_id().hir_attr_map(attrs); } } diff --git a/tests/incremental/clean.rs b/tests/incremental/clean.rs index ffaead4cd7dfb..40b5a2c2238d8 100644 --- a/tests/incremental/clean.rs +++ b/tests/incremental/clean.rs @@ -27,11 +27,11 @@ mod y { use x; #[rustc_clean( - except="opt_hir_owner_nodes,generics_of,predicates_of,type_of,fn_sig", + except="owner,generics_of,predicates_of,type_of,fn_sig", cfg="bfail2", )] pub fn y() { - //[bfail2]~^ ERROR `opt_hir_owner_nodes(y)` should be dirty but is not + //[bfail2]~^ ERROR `owner(y)` should be dirty but is not //[bfail2]~| ERROR `generics_of(y)` should be dirty but is not //[bfail2]~| ERROR `predicates_of(y)` should be dirty but is not //[bfail2]~| ERROR `type_of(y)` should be dirty but is not diff --git a/tests/incremental/hash-module-order.rs b/tests/incremental/hash-module-order.rs index 5261965e8f3f4..41ad49857e596 100644 --- a/tests/incremental/hash-module-order.rs +++ b/tests/incremental/hash-module-order.rs @@ -13,14 +13,14 @@ #![feature(rustc_attrs)] #[cfg(rpass1)] -#[rustc_clean(cfg="rpass1",except="opt_hir_owner_nodes")] +#[rustc_clean(cfg="rpass1",except="owner")] mod foo { struct First; struct Second; } #[cfg(rpass2)] -#[rustc_clean(cfg="rpass2",except="opt_hir_owner_nodes")] +#[rustc_clean(cfg="rpass2",except="owner")] mod foo { struct Second; struct First; diff --git a/tests/incremental/hashes/call_expressions.rs b/tests/incremental/hashes/call_expressions.rs index 1bf7fad2a9937..adffce639361d 100644 --- a/tests/incremental/hashes/call_expressions.rs +++ b/tests/incremental/hashes/call_expressions.rs @@ -28,9 +28,9 @@ pub fn change_callee_function() { } #[cfg(not(any(bpass1,bpass4)))] -#[rustc_clean(cfg="bpass2", except="opt_hir_owner_nodes,optimized_mir,typeck_root")] +#[rustc_clean(cfg="bpass2", except="owner,optimized_mir,typeck_root")] #[rustc_clean(cfg="bpass3")] -#[rustc_clean(cfg="bpass5", except="opt_hir_owner_nodes,optimized_mir,typeck_root")] +#[rustc_clean(cfg="bpass5", except="owner,optimized_mir,typeck_root")] #[rustc_clean(cfg="bpass6")] pub fn change_callee_function() { callee2(1, 2) @@ -45,9 +45,9 @@ pub fn change_argument_function() { } #[cfg(not(any(bpass1,bpass4)))] -#[rustc_clean(cfg="bpass2", except="opt_hir_owner_nodes,optimized_mir")] +#[rustc_clean(cfg="bpass2", except="owner,optimized_mir")] #[rustc_clean(cfg="bpass3")] -#[rustc_clean(cfg="bpass5", except="opt_hir_owner_nodes,optimized_mir")] +#[rustc_clean(cfg="bpass5", except="owner,optimized_mir")] #[rustc_clean(cfg="bpass6")] pub fn change_argument_function() { callee1(1, 3) @@ -62,9 +62,9 @@ mod change_callee_indirectly_function { #[cfg(not(any(bpass1,bpass4)))] use super::callee2 as callee; - #[rustc_clean(except="opt_hir_owner_nodes,typeck_root", cfg="bpass2")] + #[rustc_clean(except="owner,typeck_root", cfg="bpass2")] #[rustc_clean(cfg="bpass3")] - #[rustc_clean(except="opt_hir_owner_nodes,typeck_root", cfg="bpass5")] + #[rustc_clean(except="owner,typeck_root", cfg="bpass5")] #[rustc_clean(cfg="bpass6")] pub fn change_callee_indirectly_function() { callee(1, 2) @@ -86,9 +86,9 @@ pub fn change_callee_method() { } #[cfg(not(any(bpass1,bpass4)))] -#[rustc_clean(cfg="bpass2", except="opt_hir_owner_nodes,optimized_mir,typeck_root")] +#[rustc_clean(cfg="bpass2", except="owner,optimized_mir,typeck_root")] #[rustc_clean(cfg="bpass3")] -#[rustc_clean(cfg="bpass5", except="opt_hir_owner_nodes,optimized_mir,typeck_root")] +#[rustc_clean(cfg="bpass5", except="owner,optimized_mir,typeck_root")] #[rustc_clean(cfg="bpass6")] pub fn change_callee_method() { let s = Struct; @@ -105,9 +105,9 @@ pub fn change_argument_method() { } #[cfg(not(any(bpass1,bpass4)))] -#[rustc_clean(cfg="bpass2", except="opt_hir_owner_nodes,optimized_mir")] +#[rustc_clean(cfg="bpass2", except="owner,optimized_mir")] #[rustc_clean(cfg="bpass3")] -#[rustc_clean(cfg="bpass5", except="opt_hir_owner_nodes,optimized_mir")] +#[rustc_clean(cfg="bpass5", except="owner,optimized_mir")] #[rustc_clean(cfg="bpass6")] pub fn change_argument_method() { let s = Struct; @@ -124,9 +124,9 @@ pub fn change_ufcs_callee_method() { } #[cfg(not(any(bpass1,bpass4)))] -#[rustc_clean(cfg="bpass2", except="opt_hir_owner_nodes,optimized_mir,typeck_root")] +#[rustc_clean(cfg="bpass2", except="owner,optimized_mir,typeck_root")] #[rustc_clean(cfg="bpass3")] -#[rustc_clean(cfg="bpass5", except="opt_hir_owner_nodes,optimized_mir,typeck_root")] +#[rustc_clean(cfg="bpass5", except="owner,optimized_mir,typeck_root")] #[rustc_clean(cfg="bpass6")] pub fn change_ufcs_callee_method() { let s = Struct; @@ -143,9 +143,9 @@ pub fn change_argument_method_ufcs() { } #[cfg(not(any(bpass1,bpass4)))] -#[rustc_clean(cfg="bpass2", except="opt_hir_owner_nodes,optimized_mir")] +#[rustc_clean(cfg="bpass2", except="owner,optimized_mir")] #[rustc_clean(cfg="bpass3")] -#[rustc_clean(cfg="bpass5", except="opt_hir_owner_nodes,optimized_mir")] +#[rustc_clean(cfg="bpass5", except="owner,optimized_mir")] #[rustc_clean(cfg="bpass6")] pub fn change_argument_method_ufcs() { let s = Struct; @@ -162,11 +162,11 @@ pub fn change_to_ufcs() { } #[cfg(not(any(bpass1,bpass4)))] -#[rustc_clean(cfg="bpass2", except="opt_hir_owner_nodes,optimized_mir,typeck_root")] +#[rustc_clean(cfg="bpass2", except="owner,optimized_mir,typeck_root")] #[rustc_clean(cfg="bpass3")] -#[rustc_clean(cfg="bpass5", except="opt_hir_owner_nodes,optimized_mir,typeck_root")] +#[rustc_clean(cfg="bpass5", except="owner,optimized_mir,typeck_root")] #[rustc_clean(cfg="bpass6")] -// One might think this would be expanded in the opt_hir_owner_nodes/Mir, but it actually +// One might think this would be expanded in the owner/Mir, but it actually // results in slightly different hir_owner/Mir. pub fn change_to_ufcs() { let s = Struct; @@ -186,9 +186,9 @@ pub mod change_ufcs_callee_indirectly { #[cfg(not(any(bpass1,bpass4)))] use super::Struct2 as Struct; - #[rustc_clean(cfg="bpass2", except="opt_hir_owner_nodes,optimized_mir,typeck_root")] + #[rustc_clean(cfg="bpass2", except="owner,optimized_mir,typeck_root")] #[rustc_clean(cfg="bpass3")] - #[rustc_clean(cfg="bpass5", except="opt_hir_owner_nodes,optimized_mir,typeck_root")] + #[rustc_clean(cfg="bpass5", except="owner,optimized_mir,typeck_root")] #[rustc_clean(cfg="bpass6")] pub fn change_ufcs_callee_indirectly() { let s = Struct; diff --git a/tests/incremental/hashes/closure_expressions.rs b/tests/incremental/hashes/closure_expressions.rs index ca2f2104b5d96..82240df8ef6f9 100644 --- a/tests/incremental/hashes/closure_expressions.rs +++ b/tests/incremental/hashes/closure_expressions.rs @@ -25,9 +25,9 @@ pub fn change_closure_body() { } #[cfg(not(any(bpass1,bpass4)))] -#[rustc_clean(cfg="bpass2", except="opt_hir_owner_nodes")] +#[rustc_clean(cfg="bpass2", except="owner")] #[rustc_clean(cfg="bpass3")] -#[rustc_clean(cfg="bpass5", except="opt_hir_owner_nodes")] +#[rustc_clean(cfg="bpass5", except="owner")] #[rustc_clean(cfg="bpass6")] pub fn change_closure_body() { let _ = || 3u32; @@ -43,9 +43,9 @@ pub fn add_parameter() { } #[cfg(not(any(bpass1,bpass4)))] -#[rustc_clean(cfg="bpass2", except="opt_hir_owner_nodes, typeck_root")] +#[rustc_clean(cfg="bpass2", except="owner, typeck_root")] #[rustc_clean(cfg="bpass3")] -#[rustc_clean(cfg="bpass5", except="opt_hir_owner_nodes, typeck_root")] +#[rustc_clean(cfg="bpass5", except="owner, typeck_root")] #[rustc_clean(cfg="bpass6")] pub fn add_parameter() { let x = 0u32; @@ -61,9 +61,9 @@ pub fn change_parameter_pattern() { } #[cfg(not(any(bpass1,bpass4)))] -#[rustc_clean(cfg="bpass2", except="opt_hir_owner_nodes, typeck_root")] +#[rustc_clean(cfg="bpass2", except="owner, typeck_root")] #[rustc_clean(cfg="bpass3")] -#[rustc_clean(cfg="bpass5", except="opt_hir_owner_nodes, typeck_root")] +#[rustc_clean(cfg="bpass5", except="owner, typeck_root")] #[rustc_clean(cfg="bpass6")] pub fn change_parameter_pattern() { let _ = |(x,): (u32,)| x; @@ -78,9 +78,9 @@ pub fn add_move() { } #[cfg(not(any(bpass1,bpass4)))] -#[rustc_clean(cfg="bpass2", except="opt_hir_owner_nodes")] +#[rustc_clean(cfg="bpass2", except="owner")] #[rustc_clean(cfg="bpass3")] -#[rustc_clean(cfg="bpass5", except="opt_hir_owner_nodes")] +#[rustc_clean(cfg="bpass5", except="owner")] #[rustc_clean(cfg="bpass6")] pub fn add_move() { let _ = move || 1; @@ -96,9 +96,9 @@ pub fn add_type_ascription_to_parameter() { } #[cfg(not(any(bpass1,bpass4)))] -#[rustc_clean(cfg = "bpass2", except = "opt_hir_owner_nodes, typeck_root")] +#[rustc_clean(cfg = "bpass2", except = "owner, typeck_root")] #[rustc_clean(cfg = "bpass3")] -#[rustc_clean(cfg = "bpass5", except = "opt_hir_owner_nodes, typeck_root")] +#[rustc_clean(cfg = "bpass5", except = "owner, typeck_root")] #[rustc_clean(cfg = "bpass6")] pub fn add_type_ascription_to_parameter() { let closure = |x: u32| x + 1u32; @@ -115,9 +115,9 @@ pub fn change_parameter_type() { } #[cfg(not(any(bpass1,bpass4)))] -#[rustc_clean(cfg="bpass2", except="opt_hir_owner_nodes, optimized_mir, typeck_root")] +#[rustc_clean(cfg="bpass2", except="owner, optimized_mir, typeck_root")] #[rustc_clean(cfg="bpass3")] -#[rustc_clean(cfg="bpass5", except="opt_hir_owner_nodes, optimized_mir, typeck_root")] +#[rustc_clean(cfg="bpass5", except="owner, optimized_mir, typeck_root")] #[rustc_clean(cfg="bpass6")] pub fn change_parameter_type() { let closure = |x: u16| (x as u64) + 1; diff --git a/tests/incremental/hashes/consts.rs b/tests/incremental/hashes/consts.rs index 24cde08b932f6..5e80857507992 100644 --- a/tests/incremental/hashes/consts.rs +++ b/tests/incremental/hashes/consts.rs @@ -20,7 +20,7 @@ const CONST_VISIBILITY: u8 = 0; #[cfg(not(bpass1))] -#[rustc_clean(cfg="bpass2", except="opt_hir_owner_nodes")] +#[rustc_clean(cfg="bpass2", except="owner")] #[rustc_clean(cfg="bpass3")] pub const CONST_VISIBILITY: u8 = 0; @@ -30,7 +30,7 @@ pub const CONST_VISIBILITY: u8 = 0; const CONST_CHANGE_TYPE_1: i32 = 0; #[cfg(not(bpass1))] -#[rustc_clean(cfg="bpass2", except="opt_hir_owner_nodes,type_of")] +#[rustc_clean(cfg="bpass2", except="owner,type_of")] #[rustc_clean(cfg="bpass3")] const CONST_CHANGE_TYPE_1: u32 = 0; @@ -40,13 +40,13 @@ const CONST_CHANGE_TYPE_1: u32 = 0; const CONST_CHANGE_TYPE_2: Option = None; #[cfg(not(bpass1))] -#[rustc_clean(cfg="bpass2", except="opt_hir_owner_nodes,type_of")] +#[rustc_clean(cfg="bpass2", except="owner,type_of")] #[rustc_clean(cfg="bpass3")] const CONST_CHANGE_TYPE_2: Option = None; // Change value between simple literals -#[rustc_clean(cfg="bpass2", except="opt_hir_owner_nodes")] +#[rustc_clean(cfg="bpass2", except="owner")] #[rustc_clean(cfg="bpass3")] const CONST_CHANGE_VALUE_1: i16 = { #[cfg(bpass1)] @@ -58,7 +58,7 @@ const CONST_CHANGE_VALUE_1: i16 = { // Change value between expressions -#[rustc_clean(cfg="bpass2", except="opt_hir_owner_nodes")] +#[rustc_clean(cfg="bpass2", except="owner")] #[rustc_clean(cfg="bpass3")] const CONST_CHANGE_VALUE_2: i16 = { #[cfg(bpass1)] @@ -68,7 +68,7 @@ const CONST_CHANGE_VALUE_2: i16 = { { 1 + 2 } }; -#[rustc_clean(cfg="bpass2", except="opt_hir_owner_nodes")] +#[rustc_clean(cfg="bpass2", except="owner")] #[rustc_clean(cfg="bpass3")] const CONST_CHANGE_VALUE_3: i16 = { #[cfg(bpass1)] @@ -78,7 +78,7 @@ const CONST_CHANGE_VALUE_3: i16 = { { 2 * 3 } }; -#[rustc_clean(cfg="bpass2", except="opt_hir_owner_nodes")] +#[rustc_clean(cfg="bpass2", except="owner")] #[rustc_clean(cfg="bpass3")] const CONST_CHANGE_VALUE_4: i16 = { #[cfg(bpass1)] @@ -100,11 +100,11 @@ mod const_change_type_indirectly { #[cfg(not(bpass1))] use super::ReferencedType2 as Type; - #[rustc_clean(cfg="bpass2", except="opt_hir_owner_nodes,type_of")] + #[rustc_clean(cfg="bpass2", except="owner,type_of")] #[rustc_clean(cfg="bpass3")] const CONST_CHANGE_TYPE_INDIRECTLY_1: Type = Type; - #[rustc_clean(cfg="bpass2", except="opt_hir_owner_nodes,type_of")] + #[rustc_clean(cfg="bpass2", except="owner,type_of")] #[rustc_clean(cfg="bpass3")] const CONST_CHANGE_TYPE_INDIRECTLY_2: Option = None; } diff --git a/tests/incremental/hashes/enum_constructors.rs b/tests/incremental/hashes/enum_constructors.rs index 6f63284a90620..f211d8a4eb62e 100644 --- a/tests/incremental/hashes/enum_constructors.rs +++ b/tests/incremental/hashes/enum_constructors.rs @@ -38,9 +38,9 @@ pub fn change_field_value_struct_like() -> Enum { } #[cfg(not(any(bpass1,bpass4)))] -#[rustc_clean(cfg="bpass2", except="opt_hir_owner_nodes,optimized_mir")] +#[rustc_clean(cfg="bpass2", except="owner,optimized_mir")] #[rustc_clean(cfg="bpass3")] -#[rustc_clean(cfg="bpass5", except="opt_hir_owner_nodes,optimized_mir")] +#[rustc_clean(cfg="bpass5", except="owner,optimized_mir")] #[rustc_clean(cfg="bpass6")] pub fn change_field_value_struct_like() -> Enum { Enum::Struct { @@ -63,9 +63,9 @@ pub fn change_field_order_struct_like() -> Enum { } #[cfg(not(any(bpass1,bpass4)))] -#[rustc_clean(cfg="bpass2", except="opt_hir_owner_nodes,typeck_root")] +#[rustc_clean(cfg="bpass2", except="owner,typeck_root")] #[rustc_clean(cfg="bpass3")] -#[rustc_clean(cfg="bpass5", except="opt_hir_owner_nodes,typeck_root")] +#[rustc_clean(cfg="bpass5", except="owner,typeck_root")] #[rustc_clean(cfg="bpass6")] // FIXME(michaelwoerister):Interesting. I would have thought that that changes the MIR. And it // would if it were not all constants @@ -104,9 +104,9 @@ pub fn change_constructor_path_struct_like() { } #[cfg(not(any(bpass1,bpass4)))] -#[rustc_clean(cfg="bpass2", except="opt_hir_owner_nodes,typeck_root")] +#[rustc_clean(cfg="bpass2", except="owner,typeck_root")] #[rustc_clean(cfg="bpass3")] -#[rustc_clean(cfg="bpass5", except="opt_hir_owner_nodes,typeck_root")] +#[rustc_clean(cfg="bpass5", except="owner,typeck_root")] #[rustc_clean(cfg="bpass6")] pub fn change_constructor_path_struct_like() { let _ = Enum2::Struct { @@ -129,9 +129,9 @@ pub fn change_constructor_variant_struct_like() { } #[cfg(not(any(bpass1,bpass4)))] -#[rustc_clean(cfg="bpass2", except="opt_hir_owner_nodes")] +#[rustc_clean(cfg="bpass2", except="owner")] #[rustc_clean(cfg="bpass3")] -#[rustc_clean(cfg="bpass5", except="opt_hir_owner_nodes")] +#[rustc_clean(cfg="bpass5", except="owner")] #[rustc_clean(cfg="bpass6")] pub fn change_constructor_variant_struct_like() { let _ = Enum2::Struct2 { @@ -149,9 +149,9 @@ pub mod change_constructor_path_indirectly_struct_like { #[cfg(not(any(bpass1,bpass4)))] use super::Enum2 as TheEnum; - #[rustc_clean(cfg="bpass2", except="fn_sig,opt_hir_owner_nodes,optimized_mir,typeck_root")] + #[rustc_clean(cfg="bpass2", except="fn_sig,owner,optimized_mir,typeck_root")] #[rustc_clean(cfg="bpass3")] - #[rustc_clean(cfg="bpass5", except="fn_sig,opt_hir_owner_nodes,optimized_mir,typeck_root")] + #[rustc_clean(cfg="bpass5", except="fn_sig,owner,optimized_mir,typeck_root")] #[rustc_clean(cfg="bpass6")] pub fn function() -> TheEnum { TheEnum::Struct { @@ -171,9 +171,9 @@ pub mod change_constructor_variant_indirectly_struct_like { #[cfg(not(any(bpass1,bpass4)))] use super::Enum2::Struct2 as Variant; - #[rustc_clean(cfg="bpass2", except="opt_hir_owner_nodes,optimized_mir")] + #[rustc_clean(cfg="bpass2", except="owner,optimized_mir")] #[rustc_clean(cfg="bpass3")] - #[rustc_clean(cfg="bpass5", except="opt_hir_owner_nodes,optimized_mir")] + #[rustc_clean(cfg="bpass5", except="owner,optimized_mir")] #[rustc_clean(cfg="bpass6")] pub fn function() -> Enum2 { Variant { @@ -192,9 +192,9 @@ pub fn change_field_value_tuple_like() -> Enum { } #[cfg(not(any(bpass1,bpass4)))] -#[rustc_clean(cfg="bpass2", except="opt_hir_owner_nodes,optimized_mir")] +#[rustc_clean(cfg="bpass2", except="owner,optimized_mir")] #[rustc_clean(cfg="bpass3")] -#[rustc_clean(cfg="bpass5", except="opt_hir_owner_nodes,optimized_mir")] +#[rustc_clean(cfg="bpass5", except="owner,optimized_mir")] #[rustc_clean(cfg="bpass6")] pub fn change_field_value_tuple_like() -> Enum { Enum::Tuple(0, 1, 3) @@ -211,12 +211,12 @@ pub fn change_constructor_path_tuple_like() { #[cfg(not(any(bpass1,bpass4)))] #[rustc_clean( cfg="bpass2", - except="opt_hir_owner_nodes,typeck_root" + except="owner,typeck_root" )] #[rustc_clean(cfg="bpass3")] #[rustc_clean( cfg="bpass5", - except="opt_hir_owner_nodes,typeck_root" + except="owner,typeck_root" )] #[rustc_clean(cfg="bpass6")] pub fn change_constructor_path_tuple_like() { @@ -234,12 +234,12 @@ pub fn change_constructor_variant_tuple_like() { #[cfg(not(any(bpass1,bpass4)))] #[rustc_clean( cfg="bpass2", - except="opt_hir_owner_nodes,typeck_root" + except="owner,typeck_root" )] #[rustc_clean(cfg="bpass3")] #[rustc_clean( cfg="bpass5", - except="opt_hir_owner_nodes,typeck_root" + except="owner,typeck_root" )] #[rustc_clean(cfg="bpass6")] pub fn change_constructor_variant_tuple_like() { @@ -254,9 +254,9 @@ pub mod change_constructor_path_indirectly_tuple_like { #[cfg(not(any(bpass1,bpass4)))] use super::Enum2 as TheEnum; - #[rustc_clean(cfg="bpass2", except="fn_sig,opt_hir_owner_nodes,optimized_mir,typeck_root")] + #[rustc_clean(cfg="bpass2", except="fn_sig,owner,optimized_mir,typeck_root")] #[rustc_clean(cfg="bpass3")] - #[rustc_clean(cfg="bpass5", except="fn_sig,opt_hir_owner_nodes,optimized_mir,typeck_root")] + #[rustc_clean(cfg="bpass5", except="fn_sig,owner,optimized_mir,typeck_root")] #[rustc_clean(cfg="bpass6")] pub fn function() -> TheEnum { TheEnum::Tuple(0, 1, 2) @@ -273,9 +273,9 @@ pub mod change_constructor_variant_indirectly_tuple_like { #[cfg(not(any(bpass1,bpass4)))] use super::Enum2::Tuple2 as Variant; - #[rustc_clean(cfg="bpass2", except="opt_hir_owner_nodes,optimized_mir,typeck_root")] + #[rustc_clean(cfg="bpass2", except="owner,optimized_mir,typeck_root")] #[rustc_clean(cfg="bpass3")] - #[rustc_clean(cfg="bpass5", except="opt_hir_owner_nodes,optimized_mir,typeck_root")] + #[rustc_clean(cfg="bpass5", except="owner,optimized_mir,typeck_root")] #[rustc_clean(cfg="bpass6")] pub fn function() -> Enum2 { Variant(0, 1, 2) @@ -302,9 +302,9 @@ pub fn change_constructor_path_c_like() { } #[cfg(not(any(bpass1,bpass4)))] -#[rustc_clean(cfg="bpass2", except="opt_hir_owner_nodes,optimized_mir,typeck_root")] +#[rustc_clean(cfg="bpass2", except="owner,optimized_mir,typeck_root")] #[rustc_clean(cfg="bpass3")] -#[rustc_clean(cfg="bpass5", except="opt_hir_owner_nodes,optimized_mir,typeck_root")] +#[rustc_clean(cfg="bpass5", except="owner,optimized_mir,typeck_root")] #[rustc_clean(cfg="bpass6")] pub fn change_constructor_path_c_like() { let _x = Clike2::B; @@ -319,9 +319,9 @@ pub fn change_constructor_variant_c_like() { } #[cfg(not(any(bpass1,bpass4)))] -#[rustc_clean(cfg="bpass2", except="opt_hir_owner_nodes,optimized_mir")] +#[rustc_clean(cfg="bpass2", except="owner,optimized_mir")] #[rustc_clean(cfg="bpass3")] -#[rustc_clean(cfg="bpass5", except="opt_hir_owner_nodes,optimized_mir")] +#[rustc_clean(cfg="bpass5", except="owner,optimized_mir")] #[rustc_clean(cfg="bpass6")] pub fn change_constructor_variant_c_like() { let _x = Clike::C; @@ -335,9 +335,9 @@ pub mod change_constructor_path_indirectly_c_like { #[cfg(not(any(bpass1,bpass4)))] use super::Clike2 as TheEnum; - #[rustc_clean(cfg="bpass2", except="fn_sig,opt_hir_owner_nodes,optimized_mir,typeck_root")] + #[rustc_clean(cfg="bpass2", except="fn_sig,owner,optimized_mir,typeck_root")] #[rustc_clean(cfg="bpass3")] - #[rustc_clean(cfg="bpass5", except="fn_sig,opt_hir_owner_nodes,optimized_mir,typeck_root")] + #[rustc_clean(cfg="bpass5", except="fn_sig,owner,optimized_mir,typeck_root")] #[rustc_clean(cfg="bpass6")] pub fn function() -> TheEnum { TheEnum::B @@ -354,9 +354,9 @@ pub mod change_constructor_variant_indirectly_c_like { #[cfg(not(any(bpass1,bpass4)))] use super::Clike::B as Variant; - #[rustc_clean(cfg="bpass2", except="opt_hir_owner_nodes,optimized_mir")] + #[rustc_clean(cfg="bpass2", except="owner,optimized_mir")] #[rustc_clean(cfg="bpass3")] - #[rustc_clean(cfg="bpass5", except="opt_hir_owner_nodes,optimized_mir")] + #[rustc_clean(cfg="bpass5", except="owner,optimized_mir")] #[rustc_clean(cfg="bpass6")] pub fn function() -> Clike { Variant diff --git a/tests/incremental/hashes/enum_defs.rs b/tests/incremental/hashes/enum_defs.rs index e6c02ee48ce42..91108ddc36205 100644 --- a/tests/incremental/hashes/enum_defs.rs +++ b/tests/incremental/hashes/enum_defs.rs @@ -30,9 +30,9 @@ enum EnumVisibility { A } #[cfg(not(any(bpass1,bpass4)))] -#[rustc_clean(cfg="bpass2")] +#[rustc_clean(cfg="bpass2", except="owner")] #[rustc_clean(cfg="bpass3")] -#[rustc_clean(cfg="bpass5", except="opt_hir_owner_nodes")] +#[rustc_clean(cfg="bpass5", except="owner")] #[rustc_clean(cfg="bpass6")] pub enum EnumVisibility { A } @@ -46,9 +46,9 @@ enum EnumChangeNameCStyleVariant { } #[cfg(not(any(bpass1,bpass4)))] -#[rustc_clean(cfg="bpass2", except="opt_hir_owner_nodes,type_of")] +#[rustc_clean(cfg="bpass2", except="owner,type_of")] #[rustc_clean(cfg="bpass3")] -#[rustc_clean(cfg="bpass5", except="opt_hir_owner_nodes,type_of")] +#[rustc_clean(cfg="bpass5", except="owner,type_of")] #[rustc_clean(cfg="bpass6")] enum EnumChangeNameCStyleVariant { Variant1, @@ -65,9 +65,9 @@ enum EnumChangeNameTupleStyleVariant { } #[cfg(not(any(bpass1,bpass4)))] -#[rustc_clean(cfg="bpass2", except="opt_hir_owner_nodes,type_of")] +#[rustc_clean(cfg="bpass2", except="owner,type_of")] #[rustc_clean(cfg="bpass3")] -#[rustc_clean(cfg="bpass5", except="opt_hir_owner_nodes,type_of")] +#[rustc_clean(cfg="bpass5", except="owner,type_of")] #[rustc_clean(cfg="bpass6")] enum EnumChangeNameTupleStyleVariant { Variant1, @@ -84,9 +84,9 @@ enum EnumChangeNameStructStyleVariant { } #[cfg(not(any(bpass1,bpass4)))] -#[rustc_clean(cfg="bpass2", except="opt_hir_owner_nodes,type_of")] +#[rustc_clean(cfg="bpass2", except="owner,type_of")] #[rustc_clean(cfg="bpass3")] -#[rustc_clean(cfg="bpass5", except="opt_hir_owner_nodes,type_of")] +#[rustc_clean(cfg="bpass5", except="owner,type_of")] #[rustc_clean(cfg="bpass6")] enum EnumChangeNameStructStyleVariant { Variant1, @@ -103,9 +103,9 @@ enum EnumChangeValueCStyleVariant0 { } #[cfg(not(any(bpass1,bpass4)))] -#[rustc_clean(cfg="bpass2", except="opt_hir_owner_nodes")] +#[rustc_clean(cfg="bpass2", except="owner")] #[rustc_clean(cfg="bpass3")] -#[rustc_clean(cfg="bpass5", except="opt_hir_owner_nodes")] +#[rustc_clean(cfg="bpass5", except="owner")] #[rustc_clean(cfg="bpass6")] enum EnumChangeValueCStyleVariant0 { Variant1, @@ -119,9 +119,9 @@ enum EnumChangeValueCStyleVariant1 { } #[cfg(not(any(bpass1,bpass4)))] -#[rustc_clean(cfg="bpass2", except="opt_hir_owner_nodes,type_of")] +#[rustc_clean(cfg="bpass2", except="owner,type_of")] #[rustc_clean(cfg="bpass3")] -#[rustc_clean(cfg="bpass5", except="opt_hir_owner_nodes,type_of")] +#[rustc_clean(cfg="bpass5", except="owner,type_of")] #[rustc_clean(cfg="bpass6")] enum EnumChangeValueCStyleVariant1 { Variant1, @@ -137,9 +137,9 @@ enum EnumAddCStyleVariant { } #[cfg(not(any(bpass1,bpass4)))] -#[rustc_clean(cfg="bpass2", except="opt_hir_owner_nodes,type_of")] +#[rustc_clean(cfg="bpass2", except="owner,type_of")] #[rustc_clean(cfg="bpass3")] -#[rustc_clean(cfg="bpass5", except="opt_hir_owner_nodes,type_of")] +#[rustc_clean(cfg="bpass5", except="owner,type_of")] #[rustc_clean(cfg="bpass6")] enum EnumAddCStyleVariant { Variant1, @@ -156,9 +156,9 @@ enum EnumRemoveCStyleVariant { } #[cfg(not(any(bpass1,bpass4)))] -#[rustc_clean(cfg="bpass2", except="opt_hir_owner_nodes,type_of")] +#[rustc_clean(cfg="bpass2", except="owner,type_of")] #[rustc_clean(cfg="bpass3")] -#[rustc_clean(cfg="bpass5", except="opt_hir_owner_nodes,type_of")] +#[rustc_clean(cfg="bpass5", except="owner,type_of")] #[rustc_clean(cfg="bpass6")] enum EnumRemoveCStyleVariant { Variant1, @@ -173,9 +173,9 @@ enum EnumAddTupleStyleVariant { } #[cfg(not(any(bpass1,bpass4)))] -#[rustc_clean(cfg="bpass2", except="opt_hir_owner_nodes,type_of")] +#[rustc_clean(cfg="bpass2", except="owner,type_of")] #[rustc_clean(cfg="bpass3")] -#[rustc_clean(cfg="bpass5", except="opt_hir_owner_nodes,type_of")] +#[rustc_clean(cfg="bpass5", except="owner,type_of")] #[rustc_clean(cfg="bpass6")] enum EnumAddTupleStyleVariant { Variant1, @@ -192,9 +192,9 @@ enum EnumRemoveTupleStyleVariant { } #[cfg(not(any(bpass1,bpass4)))] -#[rustc_clean(cfg="bpass2", except="opt_hir_owner_nodes,type_of")] +#[rustc_clean(cfg="bpass2", except="owner,type_of")] #[rustc_clean(cfg="bpass3")] -#[rustc_clean(cfg="bpass5", except="opt_hir_owner_nodes,type_of")] +#[rustc_clean(cfg="bpass5", except="owner,type_of")] #[rustc_clean(cfg="bpass6")] enum EnumRemoveTupleStyleVariant { Variant1, @@ -209,9 +209,9 @@ enum EnumAddStructStyleVariant { } #[cfg(not(any(bpass1,bpass4)))] -#[rustc_clean(cfg="bpass2", except="opt_hir_owner_nodes,type_of")] +#[rustc_clean(cfg="bpass2", except="owner,type_of")] #[rustc_clean(cfg="bpass3")] -#[rustc_clean(cfg="bpass5", except="opt_hir_owner_nodes,type_of")] +#[rustc_clean(cfg="bpass5", except="owner,type_of")] #[rustc_clean(cfg="bpass6")] enum EnumAddStructStyleVariant { Variant1, @@ -228,9 +228,9 @@ enum EnumRemoveStructStyleVariant { } #[cfg(not(any(bpass1,bpass4)))] -#[rustc_clean(cfg="bpass2", except="opt_hir_owner_nodes,type_of")] +#[rustc_clean(cfg="bpass2", except="owner,type_of")] #[rustc_clean(cfg="bpass3")] -#[rustc_clean(cfg="bpass5", except="opt_hir_owner_nodes,type_of")] +#[rustc_clean(cfg="bpass5", except="owner,type_of")] #[rustc_clean(cfg="bpass6")] enum EnumRemoveStructStyleVariant { Variant1, @@ -245,9 +245,9 @@ enum EnumChangeFieldTypeTupleStyleVariant { } #[cfg(not(any(bpass1,bpass4)))] -#[rustc_clean(cfg="bpass2", except="opt_hir_owner_nodes")] +#[rustc_clean(cfg="bpass2", except="owner")] #[rustc_clean(cfg="bpass3")] -#[rustc_clean(cfg="bpass5", except="opt_hir_owner_nodes")] +#[rustc_clean(cfg="bpass5", except="owner")] #[rustc_clean(cfg="bpass6")] enum EnumChangeFieldTypeTupleStyleVariant { Variant1(u32, @@ -264,9 +264,9 @@ enum EnumChangeFieldTypeStructStyleVariant { } #[cfg(not(any(bpass1,bpass4)))] -#[rustc_clean(cfg="bpass2", except="opt_hir_owner_nodes")] +#[rustc_clean(cfg="bpass2", except="owner")] #[rustc_clean(cfg="bpass3")] -#[rustc_clean(cfg="bpass5", except="opt_hir_owner_nodes")] +#[rustc_clean(cfg="bpass5", except="owner")] #[rustc_clean(cfg="bpass6")] enum EnumChangeFieldTypeStructStyleVariant { Variant1, @@ -285,9 +285,9 @@ enum EnumChangeFieldNameStructStyleVariant { } #[cfg(not(any(bpass1,bpass4)))] -#[rustc_clean(cfg="bpass2", except="opt_hir_owner_nodes,type_of")] +#[rustc_clean(cfg="bpass2", except="owner,type_of")] #[rustc_clean(cfg="bpass3")] -#[rustc_clean(cfg="bpass5", except="opt_hir_owner_nodes,type_of")] +#[rustc_clean(cfg="bpass5", except="owner,type_of")] #[rustc_clean(cfg="bpass6")] enum EnumChangeFieldNameStructStyleVariant { Variant1 { a: u32, c: u32 }, @@ -302,9 +302,9 @@ enum EnumChangeOrderTupleStyleVariant { } #[cfg(not(any(bpass1,bpass4)))] -#[rustc_clean(cfg="bpass2", except="opt_hir_owner_nodes")] +#[rustc_clean(cfg="bpass2", except="owner")] #[rustc_clean(cfg="bpass3")] -#[rustc_clean(cfg="bpass5", except="opt_hir_owner_nodes")] +#[rustc_clean(cfg="bpass5", except="owner")] #[rustc_clean(cfg="bpass6")] enum EnumChangeOrderTupleStyleVariant { Variant1( @@ -321,9 +321,9 @@ enum EnumChangeFieldOrderStructStyleVariant { } #[cfg(not(any(bpass1,bpass4)))] -#[rustc_clean(cfg="bpass2", except="opt_hir_owner_nodes,type_of")] +#[rustc_clean(cfg="bpass2", except="owner,type_of")] #[rustc_clean(cfg="bpass3")] -#[rustc_clean(cfg="bpass5", except="opt_hir_owner_nodes,type_of")] +#[rustc_clean(cfg="bpass5", except="owner,type_of")] #[rustc_clean(cfg="bpass6")] enum EnumChangeFieldOrderStructStyleVariant { Variant1 { b: f32, a: u32 }, @@ -338,9 +338,9 @@ enum EnumAddFieldTupleStyleVariant { } #[cfg(not(any(bpass1,bpass4)))] -#[rustc_clean(cfg="bpass2", except="opt_hir_owner_nodes,type_of")] +#[rustc_clean(cfg="bpass2", except="owner,type_of")] #[rustc_clean(cfg="bpass3")] -#[rustc_clean(cfg="bpass5", except="opt_hir_owner_nodes,type_of")] +#[rustc_clean(cfg="bpass5", except="owner,type_of")] #[rustc_clean(cfg="bpass6")] enum EnumAddFieldTupleStyleVariant { Variant1(u32, u32, u32), @@ -355,9 +355,9 @@ enum EnumAddFieldStructStyleVariant { } #[cfg(not(any(bpass1,bpass4)))] -#[rustc_clean(cfg="bpass2", except="opt_hir_owner_nodes,type_of")] +#[rustc_clean(cfg="bpass2", except="owner,type_of")] #[rustc_clean(cfg="bpass3")] -#[rustc_clean(cfg="bpass5", except="opt_hir_owner_nodes,type_of")] +#[rustc_clean(cfg="bpass5", except="owner,type_of")] #[rustc_clean(cfg="bpass6")] enum EnumAddFieldStructStyleVariant { Variant1 { a: u32, b: u32, c: u32 }, @@ -373,9 +373,9 @@ enum EnumAddMustUse { } #[cfg(not(any(bpass1,bpass4)))] -#[rustc_clean(cfg="bpass2")] +#[rustc_clean(cfg="bpass2", except="owner")] #[rustc_clean(cfg="bpass3")] -#[rustc_clean(cfg="bpass5")] +#[rustc_clean(cfg="bpass5", except="owner")] #[rustc_clean(cfg="bpass6")] #[must_use] enum EnumAddMustUse { @@ -393,9 +393,9 @@ enum EnumAddReprC { } #[cfg(not(any(bpass1,bpass4)))] -#[rustc_clean(cfg="bpass2", except="type_of")] +#[rustc_clean(cfg="bpass2", except="type_of,owner")] #[rustc_clean(cfg="bpass3")] -#[rustc_clean(cfg="bpass5", except="type_of")] +#[rustc_clean(cfg="bpass5", except="type_of,owner")] #[rustc_clean(cfg="bpass6")] #[repr(C)] enum EnumAddReprC { @@ -412,9 +412,9 @@ enum EnumChangeNameOfTypeParameter { } #[cfg(not(any(bpass1,bpass4)))] -#[rustc_clean(cfg="bpass2", except="opt_hir_owner_nodes,generics_of,predicates_of,type_of")] +#[rustc_clean(cfg="bpass2", except="owner,generics_of,predicates_of,type_of")] #[rustc_clean(cfg="bpass3")] -#[rustc_clean(cfg="bpass5", except="opt_hir_owner_nodes,generics_of,predicates_of,type_of")] +#[rustc_clean(cfg="bpass5", except="owner,generics_of,predicates_of,type_of")] #[rustc_clean(cfg="bpass6")] enum EnumChangeNameOfTypeParameter { Variant1(T), @@ -430,9 +430,9 @@ enum EnumAddTypeParameter { } #[cfg(not(any(bpass1,bpass4)))] -#[rustc_clean(cfg="bpass2", except="opt_hir_owner_nodes,generics_of,predicates_of,type_of")] +#[rustc_clean(cfg="bpass2", except="owner,generics_of,predicates_of,type_of")] #[rustc_clean(cfg="bpass3")] -#[rustc_clean(cfg="bpass5", except="opt_hir_owner_nodes,generics_of,predicates_of,type_of")] +#[rustc_clean(cfg="bpass5", except="owner,generics_of,predicates_of,type_of")] #[rustc_clean(cfg="bpass6")] enum EnumAddTypeParameter { Variant1(S), @@ -448,9 +448,9 @@ enum EnumChangeNameOfLifetimeParameter<'a> { } #[cfg(not(any(bpass1,bpass4)))] -#[rustc_clean(cfg="bpass2", except="opt_hir_owner_nodes,generics_of,type_of")] +#[rustc_clean(cfg="bpass2", except="owner,generics_of,type_of")] #[rustc_clean(cfg="bpass3")] -#[rustc_clean(cfg="bpass5", except="opt_hir_owner_nodes,generics_of,type_of")] +#[rustc_clean(cfg="bpass5", except="owner,generics_of,type_of")] #[rustc_clean(cfg="bpass6")] enum EnumChangeNameOfLifetimeParameter<'b> { Variant1(&'b u32), @@ -466,9 +466,9 @@ enum EnumAddLifetimeParameter<'a> { } #[cfg(not(any(bpass1,bpass4)))] -#[rustc_clean(cfg="bpass2", except="opt_hir_owner_nodes,generics_of,type_of")] +#[rustc_clean(cfg="bpass2", except="owner,generics_of,type_of")] #[rustc_clean(cfg="bpass3")] -#[rustc_clean(cfg="bpass5", except="opt_hir_owner_nodes,generics_of,type_of")] +#[rustc_clean(cfg="bpass5", except="owner,generics_of,type_of")] #[rustc_clean(cfg="bpass6")] enum EnumAddLifetimeParameter<'a, 'b> { Variant1(&'a u32), @@ -485,9 +485,9 @@ enum EnumAddLifetimeParameterBound<'a, 'b> { } #[cfg(not(any(bpass1,bpass4)))] -#[rustc_clean(cfg="bpass2", except="opt_hir_owner_nodes,predicates_of")] +#[rustc_clean(cfg="bpass2", except="owner,predicates_of")] #[rustc_clean(cfg="bpass3")] -#[rustc_clean(cfg="bpass5", except="opt_hir_owner_nodes,predicates_of")] +#[rustc_clean(cfg="bpass5", except="owner,predicates_of")] #[rustc_clean(cfg="bpass6")] enum EnumAddLifetimeParameterBound<'a, 'b: 'a> { Variant1(&'a u32), @@ -502,9 +502,9 @@ enum EnumAddLifetimeBoundToParameter<'a, T> { } #[cfg(not(any(bpass1,bpass4)))] -#[rustc_clean(cfg="bpass2", except="opt_hir_owner_nodes,predicates_of")] +#[rustc_clean(cfg="bpass2", except="owner,predicates_of")] #[rustc_clean(cfg="bpass3")] -#[rustc_clean(cfg="bpass5", except="opt_hir_owner_nodes,predicates_of")] +#[rustc_clean(cfg="bpass5", except="owner,predicates_of")] #[rustc_clean(cfg="bpass6")] enum EnumAddLifetimeBoundToParameter<'a, T: 'a> { Variant1(T), @@ -520,9 +520,9 @@ enum EnumAddTraitBound { } #[cfg(not(any(bpass1,bpass4)))] -#[rustc_clean(cfg="bpass2", except="opt_hir_owner_nodes,generics_of,predicates_of,type_of")] +#[rustc_clean(cfg="bpass2", except="owner,generics_of,predicates_of,type_of")] #[rustc_clean(cfg="bpass3")] -#[rustc_clean(cfg="bpass5", except="opt_hir_owner_nodes,generics_of,predicates_of,type_of")] +#[rustc_clean(cfg="bpass5", except="owner,generics_of,predicates_of,type_of")] #[rustc_clean(cfg="bpass6")] enum EnumAddTraitBound { Variant1(T), @@ -538,9 +538,9 @@ enum EnumAddLifetimeParameterBoundWhere<'a, 'b> { } #[cfg(not(any(bpass1,bpass4)))] -#[rustc_clean(cfg="bpass2", except="opt_hir_owner_nodes,predicates_of")] +#[rustc_clean(cfg="bpass2", except="owner,predicates_of")] #[rustc_clean(cfg="bpass3")] -#[rustc_clean(cfg="bpass5", except="opt_hir_owner_nodes,predicates_of")] +#[rustc_clean(cfg="bpass5", except="owner,predicates_of")] #[rustc_clean(cfg="bpass6")] enum EnumAddLifetimeParameterBoundWhere<'a, 'b> where 'b: 'a { Variant1(&'a u32), @@ -557,9 +557,9 @@ enum EnumAddLifetimeBoundToParameterWhere<'a, T> { } #[cfg(not(any(bpass1,bpass4)))] -#[rustc_clean(cfg="bpass2", except="opt_hir_owner_nodes,predicates_of")] +#[rustc_clean(cfg="bpass2", except="owner,predicates_of")] #[rustc_clean(cfg="bpass3")] -#[rustc_clean(cfg="bpass5", except="opt_hir_owner_nodes,predicates_of")] +#[rustc_clean(cfg="bpass5", except="owner,predicates_of")] #[rustc_clean(cfg="bpass6")] enum EnumAddLifetimeBoundToParameterWhere<'a, T> where T: 'a { Variant1(T), @@ -575,9 +575,9 @@ enum EnumAddTraitBoundWhere { } #[cfg(not(any(bpass1,bpass4)))] -#[rustc_clean(cfg="bpass2", except="opt_hir_owner_nodes,generics_of,predicates_of,type_of")] +#[rustc_clean(cfg="bpass2", except="owner,generics_of,predicates_of,type_of")] #[rustc_clean(cfg="bpass3")] -#[rustc_clean(cfg="bpass5", except="opt_hir_owner_nodes,generics_of,predicates_of,type_of")] +#[rustc_clean(cfg="bpass5", except="owner,generics_of,predicates_of,type_of")] #[rustc_clean(cfg="bpass6")] enum EnumAddTraitBoundWhere where T: Sync { Variant1(T), @@ -593,9 +593,9 @@ enum EnumSwapUsageTypeParameters { } #[cfg(not(any(bpass1,bpass4)))] -#[rustc_clean(cfg="bpass2", except="opt_hir_owner_nodes")] +#[rustc_clean(cfg="bpass2", except="owner")] #[rustc_clean(cfg="bpass3")] -#[rustc_clean(cfg="bpass5", except="opt_hir_owner_nodes")] +#[rustc_clean(cfg="bpass5", except="owner")] #[rustc_clean(cfg="bpass6")] enum EnumSwapUsageTypeParameters { Variant1 { @@ -616,9 +616,9 @@ enum EnumSwapUsageLifetimeParameters<'a, 'b> { } #[cfg(not(any(bpass1,bpass4)))] -#[rustc_clean(cfg="bpass2", except="opt_hir_owner_nodes")] +#[rustc_clean(cfg="bpass2", except="owner")] #[rustc_clean(cfg="bpass3")] -#[rustc_clean(cfg="bpass5", except="opt_hir_owner_nodes")] +#[rustc_clean(cfg="bpass5", except="owner")] #[rustc_clean(cfg="bpass6")] enum EnumSwapUsageLifetimeParameters<'a, 'b> { Variant1 { @@ -643,9 +643,9 @@ mod change_field_type_indirectly_tuple_style { #[cfg(not(any(bpass1,bpass4)))] use super::ReferencedType2 as FieldType; - #[rustc_clean(cfg="bpass2", except="opt_hir_owner_nodes")] + #[rustc_clean(cfg="bpass2", except="owner")] #[rustc_clean(cfg="bpass3")] - #[rustc_clean(cfg="bpass5", except="opt_hir_owner_nodes")] + #[rustc_clean(cfg="bpass5", except="owner")] #[rustc_clean(cfg="bpass6")] enum TupleStyle { Variant1( @@ -663,9 +663,9 @@ mod change_field_type_indirectly_struct_style { #[cfg(not(any(bpass1,bpass4)))] use super::ReferencedType2 as FieldType; - #[rustc_clean(cfg="bpass2", except="opt_hir_owner_nodes")] + #[rustc_clean(cfg="bpass2", except="owner")] #[rustc_clean(cfg="bpass3")] - #[rustc_clean(cfg="bpass5", except="opt_hir_owner_nodes")] + #[rustc_clean(cfg="bpass5", except="owner")] #[rustc_clean(cfg="bpass6")] enum StructStyle { Variant1 { @@ -688,9 +688,9 @@ mod change_trait_bound_indirectly { #[cfg(not(any(bpass1,bpass4)))] use super::ReferencedTrait2 as Trait; - #[rustc_clean(cfg="bpass2", except="opt_hir_owner_nodes,predicates_of")] + #[rustc_clean(cfg="bpass2", except="owner,predicates_of")] #[rustc_clean(cfg="bpass3")] - #[rustc_clean(cfg="bpass5", except="opt_hir_owner_nodes,predicates_of")] + #[rustc_clean(cfg="bpass5", except="owner,predicates_of")] #[rustc_clean(cfg="bpass6")] enum Enum { Variant1(T) @@ -706,9 +706,9 @@ mod change_trait_bound_indirectly_where { #[cfg(not(any(bpass1,bpass4)))] use super::ReferencedTrait2 as Trait; - #[rustc_clean(cfg="bpass2", except="opt_hir_owner_nodes,predicates_of")] + #[rustc_clean(cfg="bpass2", except="owner,predicates_of")] #[rustc_clean(cfg="bpass3")] - #[rustc_clean(cfg="bpass5", except="opt_hir_owner_nodes,predicates_of")] + #[rustc_clean(cfg="bpass5", except="owner,predicates_of")] #[rustc_clean(cfg="bpass6")] enum Enum where T: Trait { Variant1(T) diff --git a/tests/incremental/hashes/exported_vs_not.rs b/tests/incremental/hashes/exported_vs_not.rs index e8e2234d4f076..6420dacd4cddd 100644 --- a/tests/incremental/hashes/exported_vs_not.rs +++ b/tests/incremental/hashes/exported_vs_not.rs @@ -11,7 +11,7 @@ #![crate_type="rlib"] // Case 1: The function body is not exported to metadata. If the body changes, -// the hash of the opt_hir_owner_nodes node should change, but not the hash of +// the hash of the owner node should change, but not the hash of // either the hir_owner or the Metadata node. #[cfg(any(bpass1,bpass4))] @@ -20,9 +20,9 @@ pub fn body_not_exported_to_metadata() -> u32 { } #[cfg(not(any(bpass1,bpass4)))] -#[rustc_clean(cfg="bpass2", except="opt_hir_owner_nodes,optimized_mir")] +#[rustc_clean(cfg="bpass2", except="owner,optimized_mir")] #[rustc_clean(cfg="bpass3")] -#[rustc_clean(cfg="bpass5", except="opt_hir_owner_nodes,optimized_mir")] +#[rustc_clean(cfg="bpass5", except="owner,optimized_mir")] #[rustc_clean(cfg="bpass6")] pub fn body_not_exported_to_metadata() -> u32 { 2 @@ -41,9 +41,9 @@ pub fn body_exported_to_metadata_because_of_inline() -> u32 { } #[cfg(not(any(bpass1,bpass4)))] -#[rustc_clean(cfg="bpass2", except="opt_hir_owner_nodes,optimized_mir")] +#[rustc_clean(cfg="bpass2", except="owner,optimized_mir")] #[rustc_clean(cfg="bpass3")] -#[rustc_clean(cfg="bpass5", except="opt_hir_owner_nodes,optimized_mir")] +#[rustc_clean(cfg="bpass5", except="owner,optimized_mir")] #[rustc_clean(cfg="bpass6")] #[inline] pub fn body_exported_to_metadata_because_of_inline() -> u32 { @@ -63,9 +63,9 @@ pub fn body_exported_to_metadata_because_of_generic() -> u32 { } #[cfg(not(any(bpass1,bpass4)))] -#[rustc_clean(cfg="bpass2", except="opt_hir_owner_nodes,optimized_mir")] +#[rustc_clean(cfg="bpass2", except="owner,optimized_mir")] #[rustc_clean(cfg="bpass3")] -#[rustc_clean(cfg="bpass5", except="opt_hir_owner_nodes,optimized_mir")] +#[rustc_clean(cfg="bpass5", except="owner,optimized_mir")] #[rustc_clean(cfg="bpass6")] #[inline] pub fn body_exported_to_metadata_because_of_generic() -> u32 { diff --git a/tests/incremental/hashes/extern_mods.rs b/tests/incremental/hashes/extern_mods.rs index 7c5ad564652fe..a2ed81a9e9d4e 100644 --- a/tests/incremental/hashes/extern_mods.rs +++ b/tests/incremental/hashes/extern_mods.rs @@ -25,9 +25,9 @@ extern "C" { } #[cfg(not(any(bpass1,bpass4)))] -#[rustc_clean(cfg = "bpass2", except = "opt_hir_owner_nodes")] +#[rustc_clean(cfg = "bpass2", except = "owner")] #[rustc_clean(cfg = "bpass3")] -#[rustc_clean(cfg = "bpass5", except = "opt_hir_owner_nodes")] +#[rustc_clean(cfg = "bpass5", except = "owner")] #[rustc_clean(cfg = "bpass6")] extern "C" { pub fn change_function_name2(c: i64) -> i32; @@ -40,9 +40,9 @@ extern "C" { } #[cfg(not(any(bpass1,bpass4)))] -#[rustc_clean(cfg = "bpass2")] +#[rustc_clean(cfg="bpass2", except="owner")] #[rustc_clean(cfg = "bpass3")] -#[rustc_clean(cfg = "bpass5")] +#[rustc_clean(cfg="bpass5", except="owner")] #[rustc_clean(cfg = "bpass6")] extern "C" { pub fn change_parameter_name(d: i64) -> i32; @@ -55,9 +55,9 @@ extern "C" { } #[cfg(not(any(bpass1,bpass4)))] -#[rustc_clean(cfg = "bpass2")] +#[rustc_clean(cfg="bpass2", except="owner")] #[rustc_clean(cfg = "bpass3")] -#[rustc_clean(cfg = "bpass5")] +#[rustc_clean(cfg="bpass5", except="owner")] #[rustc_clean(cfg = "bpass6")] extern "C" { pub fn change_parameter_type(c: i32) -> i32; @@ -70,9 +70,9 @@ extern "C" { } #[cfg(not(any(bpass1,bpass4)))] -#[rustc_clean(cfg = "bpass2")] +#[rustc_clean(cfg="bpass2", except="owner")] #[rustc_clean(cfg = "bpass3")] -#[rustc_clean(cfg = "bpass5")] +#[rustc_clean(cfg="bpass5", except="owner")] #[rustc_clean(cfg = "bpass6")] extern "C" { pub fn change_return_type(c: i32) -> i8 ; @@ -85,9 +85,9 @@ extern "C" { } #[cfg(not(any(bpass1,bpass4)))] -#[rustc_clean(cfg = "bpass2")] +#[rustc_clean(cfg="bpass2", except="owner")] #[rustc_clean(cfg = "bpass3")] -#[rustc_clean(cfg = "bpass5")] +#[rustc_clean(cfg="bpass5", except="owner")] #[rustc_clean(cfg = "bpass6")] extern "C" { pub fn add_parameter(c: i32, d: i32) -> i32; @@ -100,9 +100,9 @@ extern "C" { } #[cfg(not(any(bpass1,bpass4)))] -#[rustc_clean(cfg = "bpass2")] +#[rustc_clean(cfg="bpass2", except="owner")] #[rustc_clean(cfg = "bpass3")] -#[rustc_clean(cfg = "bpass5")] +#[rustc_clean(cfg="bpass5", except="owner")] #[rustc_clean(cfg = "bpass6")] extern "C" { pub fn add_return_type(c: i32) -> i32; @@ -115,9 +115,9 @@ extern "C" { } #[cfg(not(any(bpass1,bpass4)))] -#[rustc_clean(cfg = "bpass2")] +#[rustc_clean(cfg="bpass2", except="owner")] #[rustc_clean(cfg = "bpass3")] -#[rustc_clean(cfg = "bpass5")] +#[rustc_clean(cfg="bpass5", except="owner")] #[rustc_clean(cfg = "bpass6")] extern "C" { pub fn make_function_variadic(c: i32, ...); @@ -130,9 +130,9 @@ extern "C" { } #[cfg(not(any(bpass1,bpass4)))] -#[rustc_clean(cfg = "bpass2", except = "opt_hir_owner_nodes")] +#[rustc_clean(cfg = "bpass2", except = "owner")] #[rustc_clean(cfg = "bpass3")] -#[rustc_clean(cfg = "bpass5", except = "opt_hir_owner_nodes")] +#[rustc_clean(cfg = "bpass5", except = "owner")] #[rustc_clean(cfg = "bpass6")] extern "rust-call" { pub fn change_calling_convention(c: (i32,)); @@ -145,9 +145,9 @@ extern "C" { } #[cfg(not(any(bpass1,bpass4)))] -#[rustc_clean(cfg = "bpass2")] +#[rustc_clean(cfg="bpass2", except="owner")] #[rustc_clean(cfg = "bpass3")] -#[rustc_clean(cfg = "bpass5")] +#[rustc_clean(cfg="bpass5", except="owner")] #[rustc_clean(cfg = "bpass6")] extern "C" { pub fn make_function_public(c: i32); @@ -160,9 +160,9 @@ extern "C" { } #[cfg(not(any(bpass1,bpass4)))] -#[rustc_clean(cfg = "bpass2", except = "opt_hir_owner_nodes")] +#[rustc_clean(cfg = "bpass2", except = "owner")] #[rustc_clean(cfg = "bpass3")] -#[rustc_clean(cfg = "bpass5", except = "opt_hir_owner_nodes")] +#[rustc_clean(cfg = "bpass5", except = "owner")] #[rustc_clean(cfg = "bpass6")] extern "C" { pub fn add_function1(c: i32); @@ -177,9 +177,9 @@ extern "C" { } #[cfg(not(any(bpass1,bpass4)))] -#[rustc_clean(cfg = "bpass2")] +#[rustc_clean(cfg="bpass2", except="owner")] #[rustc_clean(cfg = "bpass3")] -#[rustc_clean(cfg = "bpass5")] +#[rustc_clean(cfg="bpass5", except="owner")] #[rustc_clean(cfg = "bpass6")] #[link(name = "bar")] extern "C" { @@ -196,9 +196,9 @@ mod indirectly_change_parameter_type { #[cfg(not(any(bpass1,bpass4)))] use super::c_i64 as c_int; - #[rustc_clean(cfg = "bpass2")] + #[rustc_clean(cfg="bpass2")] #[rustc_clean(cfg = "bpass3")] - #[rustc_clean(cfg = "bpass5")] + #[rustc_clean(cfg="bpass5")] #[rustc_clean(cfg = "bpass6")] extern "C" { pub fn indirectly_change_parameter_type(c: c_int); @@ -212,9 +212,9 @@ mod indirectly_change_return_type { #[cfg(not(any(bpass1,bpass4)))] use super::c_i64 as c_int; - #[rustc_clean(cfg = "bpass2")] + #[rustc_clean(cfg="bpass2")] #[rustc_clean(cfg = "bpass3")] - #[rustc_clean(cfg = "bpass5")] + #[rustc_clean(cfg="bpass5")] #[rustc_clean(cfg = "bpass6")] extern "C" { pub fn indirectly_change_return_type() -> c_int; diff --git a/tests/incremental/hashes/for_loops.rs b/tests/incremental/hashes/for_loops.rs index 17d67a32ff55c..d1480eaba8c87 100644 --- a/tests/incremental/hashes/for_loops.rs +++ b/tests/incremental/hashes/for_loops.rs @@ -29,9 +29,9 @@ pub fn change_loop_body() { } #[cfg(not(any(bpass1,bpass4)))] -#[rustc_clean(cfg="bpass2", except="opt_hir_owner_nodes, optimized_mir")] +#[rustc_clean(cfg="bpass2", except="owner, optimized_mir")] #[rustc_clean(cfg="bpass3")] -#[rustc_clean(cfg="bpass5", except="opt_hir_owner_nodes, optimized_mir")] +#[rustc_clean(cfg="bpass5", except="owner, optimized_mir")] #[rustc_clean(cfg="bpass6")] pub fn change_loop_body() { let mut _x = 0; @@ -54,9 +54,9 @@ pub fn change_iteration_variable_name() { } #[cfg(not(any(bpass1,bpass4)))] -#[rustc_clean(cfg="bpass2", except="opt_hir_owner_nodes, optimized_mir")] +#[rustc_clean(cfg="bpass2", except="owner, optimized_mir")] #[rustc_clean(cfg="bpass3")] -#[rustc_clean(cfg="bpass5", except="opt_hir_owner_nodes, optimized_mir")] +#[rustc_clean(cfg="bpass5", except="owner, optimized_mir")] #[rustc_clean(cfg="bpass6")] pub fn change_iteration_variable_name() { let mut _x = 0; @@ -79,9 +79,9 @@ pub fn change_iteration_variable_pattern() { } #[cfg(not(any(bpass1,bpass4)))] -#[rustc_clean(cfg="bpass2", except="opt_hir_owner_nodes, optimized_mir, typeck_root")] +#[rustc_clean(cfg="bpass2", except="owner, optimized_mir, typeck_root")] #[rustc_clean(cfg="bpass3")] -#[rustc_clean(cfg="bpass5", except="opt_hir_owner_nodes, optimized_mir, typeck_root")] +#[rustc_clean(cfg="bpass5", except="owner, optimized_mir, typeck_root")] #[rustc_clean(cfg="bpass6")] pub fn change_iteration_variable_pattern() { let mut _x = 0; @@ -104,9 +104,9 @@ pub fn change_iterable() { } #[cfg(not(any(bpass1,bpass4)))] -#[rustc_clean(cfg="bpass2", except="opt_hir_owner_nodes, promoted_mir")] +#[rustc_clean(cfg="bpass2", except="owner, promoted_mir")] #[rustc_clean(cfg="bpass3")] -#[rustc_clean(cfg="bpass5", except="opt_hir_owner_nodes, promoted_mir")] +#[rustc_clean(cfg="bpass5", except="owner, promoted_mir")] #[rustc_clean(cfg="bpass6")] pub fn change_iterable() { let mut _x = 0; @@ -129,9 +129,9 @@ pub fn add_break() { } #[cfg(not(any(bpass1,bpass4)))] -#[rustc_clean(cfg="bpass2", except="opt_hir_owner_nodes, optimized_mir, typeck_root")] +#[rustc_clean(cfg="bpass2", except="owner, optimized_mir, typeck_root")] #[rustc_clean(cfg="bpass3")] -#[rustc_clean(cfg="bpass5", except="opt_hir_owner_nodes, optimized_mir, typeck_root")] +#[rustc_clean(cfg="bpass5", except="owner, optimized_mir, typeck_root")] #[rustc_clean(cfg="bpass6")] pub fn add_break() { let mut _x = 0; @@ -154,9 +154,9 @@ pub fn add_loop_label() { } #[cfg(not(any(bpass1,bpass4)))] -#[rustc_clean(cfg="bpass2", except="opt_hir_owner_nodes")] +#[rustc_clean(cfg="bpass2", except="owner")] #[rustc_clean(cfg="bpass3")] -#[rustc_clean(cfg="bpass5", except="opt_hir_owner_nodes, optimized_mir")] +#[rustc_clean(cfg="bpass5", except="owner, optimized_mir")] #[rustc_clean(cfg="bpass6")] pub fn add_loop_label() { let mut _x = 0; @@ -179,9 +179,9 @@ pub fn add_loop_label_to_break() { } #[cfg(not(any(bpass1,bpass4)))] -#[rustc_clean(cfg="bpass2", except="opt_hir_owner_nodes")] +#[rustc_clean(cfg="bpass2", except="owner")] #[rustc_clean(cfg="bpass3")] -#[rustc_clean(cfg="bpass5", except="opt_hir_owner_nodes, optimized_mir")] +#[rustc_clean(cfg="bpass5", except="owner, optimized_mir")] #[rustc_clean(cfg="bpass6")] pub fn add_loop_label_to_break() { let mut _x = 0; @@ -206,9 +206,9 @@ pub fn change_break_label() { } #[cfg(not(any(bpass1,bpass4)))] -#[rustc_clean(cfg="bpass2", except="opt_hir_owner_nodes, optimized_mir")] +#[rustc_clean(cfg="bpass2", except="owner, optimized_mir")] #[rustc_clean(cfg="bpass3")] -#[rustc_clean(cfg="bpass5", except="opt_hir_owner_nodes, optimized_mir")] +#[rustc_clean(cfg="bpass5", except="owner, optimized_mir")] #[rustc_clean(cfg="bpass6")] pub fn change_break_label() { let mut _x = 0; @@ -233,9 +233,9 @@ pub fn add_loop_label_to_continue() { } #[cfg(not(any(bpass1,bpass4)))] -#[rustc_clean(cfg="bpass2", except="opt_hir_owner_nodes")] +#[rustc_clean(cfg="bpass2", except="owner")] #[rustc_clean(cfg="bpass3")] -#[rustc_clean(cfg="bpass5", except="opt_hir_owner_nodes")] +#[rustc_clean(cfg="bpass5", except="owner")] #[rustc_clean(cfg="bpass6")] pub fn add_loop_label_to_continue() { let mut _x = 0; @@ -260,9 +260,9 @@ pub fn change_continue_label() { } #[cfg(not(any(bpass1,bpass4)))] -#[rustc_clean(cfg="bpass2", except="opt_hir_owner_nodes, optimized_mir")] +#[rustc_clean(cfg="bpass2", except="owner, optimized_mir")] #[rustc_clean(cfg="bpass3")] -#[rustc_clean(cfg="bpass5", except="opt_hir_owner_nodes, optimized_mir")] +#[rustc_clean(cfg="bpass5", except="owner, optimized_mir")] #[rustc_clean(cfg="bpass6")] pub fn change_continue_label() { let mut _x = 0; @@ -287,9 +287,9 @@ pub fn change_continue_to_break() { } #[cfg(not(any(bpass1,bpass4)))] -#[rustc_clean(cfg="bpass2", except="opt_hir_owner_nodes, optimized_mir")] +#[rustc_clean(cfg="bpass2", except="owner, optimized_mir")] #[rustc_clean(cfg="bpass3")] -#[rustc_clean(cfg="bpass5", except="opt_hir_owner_nodes, optimized_mir")] +#[rustc_clean(cfg="bpass5", except="owner, optimized_mir")] #[rustc_clean(cfg="bpass6")] pub fn change_continue_to_break() { let mut _x = 0; diff --git a/tests/incremental/hashes/function_interfaces.rs b/tests/incremental/hashes/function_interfaces.rs index 87719f22b947e..64beeb2c8c19a 100644 --- a/tests/incremental/hashes/function_interfaces.rs +++ b/tests/incremental/hashes/function_interfaces.rs @@ -26,12 +26,12 @@ pub fn add_parameter() {} #[cfg(not(any(bpass1,bpass4)))] #[rustc_clean( cfg = "bpass2", - except = "opt_hir_owner_nodes, optimized_mir, typeck_root, fn_sig" + except = "owner, optimized_mir, typeck_root, fn_sig" )] #[rustc_clean(cfg = "bpass3")] #[rustc_clean( cfg = "bpass5", - except = "opt_hir_owner_nodes, optimized_mir, typeck_root, fn_sig" + except = "owner, optimized_mir, typeck_root, fn_sig" )] #[rustc_clean(cfg = "bpass6")] pub fn add_parameter(p: i32) {} @@ -42,9 +42,9 @@ pub fn add_parameter(p: i32) {} pub fn add_return_type() {} #[cfg(not(any(bpass1,bpass4)))] -#[rustc_clean(cfg = "bpass2", except = "opt_hir_owner_nodes")] +#[rustc_clean(cfg = "bpass2", except = "owner")] #[rustc_clean(cfg = "bpass3")] -#[rustc_clean(cfg = "bpass5", except = "opt_hir_owner_nodes, optimized_mir")] +#[rustc_clean(cfg = "bpass5", except = "owner, optimized_mir")] #[rustc_clean(cfg = "bpass6")] pub fn add_return_type() -> () {} @@ -56,12 +56,12 @@ pub fn type_of_parameter(p: i32) {} #[cfg(not(any(bpass1,bpass4)))] #[rustc_clean( cfg = "bpass2", - except = "opt_hir_owner_nodes, optimized_mir, typeck_root, fn_sig" + except = "owner, optimized_mir, typeck_root, fn_sig" )] #[rustc_clean(cfg = "bpass3")] #[rustc_clean( cfg = "bpass5", - except = "opt_hir_owner_nodes, optimized_mir, typeck_root, fn_sig" + except = "owner, optimized_mir, typeck_root, fn_sig" )] #[rustc_clean(cfg = "bpass6")] pub fn type_of_parameter(p: i64) {} @@ -74,12 +74,12 @@ pub fn type_of_parameter_ref(p: &i32) {} #[cfg(not(any(bpass1,bpass4)))] #[rustc_clean( cfg = "bpass2", - except = "opt_hir_owner_nodes, optimized_mir, typeck_root, fn_sig" + except = "owner, optimized_mir, typeck_root, fn_sig" )] #[rustc_clean(cfg = "bpass3")] #[rustc_clean( cfg = "bpass5", - except = "opt_hir_owner_nodes, optimized_mir, typeck_root, fn_sig" + except = "owner, optimized_mir, typeck_root, fn_sig" )] #[rustc_clean(cfg = "bpass6")] pub fn type_of_parameter_ref(p: &mut i32) {} @@ -92,12 +92,12 @@ pub fn order_of_parameters(p1: i32, p2: i64) {} #[cfg(not(any(bpass1,bpass4)))] #[rustc_clean( cfg = "bpass2", - except = "opt_hir_owner_nodes, optimized_mir, typeck_root, fn_sig" + except = "owner, optimized_mir, typeck_root, fn_sig" )] #[rustc_clean(cfg = "bpass3")] #[rustc_clean( cfg = "bpass5", - except = "opt_hir_owner_nodes, optimized_mir, typeck_root, fn_sig" + except = "owner, optimized_mir, typeck_root, fn_sig" )] #[rustc_clean(cfg = "bpass6")] pub fn order_of_parameters(p2: i64, p1: i32) {} @@ -110,12 +110,12 @@ pub fn make_unsafe() {} #[cfg(not(any(bpass1,bpass4)))] #[rustc_clean( cfg = "bpass2", - except = "opt_hir_owner_nodes, typeck_root, fn_sig" + except = "owner, typeck_root, fn_sig" )] #[rustc_clean(cfg = "bpass3")] #[rustc_clean( cfg = "bpass5", - except = "opt_hir_owner_nodes, typeck_root, fn_sig" + except = "owner, typeck_root, fn_sig" )] #[rustc_clean(cfg = "bpass6")] pub unsafe fn make_unsafe() {} @@ -126,9 +126,9 @@ pub unsafe fn make_unsafe() {} pub fn make_extern() {} #[cfg(not(any(bpass1,bpass4)))] -#[rustc_clean(cfg = "bpass2", except = "opt_hir_owner_nodes, typeck_root, fn_sig")] +#[rustc_clean(cfg = "bpass2", except = "owner, typeck_root, fn_sig")] #[rustc_clean(cfg = "bpass3")] -#[rustc_clean(cfg = "bpass5", except = "opt_hir_owner_nodes, typeck_root, fn_sig")] +#[rustc_clean(cfg = "bpass5", except = "owner, typeck_root, fn_sig")] #[rustc_clean(cfg = "bpass6")] pub extern "C" fn make_extern() {} @@ -140,12 +140,12 @@ pub fn type_parameter () {} #[cfg(not(any(bpass1,bpass4)))] #[rustc_clean( cfg = "bpass2", - except = "opt_hir_owner_nodes, generics_of, type_of, predicates_of" + except = "owner, generics_of, type_of, predicates_of" )] #[rustc_clean(cfg = "bpass3")] #[rustc_clean( cfg = "bpass5", - except = "opt_hir_owner_nodes, generics_of, type_of, predicates_of" + except = "owner, generics_of, type_of, predicates_of" )] #[rustc_clean(cfg = "bpass6")] pub fn type_parameter() {} @@ -156,9 +156,9 @@ pub fn type_parameter() {} pub fn lifetime_parameter () {} #[cfg(not(any(bpass1,bpass4)))] -#[rustc_clean(cfg = "bpass2", except = "opt_hir_owner_nodes, generics_of,fn_sig")] +#[rustc_clean(cfg = "bpass2", except = "owner, generics_of,fn_sig")] #[rustc_clean(cfg = "bpass3")] -#[rustc_clean(cfg = "bpass5", except = "opt_hir_owner_nodes, generics_of,fn_sig")] +#[rustc_clean(cfg = "bpass5", except = "owner, generics_of,fn_sig")] #[rustc_clean(cfg = "bpass6")] pub fn lifetime_parameter<'a>() {} @@ -168,7 +168,7 @@ pub fn lifetime_parameter<'a>() {} pub fn trait_bound() {} #[cfg(not(any(bpass1,bpass4)))] -#[rustc_clean(cfg = "bpass2", except = "opt_hir_owner_nodes, predicates_of")] +#[rustc_clean(cfg = "bpass2", except = "owner, predicates_of")] #[rustc_clean(cfg = "bpass3")] pub fn trait_bound() {} @@ -178,9 +178,9 @@ pub fn trait_bound() {} pub fn builtin_bound() {} #[cfg(not(any(bpass1,bpass4)))] -#[rustc_clean(cfg = "bpass2", except = "opt_hir_owner_nodes, predicates_of")] +#[rustc_clean(cfg = "bpass2", except = "owner, predicates_of")] #[rustc_clean(cfg = "bpass3")] -#[rustc_clean(cfg = "bpass5", except = "opt_hir_owner_nodes, predicates_of")] +#[rustc_clean(cfg = "bpass5", except = "owner, predicates_of")] #[rustc_clean(cfg = "bpass6")] pub fn builtin_bound() {} @@ -192,12 +192,12 @@ pub fn lifetime_bound<'a, T>() {} #[cfg(not(any(bpass1,bpass4)))] #[rustc_clean( cfg = "bpass2", - except = "opt_hir_owner_nodes, generics_of, type_of, predicates_of,fn_sig" + except = "owner, generics_of, type_of, predicates_of,fn_sig" )] #[rustc_clean(cfg = "bpass3")] #[rustc_clean( cfg = "bpass5", - except = "opt_hir_owner_nodes, generics_of, type_of, predicates_of,fn_sig,optimized_mir" + except = "owner, generics_of, type_of, predicates_of,fn_sig,optimized_mir" )] #[rustc_clean(cfg = "bpass6")] pub fn lifetime_bound<'a, T: 'a>() {} @@ -208,7 +208,7 @@ pub fn lifetime_bound<'a, T: 'a>() {} pub fn second_trait_bound() {} #[cfg(not(any(bpass1,bpass4)))] -#[rustc_clean(cfg = "bpass2", except = "opt_hir_owner_nodes, predicates_of")] +#[rustc_clean(cfg = "bpass2", except = "owner, predicates_of")] #[rustc_clean(cfg = "bpass3")] pub fn second_trait_bound() {} @@ -218,9 +218,9 @@ pub fn second_trait_bound() {} pub fn second_builtin_bound() {} #[cfg(not(any(bpass1,bpass4)))] -#[rustc_clean(cfg = "bpass2", except = "opt_hir_owner_nodes")] +#[rustc_clean(cfg = "bpass2", except = "owner")] #[rustc_clean(cfg = "bpass3")] -#[rustc_clean(cfg = "bpass5", except = "opt_hir_owner_nodes, predicates_of")] +#[rustc_clean(cfg = "bpass5", except = "owner, predicates_of")] #[rustc_clean(cfg = "bpass6")] pub fn second_builtin_bound() {} @@ -232,12 +232,12 @@ pub fn second_lifetime_bound<'a, 'b, T: 'a >() {} #[cfg(not(any(bpass1,bpass4)))] #[rustc_clean( cfg = "bpass2", - except = "opt_hir_owner_nodes, generics_of, type_of, predicates_of,fn_sig" + except = "owner, generics_of, type_of, predicates_of,fn_sig" )] #[rustc_clean(cfg = "bpass3")] #[rustc_clean( cfg = "bpass5", - except = "opt_hir_owner_nodes, generics_of, type_of, predicates_of,fn_sig" + except = "owner, generics_of, type_of, predicates_of,fn_sig" )] #[rustc_clean(cfg = "bpass6")] pub fn second_lifetime_bound<'a, 'b, T: 'a + 'b>() {} @@ -248,9 +248,9 @@ pub fn second_lifetime_bound<'a, 'b, T: 'a + 'b>() {} pub fn inline() {} #[cfg(not(any(bpass1,bpass4)))] -#[rustc_clean(cfg = "bpass2")] +#[rustc_clean(cfg="bpass2", except="owner")] #[rustc_clean(cfg = "bpass3")] -#[rustc_clean(cfg = "bpass5")] +#[rustc_clean(cfg="bpass5", except="owner")] #[rustc_clean(cfg = "bpass6")] #[inline] pub fn inline() {} @@ -262,9 +262,9 @@ pub fn inline() {} pub fn inline_never() {} #[cfg(not(any(bpass1,bpass4)))] -#[rustc_clean(cfg = "bpass2")] +#[rustc_clean(cfg="bpass2", except="owner")] #[rustc_clean(cfg = "bpass3")] -#[rustc_clean(cfg = "bpass5")] +#[rustc_clean(cfg="bpass5", except="owner")] #[rustc_clean(cfg = "bpass6")] #[inline(never)] pub fn inline_never() {} @@ -275,9 +275,9 @@ pub fn inline_never() {} pub fn no_mangle() {} #[cfg(not(any(bpass1,bpass4)))] -#[rustc_clean(cfg = "bpass2")] +#[rustc_clean(cfg="bpass2", except="owner")] #[rustc_clean(cfg = "bpass3")] -#[rustc_clean(cfg = "bpass5")] +#[rustc_clean(cfg="bpass5", except="owner")] #[rustc_clean(cfg = "bpass6")] #[unsafe(no_mangle)] pub fn no_mangle() {} @@ -288,9 +288,9 @@ pub fn no_mangle() {} pub fn linkage() {} #[cfg(not(any(bpass1,bpass4)))] -#[rustc_clean(cfg = "bpass2")] +#[rustc_clean(cfg="bpass2", except="owner")] #[rustc_clean(cfg = "bpass3")] -#[rustc_clean(cfg = "bpass5")] +#[rustc_clean(cfg="bpass5", except="owner")] #[rustc_clean(cfg = "bpass6")] #[linkage = "weak_odr"] pub fn linkage() {} @@ -303,9 +303,9 @@ pub fn return_impl_trait() -> i32 { } #[cfg(not(any(bpass1,bpass4)))] -#[rustc_clean(cfg = "bpass2", except = "opt_hir_owner_nodes, typeck_root, fn_sig")] +#[rustc_clean(cfg = "bpass2", except = "owner, typeck_root, fn_sig")] #[rustc_clean(cfg = "bpass3")] -#[rustc_clean(cfg = "bpass5", except = "opt_hir_owner_nodes, typeck_root, fn_sig, optimized_mir")] +#[rustc_clean(cfg = "bpass5", except = "owner, typeck_root, fn_sig, optimized_mir")] #[rustc_clean(cfg = "bpass6")] pub fn return_impl_trait() -> impl Clone { 0 @@ -319,9 +319,9 @@ pub fn change_return_impl_trait() -> impl Clone { } #[cfg(not(any(bpass1,bpass4)))] -#[rustc_clean(cfg = "bpass2", except = "opt_hir_owner_nodes")] +#[rustc_clean(cfg = "bpass2", except = "owner")] #[rustc_clean(cfg = "bpass3")] -#[rustc_clean(cfg = "bpass5", except = "opt_hir_owner_nodes, typeck_root")] +#[rustc_clean(cfg = "bpass5", except = "owner, typeck_root")] #[rustc_clean(cfg = "bpass6")] pub fn change_return_impl_trait() -> impl Copy { 0u32 @@ -340,12 +340,12 @@ pub mod change_return_type_indirectly { #[rustc_clean( cfg = "bpass2", - except = "opt_hir_owner_nodes, optimized_mir, typeck_root, fn_sig" + except = "owner, optimized_mir, typeck_root, fn_sig" )] #[rustc_clean(cfg = "bpass3")] #[rustc_clean( cfg = "bpass5", - except = "opt_hir_owner_nodes, optimized_mir, typeck_root, fn_sig" + except = "owner, optimized_mir, typeck_root, fn_sig" )] #[rustc_clean(cfg = "bpass6")] pub fn indirect_return_type() -> ReturnType { @@ -363,12 +363,12 @@ pub mod change_parameter_type_indirectly { #[rustc_clean( cfg = "bpass2", - except = "opt_hir_owner_nodes, optimized_mir, typeck_root, fn_sig" + except = "owner, optimized_mir, typeck_root, fn_sig" )] #[rustc_clean(cfg = "bpass3")] #[rustc_clean( cfg = "bpass5", - except = "opt_hir_owner_nodes, optimized_mir, typeck_root, fn_sig" + except = "owner, optimized_mir, typeck_root, fn_sig" )] #[rustc_clean(cfg = "bpass6")] pub fn indirect_parameter_type(p: ParameterType) {} @@ -385,9 +385,9 @@ pub mod change_trait_bound_indirectly { #[cfg(not(any(bpass1,bpass4)))] use super::ReferencedTrait2 as Trait; - #[rustc_clean(cfg = "bpass2", except = "opt_hir_owner_nodes, predicates_of")] + #[rustc_clean(cfg = "bpass2", except = "owner, predicates_of")] #[rustc_clean(cfg = "bpass3")] - #[rustc_clean(cfg = "bpass5", except = "opt_hir_owner_nodes, predicates_of")] + #[rustc_clean(cfg = "bpass5", except = "owner, predicates_of")] #[rustc_clean(cfg = "bpass6")] pub fn indirect_trait_bound(p: T) {} } @@ -400,9 +400,9 @@ pub mod change_trait_bound_indirectly_in_where_clause { #[cfg(not(any(bpass1,bpass4)))] use super::ReferencedTrait2 as Trait; - #[rustc_clean(cfg = "bpass2", except = "opt_hir_owner_nodes, predicates_of")] + #[rustc_clean(cfg = "bpass2", except = "owner, predicates_of")] #[rustc_clean(cfg = "bpass3")] - #[rustc_clean(cfg = "bpass5", except = "opt_hir_owner_nodes, predicates_of")] + #[rustc_clean(cfg = "bpass5", except = "owner, predicates_of")] #[rustc_clean(cfg = "bpass6")] pub fn indirect_trait_bound_where(p: T) where diff --git a/tests/incremental/hashes/if_expressions.rs b/tests/incremental/hashes/if_expressions.rs index 3f311d030d8d8..0b416060da01e 100644 --- a/tests/incremental/hashes/if_expressions.rs +++ b/tests/incremental/hashes/if_expressions.rs @@ -28,9 +28,9 @@ pub fn change_condition(x: bool) -> u32 { } #[cfg(not(any(bpass1,bpass4)))] -#[rustc_clean(cfg="bpass2", except="opt_hir_owner_nodes,optimized_mir,typeck_root")] +#[rustc_clean(cfg="bpass2", except="owner,optimized_mir,typeck_root")] #[rustc_clean(cfg="bpass3")] -#[rustc_clean(cfg="bpass5", except="opt_hir_owner_nodes,optimized_mir,typeck_root")] +#[rustc_clean(cfg="bpass5", except="owner,optimized_mir,typeck_root")] #[rustc_clean(cfg="bpass6")] pub fn change_condition(x: bool) -> u32 { if !x { @@ -51,9 +51,9 @@ pub fn change_then_branch(x: bool) -> u32 { } #[cfg(not(any(bpass1,bpass4)))] -#[rustc_clean(cfg="bpass2", except="opt_hir_owner_nodes,optimized_mir")] +#[rustc_clean(cfg="bpass2", except="owner,optimized_mir")] #[rustc_clean(cfg="bpass3")] -#[rustc_clean(cfg="bpass5", except="opt_hir_owner_nodes,optimized_mir")] +#[rustc_clean(cfg="bpass5", except="owner,optimized_mir")] #[rustc_clean(cfg="bpass6")] pub fn change_then_branch(x: bool) -> u32 { if x { @@ -76,9 +76,9 @@ pub fn change_else_branch(x: bool) -> u32 { } #[cfg(not(any(bpass1,bpass4)))] -#[rustc_clean(cfg="bpass2", except="opt_hir_owner_nodes,optimized_mir")] +#[rustc_clean(cfg="bpass2", except="owner,optimized_mir")] #[rustc_clean(cfg="bpass3")] -#[rustc_clean(cfg="bpass5", except="opt_hir_owner_nodes,optimized_mir")] +#[rustc_clean(cfg="bpass5", except="owner,optimized_mir")] #[rustc_clean(cfg="bpass6")] pub fn change_else_branch(x: bool) -> u32 { if x { @@ -104,9 +104,9 @@ pub fn add_else_branch(x: bool) -> u32 { } #[cfg(not(any(bpass1,bpass4)))] -#[rustc_clean(cfg="bpass2", except="opt_hir_owner_nodes,typeck_root")] +#[rustc_clean(cfg="bpass2", except="owner,typeck_root")] #[rustc_clean(cfg="bpass3")] -#[rustc_clean(cfg="bpass5", except="opt_hir_owner_nodes,typeck_root")] +#[rustc_clean(cfg="bpass5", except="owner,typeck_root")] #[rustc_clean(cfg="bpass6")] pub fn add_else_branch(x: bool) -> u32 { let mut ret = 1; @@ -132,9 +132,9 @@ pub fn change_condition_if_let(x: Option) -> u32 { } #[cfg(not(any(bpass1,bpass4)))] -#[rustc_clean(cfg="bpass2", except="opt_hir_owner_nodes,optimized_mir,typeck_root")] +#[rustc_clean(cfg="bpass2", except="owner,optimized_mir,typeck_root")] #[rustc_clean(cfg="bpass3")] -#[rustc_clean(cfg="bpass5", except="opt_hir_owner_nodes,optimized_mir,typeck_root")] +#[rustc_clean(cfg="bpass5", except="owner,optimized_mir,typeck_root")] #[rustc_clean(cfg="bpass6")] pub fn change_condition_if_let(x: Option) -> u32 { if let Some(_ ) = x { @@ -157,9 +157,9 @@ pub fn change_then_branch_if_let(x: Option) -> u32 { } #[cfg(not(any(bpass1,bpass4)))] -#[rustc_clean(cfg="bpass2", except="opt_hir_owner_nodes,optimized_mir,typeck_root")] +#[rustc_clean(cfg="bpass2", except="owner,optimized_mir,typeck_root")] #[rustc_clean(cfg="bpass3")] -#[rustc_clean(cfg="bpass5", except="opt_hir_owner_nodes,optimized_mir,typeck_root")] +#[rustc_clean(cfg="bpass5", except="owner,optimized_mir,typeck_root")] #[rustc_clean(cfg="bpass6")] pub fn change_then_branch_if_let(x: Option) -> u32 { if let Some(x) = x { @@ -182,9 +182,9 @@ pub fn change_else_branch_if_let(x: Option) -> u32 { } #[cfg(not(any(bpass1,bpass4)))] -#[rustc_clean(cfg="bpass2", except="opt_hir_owner_nodes,optimized_mir")] +#[rustc_clean(cfg="bpass2", except="owner,optimized_mir")] #[rustc_clean(cfg="bpass3")] -#[rustc_clean(cfg="bpass5", except="opt_hir_owner_nodes,optimized_mir")] +#[rustc_clean(cfg="bpass5", except="owner,optimized_mir")] #[rustc_clean(cfg="bpass6")] pub fn change_else_branch_if_let(x: Option) -> u32 { if let Some(x) = x { @@ -210,9 +210,9 @@ pub fn add_else_branch_if_let(x: Option) -> u32 { } #[cfg(not(any(bpass1,bpass4)))] -#[rustc_clean(cfg="bpass2", except="opt_hir_owner_nodes,typeck_root")] +#[rustc_clean(cfg="bpass2", except="owner,typeck_root")] #[rustc_clean(cfg="bpass3")] -#[rustc_clean(cfg="bpass5", except="opt_hir_owner_nodes,typeck_root,optimized_mir")] +#[rustc_clean(cfg="bpass5", except="owner,typeck_root,optimized_mir")] #[rustc_clean(cfg="bpass6")] pub fn add_else_branch_if_let(x: Option) -> u32 { let mut ret = 1; diff --git a/tests/incremental/hashes/indexing_expressions.rs b/tests/incremental/hashes/indexing_expressions.rs index b020419775cbe..8382e8ba14ff5 100644 --- a/tests/incremental/hashes/indexing_expressions.rs +++ b/tests/incremental/hashes/indexing_expressions.rs @@ -24,9 +24,9 @@ fn change_simple_index(slice: &[u32]) -> u32 { } #[cfg(not(any(bpass1,bpass4)))] -#[rustc_clean(except="opt_hir_owner_nodes", cfg="bpass2")] +#[rustc_clean(except="owner", cfg="bpass2")] #[rustc_clean(cfg="bpass3")] -#[rustc_clean(except="opt_hir_owner_nodes", cfg="bpass5")] +#[rustc_clean(except="owner", cfg="bpass5")] #[rustc_clean(cfg="bpass6")] fn change_simple_index(slice: &[u32]) -> u32 { slice[4] @@ -41,9 +41,9 @@ fn change_lower_bound(slice: &[u32]) -> &[u32] { } #[cfg(not(any(bpass1,bpass4)))] -#[rustc_clean(except="opt_hir_owner_nodes", cfg="bpass2")] +#[rustc_clean(except="owner", cfg="bpass2")] #[rustc_clean(cfg="bpass3")] -#[rustc_clean(except="opt_hir_owner_nodes", cfg="bpass5")] +#[rustc_clean(except="owner", cfg="bpass5")] #[rustc_clean(cfg="bpass6")] fn change_lower_bound(slice: &[u32]) -> &[u32] { &slice[2..5] @@ -58,9 +58,9 @@ fn change_upper_bound(slice: &[u32]) -> &[u32] { } #[cfg(not(any(bpass1,bpass4)))] -#[rustc_clean(except="opt_hir_owner_nodes", cfg="bpass2")] +#[rustc_clean(except="owner", cfg="bpass2")] #[rustc_clean(cfg="bpass3")] -#[rustc_clean(except="opt_hir_owner_nodes", cfg="bpass5")] +#[rustc_clean(except="owner", cfg="bpass5")] #[rustc_clean(cfg="bpass6")] fn change_upper_bound(slice: &[u32]) -> &[u32] { &slice[3..7] @@ -75,9 +75,9 @@ fn add_lower_bound(slice: &[u32]) -> &[u32] { } #[cfg(not(any(bpass1,bpass4)))] -#[rustc_clean(except="opt_hir_owner_nodes,typeck_root", cfg="bpass2")] +#[rustc_clean(except="owner,typeck_root", cfg="bpass2")] #[rustc_clean(cfg="bpass3")] -#[rustc_clean(except="opt_hir_owner_nodes,typeck_root", cfg="bpass5")] +#[rustc_clean(except="owner,typeck_root", cfg="bpass5")] #[rustc_clean(cfg="bpass6")] fn add_lower_bound(slice: &[u32]) -> &[u32] { &slice[3..4] @@ -92,9 +92,9 @@ fn add_upper_bound(slice: &[u32]) -> &[u32] { } #[cfg(not(any(bpass1,bpass4)))] -#[rustc_clean(except="opt_hir_owner_nodes,typeck_root", cfg="bpass2")] +#[rustc_clean(except="owner,typeck_root", cfg="bpass2")] #[rustc_clean(cfg="bpass3")] -#[rustc_clean(except="opt_hir_owner_nodes,typeck_root", cfg="bpass5")] +#[rustc_clean(except="owner,typeck_root", cfg="bpass5")] #[rustc_clean(cfg="bpass6")] fn add_upper_bound(slice: &[u32]) -> &[u32] { &slice[3..7] @@ -109,9 +109,9 @@ fn change_mutability(slice: &mut [u32]) -> u32 { } #[cfg(not(any(bpass1,bpass4)))] -#[rustc_clean(except="opt_hir_owner_nodes,typeck_root", cfg="bpass2")] +#[rustc_clean(except="owner,typeck_root", cfg="bpass2")] #[rustc_clean(cfg="bpass3")] -#[rustc_clean(except="opt_hir_owner_nodes,typeck_root", cfg="bpass5")] +#[rustc_clean(except="owner,typeck_root", cfg="bpass5")] #[rustc_clean(cfg="bpass6")] fn change_mutability(slice: &mut [u32]) -> u32 { (& slice[3..5])[0] @@ -126,9 +126,9 @@ fn exclusive_to_inclusive_range(slice: &[u32]) -> &[u32] { } #[cfg(not(any(bpass1,bpass4)))] -#[rustc_clean(except="opt_hir_owner_nodes,typeck_root", cfg="bpass2")] +#[rustc_clean(except="owner,typeck_root", cfg="bpass2")] #[rustc_clean(cfg="bpass3")] -#[rustc_clean(except="opt_hir_owner_nodes,typeck_root", cfg="bpass5")] +#[rustc_clean(except="owner,typeck_root", cfg="bpass5")] #[rustc_clean(cfg="bpass6")] fn exclusive_to_inclusive_range(slice: &[u32]) -> &[u32] { &slice[3..=7] diff --git a/tests/incremental/hashes/inherent_impls.rs b/tests/incremental/hashes/inherent_impls.rs index da3fb1b2ee5fe..eb5bc9c51f542 100644 --- a/tests/incremental/hashes/inherent_impls.rs +++ b/tests/incremental/hashes/inherent_impls.rs @@ -27,9 +27,9 @@ impl Foo { } #[cfg(not(any(bpass1,bpass4)))] -#[rustc_clean(cfg="bpass2", except="opt_hir_owner_nodes,associated_item_def_ids")] +#[rustc_clean(cfg="bpass2", except="owner,associated_item_def_ids")] #[rustc_clean(cfg="bpass3")] -#[rustc_clean(cfg="bpass5", except="opt_hir_owner_nodes,associated_item_def_ids")] +#[rustc_clean(cfg="bpass5", except="owner,associated_item_def_ids")] #[rustc_clean(cfg="bpass6")] impl Foo { #[rustc_clean(cfg="bpass3")] @@ -52,14 +52,14 @@ impl Foo { } #[cfg(not(any(bpass1,bpass4)))] -#[rustc_clean(cfg="bpass2")] +#[rustc_clean(cfg="bpass2", except="owner")] #[rustc_clean(cfg="bpass3")] -#[rustc_clean(except="opt_hir_owner_nodes", cfg="bpass5")] +#[rustc_clean(except="owner", cfg="bpass5")] #[rustc_clean(cfg="bpass6")] impl Foo { - #[rustc_clean(cfg="bpass2",except="opt_hir_owner_nodes,optimized_mir,promoted_mir,typeck_root")] + #[rustc_clean(cfg="bpass2",except="owner,optimized_mir,promoted_mir,typeck_root")] #[rustc_clean(cfg="bpass3")] - #[rustc_clean(cfg="bpass5",except="opt_hir_owner_nodes,optimized_mir,promoted_mir,typeck_root")] + #[rustc_clean(cfg="bpass5",except="owner,optimized_mir,promoted_mir,typeck_root")] #[rustc_clean(cfg="bpass6")] pub fn method_body() { println!("Hello, world!"); @@ -83,14 +83,14 @@ impl Foo { } #[cfg(not(any(bpass1,bpass4)))] -#[rustc_clean(cfg="bpass2")] +#[rustc_clean(cfg="bpass2", except="owner")] #[rustc_clean(cfg="bpass3")] -#[rustc_clean(except="opt_hir_owner_nodes", cfg="bpass5")] +#[rustc_clean(except="owner", cfg="bpass5")] #[rustc_clean(cfg="bpass6")] impl Foo { - #[rustc_clean(cfg="bpass2", except="opt_hir_owner_nodes,optimized_mir,typeck_root")] + #[rustc_clean(cfg="bpass2", except="owner,optimized_mir,typeck_root")] #[rustc_clean(cfg="bpass3")] - #[rustc_clean(cfg="bpass5", except="opt_hir_owner_nodes,optimized_mir,typeck_root")] + #[rustc_clean(cfg="bpass5", except="owner,optimized_mir,typeck_root")] #[rustc_clean(cfg="bpass6")] #[inline] pub fn method_body_inlined() { @@ -110,14 +110,14 @@ impl Foo { } #[cfg(not(any(bpass1,bpass4)))] -#[rustc_clean(cfg="bpass2")] +#[rustc_clean(cfg="bpass2", except="owner")] #[rustc_clean(cfg="bpass3")] -#[rustc_clean(cfg="bpass5")] +#[rustc_clean(cfg="bpass5", except="owner")] #[rustc_clean(cfg="bpass6")] impl Foo { - #[rustc_clean(cfg="bpass2")] + #[rustc_clean(cfg="bpass2", except="owner")] #[rustc_clean(cfg="bpass3")] - #[rustc_clean(cfg="bpass5", except="opt_hir_owner_nodes")] + #[rustc_clean(cfg="bpass5", except="owner")] #[rustc_clean(cfg="bpass6")] fn method_privacy() { } } @@ -139,19 +139,19 @@ impl Foo { } #[cfg(not(any(bpass1,bpass4)))] -#[rustc_clean(cfg="bpass2")] +#[rustc_clean(cfg="bpass2", except="owner")] #[rustc_clean(cfg="bpass3")] -#[rustc_clean(cfg="bpass5", except="opt_hir_owner_nodes")] +#[rustc_clean(cfg="bpass5", except="owner")] #[rustc_clean(cfg="bpass6")] impl Foo { #[rustc_clean( cfg="bpass2", - except="opt_hir_owner_nodes,fn_sig,generics_of,typeck_root,associated_item,optimized_mir", + except="owner,fn_sig,generics_of,typeck_root,associated_item,optimized_mir", )] #[rustc_clean(cfg="bpass3")] #[rustc_clean( cfg="bpass5", - except="opt_hir_owner_nodes,fn_sig,generics_of,typeck_root,associated_item,optimized_mir", + except="owner,fn_sig,generics_of,typeck_root,associated_item,optimized_mir", )] #[rustc_clean(cfg="bpass6")] pub fn method_selfness(&self) { } @@ -168,14 +168,14 @@ impl Foo { } #[cfg(not(any(bpass1,bpass4)))] -#[rustc_clean(cfg="bpass2")] +#[rustc_clean(cfg="bpass2", except="owner")] #[rustc_clean(cfg="bpass3")] -#[rustc_clean(except="opt_hir_owner_nodes", cfg="bpass5")] +#[rustc_clean(except="owner", cfg="bpass5")] #[rustc_clean(cfg="bpass6")] impl Foo { - #[rustc_clean(cfg="bpass2", except="opt_hir_owner_nodes,fn_sig,typeck_root,optimized_mir")] + #[rustc_clean(cfg="bpass2", except="owner,fn_sig,typeck_root,optimized_mir")] #[rustc_clean(cfg="bpass3")] - #[rustc_clean(cfg="bpass5", except="opt_hir_owner_nodes,fn_sig,typeck_root,optimized_mir")] + #[rustc_clean(cfg="bpass5", except="owner,fn_sig,typeck_root,optimized_mir")] #[rustc_clean(cfg="bpass6")] pub fn method_selfmutness(&mut self) { } } @@ -189,14 +189,14 @@ impl Foo { } #[cfg(not(any(bpass1,bpass4)))] -#[rustc_clean(cfg="bpass2", except="opt_hir_owner_nodes,associated_item_def_ids")] +#[rustc_clean(cfg="bpass2", except="owner,associated_item_def_ids")] #[rustc_clean(cfg="bpass3")] -#[rustc_clean(cfg="bpass5", except="opt_hir_owner_nodes,associated_item_def_ids")] +#[rustc_clean(cfg="bpass5", except="owner,associated_item_def_ids")] #[rustc_clean(cfg="bpass6")] impl Foo { - #[rustc_clean(cfg="bpass2")] + #[rustc_clean(cfg="bpass2", except="owner")] #[rustc_clean(cfg="bpass3")] - #[rustc_clean(cfg="bpass5")] + #[rustc_clean(cfg="bpass5", except="owner")] #[rustc_clean(cfg="bpass6")] pub fn add_method_to_impl1(&self) { } @@ -218,14 +218,14 @@ impl Foo { } #[cfg(not(any(bpass1,bpass4)))] -#[rustc_clean(cfg="bpass2")] +#[rustc_clean(cfg="bpass2", except="owner")] #[rustc_clean(cfg="bpass3")] -#[rustc_clean(except="opt_hir_owner_nodes", cfg="bpass5")] +#[rustc_clean(except="owner", cfg="bpass5")] #[rustc_clean(cfg="bpass6")] impl Foo { - #[rustc_clean(cfg="bpass2", except="opt_hir_owner_nodes,fn_sig,typeck_root,optimized_mir")] + #[rustc_clean(cfg="bpass2", except="owner,fn_sig,typeck_root,optimized_mir")] #[rustc_clean(cfg="bpass3")] - #[rustc_clean(cfg="bpass5", except="opt_hir_owner_nodes,fn_sig,typeck_root,optimized_mir")] + #[rustc_clean(cfg="bpass5", except="owner,fn_sig,typeck_root,optimized_mir")] #[rustc_clean(cfg="bpass6")] pub fn add_method_parameter(&self, _: i32) { } } @@ -243,14 +243,14 @@ impl Foo { } #[cfg(not(any(bpass1,bpass4)))] -#[rustc_clean(cfg="bpass2")] +#[rustc_clean(cfg="bpass2", except="owner")] #[rustc_clean(cfg="bpass3")] -#[rustc_clean(cfg="bpass5")] +#[rustc_clean(cfg="bpass5", except="owner")] #[rustc_clean(cfg="bpass6")] impl Foo { - #[rustc_clean(cfg="bpass2", except="opt_hir_owner_nodes,optimized_mir")] + #[rustc_clean(cfg="bpass2", except="owner,optimized_mir")] #[rustc_clean(cfg="bpass3")] - #[rustc_clean(cfg="bpass5", except="opt_hir_owner_nodes,optimized_mir")] + #[rustc_clean(cfg="bpass5", except="owner,optimized_mir")] #[rustc_clean(cfg="bpass6")] pub fn change_method_parameter_name(&self, b: i64) { } } @@ -268,14 +268,14 @@ impl Foo { } #[cfg(not(any(bpass1,bpass4)))] -#[rustc_clean(cfg="bpass2")] +#[rustc_clean(cfg="bpass2", except="owner")] #[rustc_clean(cfg="bpass3")] -#[rustc_clean(except="opt_hir_owner_nodes", cfg="bpass5")] +#[rustc_clean(except="owner", cfg="bpass5")] #[rustc_clean(cfg="bpass6")] impl Foo { - #[rustc_clean(cfg="bpass2", except="opt_hir_owner_nodes,fn_sig,optimized_mir,typeck_root")] + #[rustc_clean(cfg="bpass2", except="owner,fn_sig,optimized_mir,typeck_root")] #[rustc_clean(cfg="bpass3")] - #[rustc_clean(cfg="bpass5", except="opt_hir_owner_nodes,fn_sig,optimized_mir,typeck_root")] + #[rustc_clean(cfg="bpass5", except="owner,fn_sig,optimized_mir,typeck_root")] #[rustc_clean(cfg="bpass6")] pub fn change_method_return_type(&self) -> u32 { 0 } } @@ -294,14 +294,14 @@ impl Foo { } #[cfg(not(any(bpass1,bpass4)))] -#[rustc_clean(cfg="bpass2")] +#[rustc_clean(cfg="bpass2", except="owner")] #[rustc_clean(cfg="bpass3")] -#[rustc_clean(cfg="bpass5")] +#[rustc_clean(cfg="bpass5", except="owner")] #[rustc_clean(cfg="bpass6")] impl Foo { - #[rustc_clean(cfg="bpass2")] + #[rustc_clean(cfg="bpass2", except="owner")] #[rustc_clean(cfg="bpass3")] - #[rustc_clean(cfg="bpass5")] + #[rustc_clean(cfg="bpass5", except="owner")] #[rustc_clean(cfg="bpass6")] #[inline] pub fn make_method_inline(&self) -> u8 { 0 } @@ -320,14 +320,14 @@ impl Foo { } #[cfg(not(any(bpass1,bpass4)))] -#[rustc_clean(cfg="bpass2")] +#[rustc_clean(cfg="bpass2", except="owner")] #[rustc_clean(cfg="bpass3")] -#[rustc_clean(cfg="bpass5")] +#[rustc_clean(cfg="bpass5", except="owner")] #[rustc_clean(cfg="bpass6")] impl Foo { - #[rustc_clean(cfg="bpass2", except="opt_hir_owner_nodes,optimized_mir")] + #[rustc_clean(cfg="bpass2", except="owner,optimized_mir")] #[rustc_clean(cfg="bpass3")] - #[rustc_clean(cfg="bpass5", except="opt_hir_owner_nodes,optimized_mir")] + #[rustc_clean(cfg="bpass5", except="owner,optimized_mir")] #[rustc_clean(cfg="bpass6")] pub fn change_method_parameter_order(&self, b: i64, a: i64) { } } @@ -345,14 +345,14 @@ impl Foo { } #[cfg(not(any(bpass1,bpass4)))] -#[rustc_clean(cfg="bpass2")] +#[rustc_clean(cfg="bpass2", except="owner")] #[rustc_clean(cfg="bpass3")] -#[rustc_clean(except="opt_hir_owner_nodes", cfg="bpass5")] +#[rustc_clean(except="owner", cfg="bpass5")] #[rustc_clean(cfg="bpass6")] impl Foo { - #[rustc_clean(cfg="bpass2", except="opt_hir_owner_nodes,fn_sig,typeck_root")] + #[rustc_clean(cfg="bpass2", except="owner,fn_sig,typeck_root")] #[rustc_clean(cfg="bpass3")] - #[rustc_clean(cfg="bpass5", except="opt_hir_owner_nodes,fn_sig,typeck_root")] + #[rustc_clean(cfg="bpass5", except="owner,fn_sig,typeck_root")] #[rustc_clean(cfg="bpass6")] pub unsafe fn make_method_unsafe(&self) { } } @@ -370,14 +370,14 @@ impl Foo { } #[cfg(not(any(bpass1,bpass4)))] -#[rustc_clean(cfg="bpass2")] +#[rustc_clean(cfg="bpass2", except="owner")] #[rustc_clean(cfg="bpass3")] -#[rustc_clean(except="opt_hir_owner_nodes", cfg="bpass5")] +#[rustc_clean(except="owner", cfg="bpass5")] #[rustc_clean(cfg="bpass6")] impl Foo { - #[rustc_clean(cfg="bpass2", except="opt_hir_owner_nodes,fn_sig,typeck_root")] + #[rustc_clean(cfg="bpass2", except="owner,fn_sig,typeck_root")] #[rustc_clean(cfg="bpass3")] - #[rustc_clean(cfg="bpass5", except="opt_hir_owner_nodes,fn_sig,typeck_root")] + #[rustc_clean(cfg="bpass5", except="owner,fn_sig,typeck_root")] #[rustc_clean(cfg="bpass6")] pub extern "C" fn make_method_extern(&self) { } } @@ -395,14 +395,14 @@ impl Foo { } #[cfg(not(any(bpass1,bpass4)))] -#[rustc_clean(cfg="bpass2")] +#[rustc_clean(cfg="bpass2", except="owner")] #[rustc_clean(cfg="bpass3")] -#[rustc_clean(except="opt_hir_owner_nodes", cfg="bpass5")] +#[rustc_clean(except="owner", cfg="bpass5")] #[rustc_clean(cfg="bpass6")] impl Foo { - #[rustc_clean(cfg="bpass2", except="opt_hir_owner_nodes,fn_sig,typeck_root")] + #[rustc_clean(cfg="bpass2", except="owner,fn_sig,typeck_root")] #[rustc_clean(cfg="bpass3")] - #[rustc_clean(cfg="bpass5", except="opt_hir_owner_nodes,fn_sig,typeck_root")] + #[rustc_clean(cfg="bpass5", except="owner,fn_sig,typeck_root")] #[rustc_clean(cfg="bpass6")] pub extern "system" fn change_method_calling_convention(&self) { } } @@ -429,9 +429,9 @@ impl Foo { } #[cfg(not(any(bpass1,bpass4)))] -#[rustc_clean(cfg="bpass2")] +#[rustc_clean(cfg="bpass2", except="owner")] #[rustc_clean(cfg="bpass3")] -#[rustc_clean(except="opt_hir_owner_nodes", cfg="bpass5")] +#[rustc_clean(except="owner", cfg="bpass5")] #[rustc_clean(cfg="bpass6")] impl Foo { // Warning: Note that `typeck_root` are coming up clean here. @@ -443,9 +443,9 @@ impl Foo { // if we lower generics before the body, then the `HirId` for // things in the body will be affected. So if you start to see // `typeck_root` appear dirty, that might be the cause. -nmatsakis - #[rustc_clean(cfg="bpass2", except="opt_hir_owner_nodes,fn_sig")] + #[rustc_clean(cfg="bpass2", except="owner,fn_sig")] #[rustc_clean(cfg="bpass3")] - #[rustc_clean(cfg="bpass5", except="opt_hir_owner_nodes,fn_sig,generics_of")] + #[rustc_clean(cfg="bpass5", except="owner,fn_sig,generics_of")] #[rustc_clean(cfg="bpass6")] pub fn add_lifetime_parameter_to_method<'a>(&self) { } } @@ -478,9 +478,9 @@ impl Foo { } #[cfg(not(any(bpass1,bpass4)))] -#[rustc_clean(cfg="bpass2")] +#[rustc_clean(cfg="bpass2", except="owner")] #[rustc_clean(cfg="bpass3")] -#[rustc_clean(except="opt_hir_owner_nodes", cfg="bpass5")] +#[rustc_clean(except="owner", cfg="bpass5")] #[rustc_clean(cfg="bpass6")] impl Foo { // Warning: Note that `typeck_root` are coming up clean here. @@ -494,12 +494,12 @@ impl Foo { // appear dirty, that might be the cause. -nmatsakis #[rustc_clean( cfg="bpass2", - except="opt_hir_owner_nodes,generics_of,predicates_of,type_of", + except="owner,generics_of,predicates_of,type_of", )] #[rustc_clean(cfg="bpass3")] #[rustc_clean( cfg="bpass5", - except="opt_hir_owner_nodes,generics_of,predicates_of,type_of", + except="owner,generics_of,predicates_of,type_of", )] #[rustc_clean(cfg="bpass6")] pub fn add_type_parameter_to_method(&self) { } @@ -524,19 +524,19 @@ impl Foo { } #[cfg(not(any(bpass1,bpass4)))] -#[rustc_clean(cfg="bpass2")] +#[rustc_clean(cfg="bpass2", except="owner")] #[rustc_clean(cfg="bpass3")] -#[rustc_clean(cfg="bpass5")] +#[rustc_clean(cfg="bpass5", except="owner")] #[rustc_clean(cfg="bpass6")] impl Foo { #[rustc_clean( cfg="bpass2", - except="opt_hir_owner_nodes,generics_of,predicates_of,type_of,fn_sig" + except="owner,generics_of,predicates_of,type_of,fn_sig" )] #[rustc_clean(cfg="bpass3")] #[rustc_clean( cfg="bpass5", - except="opt_hir_owner_nodes,generics_of,predicates_of,type_of,fn_sig" + except="owner,generics_of,predicates_of,type_of,fn_sig" )] #[rustc_clean(cfg="bpass6")] pub fn add_lifetime_bound_to_lifetime_param_of_method<'a, 'b: 'a>(&self) { } @@ -570,9 +570,9 @@ impl Foo { } #[cfg(not(any(bpass1,bpass4)))] -#[rustc_clean(cfg="bpass2")] +#[rustc_clean(cfg="bpass2", except="owner")] #[rustc_clean(cfg="bpass3")] -#[rustc_clean(except="opt_hir_owner_nodes", cfg="bpass5")] +#[rustc_clean(except="owner", cfg="bpass5")] #[rustc_clean(cfg="bpass6")] impl Foo { // Warning: Note that `typeck_root` are coming up clean here. @@ -586,12 +586,12 @@ impl Foo { // appear dirty, that might be the cause. -nmatsakis #[rustc_clean( cfg="bpass2", - except="opt_hir_owner_nodes,generics_of,predicates_of,type_of,fn_sig" + except="owner,generics_of,predicates_of,type_of,fn_sig" )] #[rustc_clean(cfg="bpass3")] #[rustc_clean( cfg="bpass5", - except="opt_hir_owner_nodes,generics_of,predicates_of,type_of,fn_sig" + except="owner,generics_of,predicates_of,type_of,fn_sig" )] #[rustc_clean(cfg="bpass6")] pub fn add_lifetime_bound_to_type_param_of_method<'a, T: 'a>(&self) { } @@ -619,9 +619,9 @@ impl Foo { } #[cfg(not(any(bpass1,bpass4)))] -#[rustc_clean(cfg="bpass2")] +#[rustc_clean(cfg="bpass2", except="owner")] #[rustc_clean(cfg="bpass3")] -#[rustc_clean(except="opt_hir_owner_nodes", cfg="bpass5")] +#[rustc_clean(except="owner", cfg="bpass5")] #[rustc_clean(cfg="bpass6")] impl Foo { // Warning: Note that `typeck_root` are coming up clean here. @@ -633,9 +633,9 @@ impl Foo { // generics before the body, then the `HirId` for things in the // body will be affected. So if you start to see `typeck_root` // appear dirty, that might be the cause. -nmatsakis - #[rustc_clean(cfg="bpass2", except="opt_hir_owner_nodes,predicates_of")] + #[rustc_clean(cfg="bpass2", except="owner,predicates_of")] #[rustc_clean(cfg="bpass3")] - #[rustc_clean(cfg="bpass5", except="opt_hir_owner_nodes,predicates_of")] + #[rustc_clean(cfg="bpass5", except="owner,predicates_of")] #[rustc_clean(cfg="bpass6")] pub fn add_trait_bound_to_type_param_of_method(&self) { } } @@ -654,14 +654,14 @@ impl Foo { } #[cfg(not(any(bpass1,bpass4)))] -#[rustc_clean(cfg="bpass2")] +#[rustc_clean(cfg="bpass2", except="owner")] #[rustc_clean(cfg="bpass3")] -#[rustc_clean(cfg="bpass5")] +#[rustc_clean(cfg="bpass5", except="owner")] #[rustc_clean(cfg="bpass6")] impl Foo { - #[rustc_clean(cfg="bpass2")] + #[rustc_clean(cfg="bpass2", except="owner")] #[rustc_clean(cfg="bpass3")] - #[rustc_clean(cfg="bpass5")] + #[rustc_clean(cfg="bpass5", except="owner")] #[rustc_clean(cfg="bpass6")] #[unsafe(no_mangle)] pub fn add_no_mangle_to_method(&self) { } @@ -678,19 +678,19 @@ impl Bar { } #[cfg(not(any(bpass1,bpass4)))] -#[rustc_clean(cfg="bpass2", except="opt_hir_owner_nodes,generics_of")] +#[rustc_clean(cfg="bpass2", except="owner,generics_of")] #[rustc_clean(cfg="bpass3")] -#[rustc_clean(cfg="bpass5", except="opt_hir_owner_nodes,generics_of")] +#[rustc_clean(cfg="bpass5", except="owner,generics_of")] #[rustc_clean(cfg="bpass6")] impl Bar { #[rustc_clean( cfg="bpass2", - except="generics_of,fn_sig,typeck_root,type_of,optimized_mir" + except="generics_of,fn_sig,typeck_root,type_of,optimized_mir,owner" )] #[rustc_clean(cfg="bpass3")] #[rustc_clean( cfg="bpass5", - except="generics_of,fn_sig,typeck_root,type_of,optimized_mir" + except="generics_of,fn_sig,typeck_root,type_of,optimized_mir,owner" )] #[rustc_clean(cfg="bpass6")] pub fn add_type_parameter_to_impl(&self) { } @@ -705,14 +705,14 @@ impl Bar { } #[cfg(not(any(bpass1,bpass4)))] -#[rustc_clean(cfg="bpass2", except="opt_hir_owner_nodes")] +#[rustc_clean(cfg="bpass2", except="owner")] #[rustc_clean(cfg="bpass3")] -#[rustc_clean(cfg="bpass5", except="opt_hir_owner_nodes")] +#[rustc_clean(cfg="bpass5", except="owner")] #[rustc_clean(cfg="bpass6")] impl Bar { - #[rustc_clean(cfg="bpass2", except="fn_sig,optimized_mir,typeck_root")] + #[rustc_clean(cfg="bpass2", except="fn_sig,optimized_mir,typeck_root,owner")] #[rustc_clean(cfg="bpass3")] - #[rustc_clean(cfg="bpass5", except="fn_sig,optimized_mir,typeck_root")] + #[rustc_clean(cfg="bpass5", except="fn_sig,optimized_mir,typeck_root,owner")] #[rustc_clean(cfg="bpass6")] pub fn change_impl_self_type(&self) { } } @@ -726,14 +726,14 @@ impl Bar { } #[cfg(not(any(bpass1,bpass4)))] -#[rustc_clean(cfg="bpass2", except="opt_hir_owner_nodes")] +#[rustc_clean(cfg="bpass2", except="owner")] #[rustc_clean(cfg="bpass3")] -#[rustc_clean(cfg="bpass5", except="opt_hir_owner_nodes")] +#[rustc_clean(cfg="bpass5", except="owner")] #[rustc_clean(cfg="bpass6")] impl Bar { - #[rustc_clean(cfg="bpass2")] + #[rustc_clean(cfg="bpass2", except="owner")] #[rustc_clean(cfg="bpass3")] - #[rustc_clean(cfg="bpass5")] + #[rustc_clean(cfg="bpass5", except="owner")] #[rustc_clean(cfg="bpass6")] pub fn add_lifetime_bound_to_impl_parameter(&self) { } } @@ -747,14 +747,14 @@ impl Bar { } #[cfg(not(any(bpass1,bpass4)))] -#[rustc_clean(cfg="bpass2", except="opt_hir_owner_nodes")] +#[rustc_clean(cfg="bpass2", except="owner")] #[rustc_clean(cfg="bpass3")] -#[rustc_clean(cfg="bpass5", except="opt_hir_owner_nodes")] +#[rustc_clean(cfg="bpass5", except="owner")] #[rustc_clean(cfg="bpass6")] impl Bar { - #[rustc_clean(cfg="bpass2")] + #[rustc_clean(cfg="bpass2", except="owner")] #[rustc_clean(cfg="bpass3")] - #[rustc_clean(cfg="bpass5")] + #[rustc_clean(cfg="bpass5", except="owner")] #[rustc_clean(cfg="bpass6")] pub fn add_trait_bound_to_impl_parameter(&self) { } } diff --git a/tests/incremental/hashes/inline_asm.rs b/tests/incremental/hashes/inline_asm.rs index cfc9bccf8eca2..0801c0c8d6f9e 100644 --- a/tests/incremental/hashes/inline_asm.rs +++ b/tests/incremental/hashes/inline_asm.rs @@ -34,9 +34,9 @@ pub fn change_template(_a: i32) -> i32 { } #[cfg(not(any(bpass1,bpass4)))] -#[rustc_clean(cfg="bpass2", except="opt_hir_owner_nodes, optimized_mir")] +#[rustc_clean(cfg="bpass2", except="owner, optimized_mir")] #[rustc_clean(cfg="bpass3")] -#[rustc_clean(cfg="bpass5", except="opt_hir_owner_nodes, optimized_mir")] +#[rustc_clean(cfg="bpass5", except="owner, optimized_mir")] #[rustc_clean(cfg="bpass6")] #[cfg(any(target_arch = "x86", target_arch = "x86_64"))] pub fn change_template(_a: i32) -> i32 { @@ -67,9 +67,9 @@ pub fn change_output(a: i32) -> i32 { } #[cfg(not(any(bpass1,bpass4)))] -#[rustc_clean(cfg="bpass2", except="opt_hir_owner_nodes, optimized_mir")] +#[rustc_clean(cfg="bpass2", except="owner, optimized_mir")] #[rustc_clean(cfg="bpass3")] -#[rustc_clean(cfg="bpass5", except="opt_hir_owner_nodes, optimized_mir")] +#[rustc_clean(cfg="bpass5", except="owner, optimized_mir")] #[rustc_clean(cfg="bpass6")] #[cfg(any(target_arch = "x86", target_arch = "x86_64"))] pub fn change_output(a: i32) -> i32 { @@ -101,9 +101,9 @@ pub fn change_input(_a: i32, _b: i32) -> i32 { } #[cfg(not(any(bpass1,bpass4)))] -#[rustc_clean(cfg="bpass2", except="opt_hir_owner_nodes, optimized_mir")] +#[rustc_clean(cfg="bpass2", except="owner, optimized_mir")] #[rustc_clean(cfg="bpass3")] -#[rustc_clean(cfg="bpass5", except="opt_hir_owner_nodes, optimized_mir")] +#[rustc_clean(cfg="bpass5", except="owner, optimized_mir")] #[rustc_clean(cfg="bpass6")] #[cfg(any(target_arch = "x86", target_arch = "x86_64"))] pub fn change_input(_a: i32, _b: i32) -> i32 { @@ -134,9 +134,9 @@ pub fn change_input_constraint(_a: i32, _b: i32) -> i32 { } #[cfg(not(any(bpass1,bpass4)))] -#[rustc_clean(cfg="bpass2", except="opt_hir_owner_nodes, optimized_mir")] +#[rustc_clean(cfg="bpass2", except="owner, optimized_mir")] #[rustc_clean(cfg="bpass3")] -#[rustc_clean(cfg="bpass5", except="opt_hir_owner_nodes, optimized_mir")] +#[rustc_clean(cfg="bpass5", except="owner, optimized_mir")] #[rustc_clean(cfg="bpass6")] #[cfg(any(target_arch = "x86", target_arch = "x86_64"))] pub fn change_input_constraint(_a: i32, _b: i32) -> i32 { @@ -167,9 +167,9 @@ pub fn change_clobber(_a: i32) -> i32 { } #[cfg(not(any(bpass1,bpass4)))] -#[rustc_clean(cfg="bpass2", except="opt_hir_owner_nodes, optimized_mir")] +#[rustc_clean(cfg="bpass2", except="owner, optimized_mir")] #[rustc_clean(cfg="bpass3")] -#[rustc_clean(cfg="bpass5", except="opt_hir_owner_nodes, optimized_mir")] +#[rustc_clean(cfg="bpass5", except="owner, optimized_mir")] #[rustc_clean(cfg="bpass6")] #[cfg(any(target_arch = "x86", target_arch = "x86_64"))] pub fn change_clobber(_a: i32) -> i32 { @@ -202,9 +202,9 @@ pub fn change_options(_a: i32) -> i32 { } #[cfg(not(any(bpass1,bpass4)))] -#[rustc_clean(cfg="bpass2", except="opt_hir_owner_nodes, optimized_mir")] +#[rustc_clean(cfg="bpass2", except="owner, optimized_mir")] #[rustc_clean(cfg="bpass3")] -#[rustc_clean(cfg="bpass5", except="opt_hir_owner_nodes, optimized_mir")] +#[rustc_clean(cfg="bpass5", except="owner, optimized_mir")] #[rustc_clean(cfg="bpass6")] #[cfg(any(target_arch = "x86", target_arch = "x86_64"))] pub fn change_options(_a: i32) -> i32 { diff --git a/tests/incremental/hashes/let_expressions.rs b/tests/incremental/hashes/let_expressions.rs index e61eaab22414d..521021993a857 100644 --- a/tests/incremental/hashes/let_expressions.rs +++ b/tests/incremental/hashes/let_expressions.rs @@ -24,9 +24,9 @@ pub fn change_name() { } #[cfg(not(any(bpass1,bpass4)))] -#[rustc_clean(cfg="bpass2", except="opt_hir_owner_nodes,optimized_mir")] +#[rustc_clean(cfg="bpass2", except="owner,optimized_mir")] #[rustc_clean(cfg="bpass3")] -#[rustc_clean(cfg="bpass5", except="opt_hir_owner_nodes,optimized_mir")] +#[rustc_clean(cfg="bpass5", except="owner,optimized_mir")] #[rustc_clean(cfg="bpass6")] pub fn change_name() { let _y = 2u64; @@ -41,9 +41,9 @@ pub fn add_type() { } #[cfg(not(any(bpass1,bpass4)))] -#[rustc_clean(cfg="bpass2", except="opt_hir_owner_nodes,typeck_root")] +#[rustc_clean(cfg="bpass2", except="owner,typeck_root")] #[rustc_clean(cfg="bpass3")] -#[rustc_clean(cfg="bpass5", except="opt_hir_owner_nodes,typeck_root")] +#[rustc_clean(cfg="bpass5", except="owner,typeck_root")] #[rustc_clean(cfg="bpass6")] pub fn add_type() { let _x: u32 = 2u32; @@ -58,9 +58,9 @@ pub fn change_type() { } #[cfg(not(any(bpass1,bpass4)))] -#[rustc_clean(cfg="bpass2", except="opt_hir_owner_nodes,typeck_root,optimized_mir")] +#[rustc_clean(cfg="bpass2", except="owner,typeck_root,optimized_mir")] #[rustc_clean(cfg="bpass3")] -#[rustc_clean(cfg="bpass5", except="opt_hir_owner_nodes,typeck_root,optimized_mir")] +#[rustc_clean(cfg="bpass5", except="owner,typeck_root,optimized_mir")] #[rustc_clean(cfg="bpass6")] pub fn change_type() { let _x: u8 = 2; @@ -75,9 +75,9 @@ pub fn change_mutability_of_reference_type() { } #[cfg(not(any(bpass1,bpass4)))] -#[rustc_clean(cfg="bpass2", except="opt_hir_owner_nodes,typeck_root,optimized_mir")] +#[rustc_clean(cfg="bpass2", except="owner,typeck_root,optimized_mir")] #[rustc_clean(cfg="bpass3")] -#[rustc_clean(cfg="bpass5", except="opt_hir_owner_nodes,typeck_root,optimized_mir")] +#[rustc_clean(cfg="bpass5", except="owner,typeck_root,optimized_mir")] #[rustc_clean(cfg="bpass6")] pub fn change_mutability_of_reference_type() { let _x: &mut u64; @@ -92,9 +92,9 @@ pub fn change_mutability_of_slot() { } #[cfg(not(any(bpass1,bpass4)))] -#[rustc_clean(cfg="bpass2", except="opt_hir_owner_nodes,typeck_root")] +#[rustc_clean(cfg="bpass2", except="owner,typeck_root")] #[rustc_clean(cfg="bpass3")] -#[rustc_clean(cfg="bpass5", except="opt_hir_owner_nodes,typeck_root,optimized_mir")] +#[rustc_clean(cfg="bpass5", except="owner,typeck_root,optimized_mir")] #[rustc_clean(cfg="bpass6")] pub fn change_mutability_of_slot() { let _x: u64 = 0; @@ -109,9 +109,9 @@ pub fn change_simple_binding_to_pattern() { } #[cfg(not(any(bpass1,bpass4)))] -#[rustc_clean(cfg="bpass2", except="opt_hir_owner_nodes,typeck_root,optimized_mir")] +#[rustc_clean(cfg="bpass2", except="owner,typeck_root,optimized_mir")] #[rustc_clean(cfg="bpass3")] -#[rustc_clean(cfg="bpass5", except="opt_hir_owner_nodes,typeck_root,optimized_mir")] +#[rustc_clean(cfg="bpass5", except="owner,typeck_root,optimized_mir")] #[rustc_clean(cfg="bpass6")] pub fn change_simple_binding_to_pattern() { let (_a, _b) = (0u8, 'x'); @@ -126,9 +126,9 @@ pub fn change_name_in_pattern() { } #[cfg(not(any(bpass1,bpass4)))] -#[rustc_clean(cfg="bpass2", except="opt_hir_owner_nodes,optimized_mir")] +#[rustc_clean(cfg="bpass2", except="owner,optimized_mir")] #[rustc_clean(cfg="bpass3")] -#[rustc_clean(cfg="bpass5", except="opt_hir_owner_nodes,optimized_mir")] +#[rustc_clean(cfg="bpass5", except="owner,optimized_mir")] #[rustc_clean(cfg="bpass6")] pub fn change_name_in_pattern() { let (_a, _c) = (1u8, 'y'); @@ -143,9 +143,9 @@ pub fn add_ref_in_pattern() { } #[cfg(not(any(bpass1,bpass4)))] -#[rustc_clean(cfg="bpass2", except="opt_hir_owner_nodes,typeck_root,optimized_mir")] +#[rustc_clean(cfg="bpass2", except="owner,typeck_root,optimized_mir")] #[rustc_clean(cfg="bpass3")] -#[rustc_clean(cfg="bpass5", except="opt_hir_owner_nodes,typeck_root,optimized_mir")] +#[rustc_clean(cfg="bpass5", except="owner,typeck_root,optimized_mir")] #[rustc_clean(cfg="bpass6")] pub fn add_ref_in_pattern() { let (ref _a, _b) = (1u8, 'y'); @@ -160,9 +160,9 @@ pub fn add_amp_in_pattern() { } #[cfg(not(any(bpass1,bpass4)))] -#[rustc_clean(cfg="bpass2", except="opt_hir_owner_nodes,typeck_root,optimized_mir")] +#[rustc_clean(cfg="bpass2", except="owner,typeck_root,optimized_mir")] #[rustc_clean(cfg="bpass3")] -#[rustc_clean(cfg="bpass5", except="opt_hir_owner_nodes,typeck_root,optimized_mir")] +#[rustc_clean(cfg="bpass5", except="owner,typeck_root,optimized_mir")] #[rustc_clean(cfg="bpass6")] pub fn add_amp_in_pattern() { let (&_a, _b) = (&1u8, 'y'); @@ -177,9 +177,9 @@ pub fn change_mutability_of_binding_in_pattern() { } #[cfg(not(any(bpass1,bpass4)))] -#[rustc_clean(cfg="bpass2", except="opt_hir_owner_nodes,typeck_root")] +#[rustc_clean(cfg="bpass2", except="owner,typeck_root")] #[rustc_clean(cfg="bpass3")] -#[rustc_clean(cfg="bpass5", except="opt_hir_owner_nodes,typeck_root,optimized_mir")] +#[rustc_clean(cfg="bpass5", except="owner,typeck_root,optimized_mir")] #[rustc_clean(cfg="bpass6")] pub fn change_mutability_of_binding_in_pattern() { let (mut _a, _b) = (99u8, 'q'); @@ -194,9 +194,9 @@ pub fn add_initializer() { } #[cfg(not(any(bpass1,bpass4)))] -#[rustc_clean(cfg="bpass2", except="opt_hir_owner_nodes,typeck_root,optimized_mir")] +#[rustc_clean(cfg="bpass2", except="owner,typeck_root,optimized_mir")] #[rustc_clean(cfg="bpass3")] -#[rustc_clean(cfg="bpass5", except="opt_hir_owner_nodes,typeck_root,optimized_mir")] +#[rustc_clean(cfg="bpass5", except="owner,typeck_root,optimized_mir")] #[rustc_clean(cfg="bpass6")] pub fn add_initializer() { let _x: i16 = 3i16; @@ -211,9 +211,9 @@ pub fn change_initializer() { } #[cfg(not(any(bpass1,bpass4)))] -#[rustc_clean(cfg="bpass2", except="opt_hir_owner_nodes, optimized_mir")] +#[rustc_clean(cfg="bpass2", except="owner, optimized_mir")] #[rustc_clean(cfg="bpass3")] -#[rustc_clean(cfg="bpass5", except="opt_hir_owner_nodes, optimized_mir")] +#[rustc_clean(cfg="bpass5", except="owner, optimized_mir")] #[rustc_clean(cfg="bpass6")] pub fn change_initializer() { let _x = 5u16; diff --git a/tests/incremental/hashes/loop_expressions.rs b/tests/incremental/hashes/loop_expressions.rs index f83a3b255831c..cfd0cc7d41e80 100644 --- a/tests/incremental/hashes/loop_expressions.rs +++ b/tests/incremental/hashes/loop_expressions.rs @@ -29,9 +29,9 @@ pub fn change_loop_body() { } #[cfg(not(any(bpass1,bpass4)))] -#[rustc_clean(cfg="bpass2", except="opt_hir_owner_nodes, optimized_mir")] +#[rustc_clean(cfg="bpass2", except="owner, optimized_mir")] #[rustc_clean(cfg="bpass3")] -#[rustc_clean(cfg="bpass5", except="opt_hir_owner_nodes, optimized_mir")] +#[rustc_clean(cfg="bpass5", except="owner, optimized_mir")] #[rustc_clean(cfg="bpass6")] pub fn change_loop_body() { let mut _x = 0; @@ -54,9 +54,9 @@ pub fn add_break() { } #[cfg(not(any(bpass1,bpass4)))] -#[rustc_clean(cfg="bpass2", except="opt_hir_owner_nodes, optimized_mir, typeck_root")] +#[rustc_clean(cfg="bpass2", except="owner, optimized_mir, typeck_root")] #[rustc_clean(cfg="bpass3")] -#[rustc_clean(cfg="bpass5", except="opt_hir_owner_nodes, optimized_mir, typeck_root")] +#[rustc_clean(cfg="bpass5", except="owner, optimized_mir, typeck_root")] #[rustc_clean(cfg="bpass6")] pub fn add_break() { let mut _x = 0; @@ -79,9 +79,9 @@ pub fn add_loop_label() { } #[cfg(not(any(bpass1,bpass4)))] -#[rustc_clean(cfg="bpass2", except="opt_hir_owner_nodes")] +#[rustc_clean(cfg="bpass2", except="owner")] #[rustc_clean(cfg="bpass3")] -#[rustc_clean(cfg="bpass5", except="opt_hir_owner_nodes")] +#[rustc_clean(cfg="bpass5", except="owner")] #[rustc_clean(cfg="bpass6")] pub fn add_loop_label() { let mut _x = 0; @@ -104,9 +104,9 @@ pub fn add_loop_label_to_break() { } #[cfg(not(any(bpass1,bpass4)))] -#[rustc_clean(cfg="bpass2", except="opt_hir_owner_nodes")] +#[rustc_clean(cfg="bpass2", except="owner")] #[rustc_clean(cfg="bpass3")] -#[rustc_clean(cfg="bpass5", except="opt_hir_owner_nodes")] +#[rustc_clean(cfg="bpass5", except="owner")] #[rustc_clean(cfg="bpass6")] pub fn add_loop_label_to_break() { let mut _x = 0; @@ -131,9 +131,9 @@ pub fn change_break_label() { } #[cfg(not(any(bpass1,bpass4)))] -#[rustc_clean(cfg="bpass2", except="opt_hir_owner_nodes, optimized_mir, typeck_root")] +#[rustc_clean(cfg="bpass2", except="owner, optimized_mir, typeck_root")] #[rustc_clean(cfg="bpass3")] -#[rustc_clean(cfg="bpass5", except="opt_hir_owner_nodes, optimized_mir, typeck_root")] +#[rustc_clean(cfg="bpass5", except="owner, optimized_mir, typeck_root")] #[rustc_clean(cfg="bpass6")] pub fn change_break_label() { let mut _x = 0; @@ -158,9 +158,9 @@ pub fn add_loop_label_to_continue() { } #[cfg(not(any(bpass1,bpass4)))] -#[rustc_clean(cfg="bpass2", except="opt_hir_owner_nodes")] +#[rustc_clean(cfg="bpass2", except="owner")] #[rustc_clean(cfg="bpass3")] -#[rustc_clean(cfg="bpass5", except="opt_hir_owner_nodes, optimized_mir")] +#[rustc_clean(cfg="bpass5", except="owner, optimized_mir")] #[rustc_clean(cfg="bpass6")] pub fn add_loop_label_to_continue() { let mut _x = 0; @@ -185,9 +185,9 @@ pub fn change_continue_label() { } #[cfg(not(any(bpass1,bpass4)))] -#[rustc_clean(cfg="bpass2", except="opt_hir_owner_nodes")] +#[rustc_clean(cfg="bpass2", except="owner")] #[rustc_clean(cfg="bpass3")] -#[rustc_clean(cfg="bpass5", except="opt_hir_owner_nodes, optimized_mir")] +#[rustc_clean(cfg="bpass5", except="owner, optimized_mir")] #[rustc_clean(cfg="bpass6")] pub fn change_continue_label() { let mut _x = 0; @@ -212,9 +212,9 @@ pub fn change_continue_to_break() { } #[cfg(not(any(bpass1,bpass4)))] -#[rustc_clean(cfg="bpass2", except="opt_hir_owner_nodes, typeck_root, optimized_mir")] +#[rustc_clean(cfg="bpass2", except="owner, typeck_root, optimized_mir")] #[rustc_clean(cfg="bpass3")] -#[rustc_clean(cfg="bpass5", except="opt_hir_owner_nodes, typeck_root, optimized_mir")] +#[rustc_clean(cfg="bpass5", except="owner, typeck_root, optimized_mir")] #[rustc_clean(cfg="bpass6")] pub fn change_continue_to_break() { let mut _x = 0; diff --git a/tests/incremental/hashes/match_expressions.rs b/tests/incremental/hashes/match_expressions.rs index 0c176e879641a..84f3f68501557 100644 --- a/tests/incremental/hashes/match_expressions.rs +++ b/tests/incremental/hashes/match_expressions.rs @@ -29,9 +29,9 @@ pub fn add_arm(x: u32) -> u32 { } #[cfg(not(any(bpass1,bpass4)))] -#[rustc_clean(cfg="bpass2", except="opt_hir_owner_nodes,optimized_mir,typeck_root")] +#[rustc_clean(cfg="bpass2", except="owner,optimized_mir,typeck_root")] #[rustc_clean(cfg="bpass3")] -#[rustc_clean(cfg="bpass5", except="opt_hir_owner_nodes,optimized_mir,typeck_root")] +#[rustc_clean(cfg="bpass5", except="owner,optimized_mir,typeck_root")] #[rustc_clean(cfg="bpass6")] pub fn add_arm(x: u32) -> u32 { match x { @@ -55,9 +55,9 @@ pub fn change_order_of_arms(x: u32) -> u32 { } #[cfg(not(any(bpass1,bpass4)))] -#[rustc_clean(cfg="bpass2", except="opt_hir_owner_nodes,optimized_mir")] +#[rustc_clean(cfg="bpass2", except="owner,optimized_mir")] #[rustc_clean(cfg="bpass3")] -#[rustc_clean(cfg="bpass5", except="opt_hir_owner_nodes,optimized_mir")] +#[rustc_clean(cfg="bpass5", except="owner,optimized_mir")] #[rustc_clean(cfg="bpass6")] pub fn change_order_of_arms(x: u32) -> u32 { match x { @@ -80,9 +80,9 @@ pub fn add_guard_clause(x: u32, y: bool) -> u32 { } #[cfg(not(any(bpass1,bpass4)))] -#[rustc_clean(cfg="bpass2", except="opt_hir_owner_nodes,optimized_mir,typeck_root")] +#[rustc_clean(cfg="bpass2", except="owner,optimized_mir,typeck_root")] #[rustc_clean(cfg="bpass3")] -#[rustc_clean(cfg="bpass5", except="opt_hir_owner_nodes,optimized_mir,typeck_root")] +#[rustc_clean(cfg="bpass5", except="owner,optimized_mir,typeck_root")] #[rustc_clean(cfg="bpass6")] pub fn add_guard_clause(x: u32, y: bool) -> u32 { match x { @@ -105,9 +105,9 @@ pub fn change_guard_clause(x: u32, y: bool) -> u32 { } #[cfg(not(any(bpass1,bpass4)))] -#[rustc_clean(cfg="bpass2", except="opt_hir_owner_nodes,optimized_mir,typeck_root")] +#[rustc_clean(cfg="bpass2", except="owner,optimized_mir,typeck_root")] #[rustc_clean(cfg="bpass3")] -#[rustc_clean(cfg="bpass5", except="opt_hir_owner_nodes,optimized_mir,typeck_root")] +#[rustc_clean(cfg="bpass5", except="owner,optimized_mir,typeck_root")] #[rustc_clean(cfg="bpass6")] pub fn change_guard_clause(x: u32, y: bool) -> u32 { match x { @@ -130,9 +130,9 @@ pub fn add_at_binding(x: u32) -> u32 { } #[cfg(not(any(bpass1,bpass4)))] -#[rustc_clean(cfg="bpass2", except="opt_hir_owner_nodes,optimized_mir,typeck_root")] +#[rustc_clean(cfg="bpass2", except="owner,optimized_mir,typeck_root")] #[rustc_clean(cfg="bpass3")] -#[rustc_clean(cfg="bpass5", except="opt_hir_owner_nodes,optimized_mir,typeck_root")] +#[rustc_clean(cfg="bpass5", except="owner,optimized_mir,typeck_root")] #[rustc_clean(cfg="bpass6")] pub fn add_at_binding(x: u32) -> u32 { match x { @@ -155,9 +155,9 @@ pub fn change_name_of_at_binding(x: u32) -> u32 { } #[cfg(not(any(bpass1,bpass4)))] -#[rustc_clean(cfg="bpass2", except="opt_hir_owner_nodes,optimized_mir")] +#[rustc_clean(cfg="bpass2", except="owner,optimized_mir")] #[rustc_clean(cfg="bpass3")] -#[rustc_clean(cfg="bpass5", except="opt_hir_owner_nodes,optimized_mir")] +#[rustc_clean(cfg="bpass5", except="owner,optimized_mir")] #[rustc_clean(cfg="bpass6")] pub fn change_name_of_at_binding(x: u32) -> u32 { match x { @@ -179,9 +179,9 @@ pub fn change_simple_name_to_pattern(x: u32) -> u32 { } #[cfg(not(any(bpass1,bpass4)))] -#[rustc_clean(cfg="bpass2", except="opt_hir_owner_nodes,optimized_mir,typeck_root")] +#[rustc_clean(cfg="bpass2", except="owner,optimized_mir,typeck_root")] #[rustc_clean(cfg="bpass3")] -#[rustc_clean(cfg="bpass5", except="opt_hir_owner_nodes,optimized_mir,typeck_root")] +#[rustc_clean(cfg="bpass5", except="owner,optimized_mir,typeck_root")] #[rustc_clean(cfg="bpass6")] pub fn change_simple_name_to_pattern(x: u32) -> u32 { match (x, x & 1) { @@ -203,9 +203,9 @@ pub fn change_name_in_pattern(x: u32) -> u32 { } #[cfg(not(any(bpass1,bpass4)))] -#[rustc_clean(cfg="bpass2", except="opt_hir_owner_nodes,optimized_mir")] +#[rustc_clean(cfg="bpass2", except="owner,optimized_mir")] #[rustc_clean(cfg="bpass3")] -#[rustc_clean(cfg="bpass5", except="opt_hir_owner_nodes,optimized_mir")] +#[rustc_clean(cfg="bpass5", except="owner,optimized_mir")] #[rustc_clean(cfg="bpass6")] pub fn change_name_in_pattern(x: u32) -> u32 { match (x, x & 1) { @@ -228,9 +228,9 @@ pub fn change_mutability_of_binding_in_pattern(x: u32) -> u32 { // Ignore optimized_mir in bpass2, the only change to optimized MIR is a span. #[cfg(not(any(bpass1,bpass4)))] -#[rustc_clean(cfg="bpass2", except="opt_hir_owner_nodes,typeck_root")] +#[rustc_clean(cfg="bpass2", except="owner,typeck_root")] #[rustc_clean(cfg="bpass3")] -#[rustc_clean(cfg="bpass5", except="opt_hir_owner_nodes,optimized_mir,typeck_root")] +#[rustc_clean(cfg="bpass5", except="owner,optimized_mir,typeck_root")] #[rustc_clean(cfg="bpass6")] pub fn change_mutability_of_binding_in_pattern(x: u32) -> u32 { match (x, x & 1) { @@ -251,9 +251,9 @@ pub fn add_ref_to_binding_in_pattern(x: u32) -> u32 { } #[cfg(not(any(bpass1,bpass4)))] -#[rustc_clean(cfg="bpass2", except="opt_hir_owner_nodes,optimized_mir,typeck_root")] +#[rustc_clean(cfg="bpass2", except="owner,optimized_mir,typeck_root")] #[rustc_clean(cfg="bpass3")] -#[rustc_clean(cfg="bpass5", except="opt_hir_owner_nodes,optimized_mir,typeck_root")] +#[rustc_clean(cfg="bpass5", except="owner,optimized_mir,typeck_root")] #[rustc_clean(cfg="bpass6")] pub fn add_ref_to_binding_in_pattern(x: u32) -> u32 { match (x, x & 1) { @@ -274,9 +274,9 @@ pub fn add_amp_to_binding_in_pattern(x: u32) -> u32 { } #[cfg(not(any(bpass1,bpass4)))] -#[rustc_clean(cfg="bpass2", except="opt_hir_owner_nodes,optimized_mir,typeck_root")] +#[rustc_clean(cfg="bpass2", except="owner,optimized_mir,typeck_root")] #[rustc_clean(cfg="bpass3")] -#[rustc_clean(cfg="bpass5", except="opt_hir_owner_nodes,optimized_mir,typeck_root")] +#[rustc_clean(cfg="bpass5", except="owner,optimized_mir,typeck_root")] #[rustc_clean(cfg="bpass6")] pub fn add_amp_to_binding_in_pattern(x: u32) -> u32 { match (&x, x & 1) { @@ -298,9 +298,9 @@ pub fn change_rhs_of_arm(x: u32) -> u32 { } #[cfg(not(any(bpass1,bpass4)))] -#[rustc_clean(cfg="bpass2", except="opt_hir_owner_nodes,optimized_mir")] +#[rustc_clean(cfg="bpass2", except="owner,optimized_mir")] #[rustc_clean(cfg="bpass3")] -#[rustc_clean(cfg="bpass5", except="opt_hir_owner_nodes,optimized_mir")] +#[rustc_clean(cfg="bpass5", except="owner,optimized_mir")] #[rustc_clean(cfg="bpass6")] pub fn change_rhs_of_arm(x: u32) -> u32 { match x { @@ -323,9 +323,9 @@ pub fn add_alternative_to_arm(x: u32) -> u32 { } #[cfg(not(any(bpass1,bpass4)))] -#[rustc_clean(cfg="bpass2", except="opt_hir_owner_nodes,optimized_mir,typeck_root")] +#[rustc_clean(cfg="bpass2", except="owner,optimized_mir,typeck_root")] #[rustc_clean(cfg="bpass3")] -#[rustc_clean(cfg="bpass5", except="opt_hir_owner_nodes,optimized_mir,typeck_root")] +#[rustc_clean(cfg="bpass5", except="owner,optimized_mir,typeck_root")] #[rustc_clean(cfg="bpass6")] pub fn add_alternative_to_arm(x: u32) -> u32 { match x { diff --git a/tests/incremental/hashes/panic_exprs.rs b/tests/incremental/hashes/panic_exprs.rs index 5a74f5f3a744c..4749eed4c7d86 100644 --- a/tests/incremental/hashes/panic_exprs.rs +++ b/tests/incremental/hashes/panic_exprs.rs @@ -19,7 +19,7 @@ // Indexing expression -#[rustc_clean(cfg="bpass2", except="opt_hir_owner_nodes,optimized_mir")] +#[rustc_clean(cfg="bpass2", except="owner,optimized_mir")] #[rustc_clean(cfg="bpass3")] pub fn indexing(slice: &[u8]) -> u8 { #[cfg(bpass1)] @@ -34,7 +34,7 @@ pub fn indexing(slice: &[u8]) -> u8 { // Arithmetic overflow plus -#[rustc_clean(cfg="bpass2", except="opt_hir_owner_nodes,optimized_mir")] +#[rustc_clean(cfg="bpass2", except="owner,optimized_mir")] #[rustc_clean(cfg="bpass3")] pub fn arithmetic_overflow_plus(val: i32) -> i32 { #[cfg(bpass1)] @@ -49,7 +49,7 @@ pub fn arithmetic_overflow_plus(val: i32) -> i32 { // Arithmetic overflow minus -#[rustc_clean(cfg="bpass2", except="opt_hir_owner_nodes,optimized_mir")] +#[rustc_clean(cfg="bpass2", except="owner,optimized_mir")] #[rustc_clean(cfg="bpass3")] pub fn arithmetic_overflow_minus(val: i32) -> i32 { #[cfg(bpass1)] @@ -64,7 +64,7 @@ pub fn arithmetic_overflow_minus(val: i32) -> i32 { // Arithmetic overflow mult -#[rustc_clean(cfg="bpass2", except="opt_hir_owner_nodes,optimized_mir")] +#[rustc_clean(cfg="bpass2", except="owner,optimized_mir")] #[rustc_clean(cfg="bpass3")] pub fn arithmetic_overflow_mult(val: i32) -> i32 { #[cfg(bpass1)] @@ -79,7 +79,7 @@ pub fn arithmetic_overflow_mult(val: i32) -> i32 { // Arithmetic overflow negation -#[rustc_clean(cfg="bpass2", except="opt_hir_owner_nodes,optimized_mir")] +#[rustc_clean(cfg="bpass2", except="owner,optimized_mir")] #[rustc_clean(cfg="bpass3")] pub fn arithmetic_overflow_negation(val: i32) -> i32 { #[cfg(bpass1)] @@ -94,7 +94,7 @@ pub fn arithmetic_overflow_negation(val: i32) -> i32 { // Division by zero -#[rustc_clean(cfg="bpass2", except="opt_hir_owner_nodes,optimized_mir")] +#[rustc_clean(cfg="bpass2", except="owner,optimized_mir")] #[rustc_clean(cfg="bpass3")] pub fn division_by_zero(val: i32) -> i32 { #[cfg(bpass1)] @@ -108,7 +108,7 @@ pub fn division_by_zero(val: i32) -> i32 { } // Division by zero -#[rustc_clean(cfg="bpass2", except="opt_hir_owner_nodes,optimized_mir")] +#[rustc_clean(cfg="bpass2", except="owner,optimized_mir")] #[rustc_clean(cfg="bpass3")] pub fn mod_by_zero(val: i32) -> i32 { #[cfg(bpass1)] @@ -123,7 +123,7 @@ pub fn mod_by_zero(val: i32) -> i32 { // shift left -#[rustc_clean(cfg="bpass2", except="opt_hir_owner_nodes,optimized_mir")] +#[rustc_clean(cfg="bpass2", except="owner,optimized_mir")] #[rustc_clean(cfg="bpass3")] pub fn shift_left(val: i32, shift: usize) -> i32 { #[cfg(bpass1)] @@ -138,7 +138,7 @@ pub fn shift_left(val: i32, shift: usize) -> i32 { // shift right -#[rustc_clean(cfg="bpass2", except="opt_hir_owner_nodes,optimized_mir")] +#[rustc_clean(cfg="bpass2", except="owner,optimized_mir")] #[rustc_clean(cfg="bpass3")] pub fn shift_right(val: i32, shift: usize) -> i32 { #[cfg(bpass1)] diff --git a/tests/incremental/hashes/statics.rs b/tests/incremental/hashes/statics.rs index 5bca02fe3aacf..8767d9804e3ec 100644 --- a/tests/incremental/hashes/statics.rs +++ b/tests/incremental/hashes/statics.rs @@ -25,9 +25,9 @@ static STATIC_VISIBILITY: u8 = 0; #[cfg(not(any(bpass1,bpass4)))] -#[rustc_clean(cfg="bpass2")] +#[rustc_clean(cfg="bpass2", except="owner")] #[rustc_clean(cfg="bpass3")] -#[rustc_clean(cfg="bpass5", except="opt_hir_owner_nodes")] +#[rustc_clean(cfg="bpass5", except="owner")] #[rustc_clean(cfg="bpass6")] pub static STATIC_VISIBILITY: u8 = 0; @@ -37,9 +37,9 @@ pub static STATIC_VISIBILITY: u8 = 0; static STATIC_MUTABILITY: u8 = 0; #[cfg(not(any(bpass1,bpass4)))] -#[rustc_clean(cfg="bpass2", except="opt_hir_owner_nodes")] +#[rustc_clean(cfg="bpass2", except="owner")] #[rustc_clean(cfg="bpass3")] -#[rustc_clean(cfg="bpass5", except="opt_hir_owner_nodes")] +#[rustc_clean(cfg="bpass5", except="owner")] #[rustc_clean(cfg="bpass6")] static mut STATIC_MUTABILITY: u8 = 0; @@ -49,9 +49,9 @@ static mut STATIC_MUTABILITY: u8 = 0; static STATIC_LINKAGE: u8 = 0; #[cfg(not(any(bpass1,bpass4)))] -#[rustc_clean(cfg="bpass2")] +#[rustc_clean(cfg="bpass2", except="owner")] #[rustc_clean(cfg="bpass3")] -#[rustc_clean(cfg="bpass5")] +#[rustc_clean(cfg="bpass5", except="owner")] #[rustc_clean(cfg="bpass6")] #[linkage="weak_odr"] static STATIC_LINKAGE: u8 = 0; @@ -62,9 +62,9 @@ static STATIC_LINKAGE: u8 = 0; static STATIC_NO_MANGLE: u8 = 0; #[cfg(not(any(bpass1,bpass4)))] -#[rustc_clean(cfg="bpass2")] +#[rustc_clean(cfg="bpass2", except="owner")] #[rustc_clean(cfg="bpass3")] -#[rustc_clean(cfg="bpass5")] +#[rustc_clean(cfg="bpass5", except="owner")] #[rustc_clean(cfg="bpass6")] #[unsafe(no_mangle)] static STATIC_NO_MANGLE: u8 = 0; @@ -75,9 +75,9 @@ static STATIC_NO_MANGLE: u8 = 0; static STATIC_THREAD_LOCAL: u8 = 0; #[cfg(not(any(bpass1,bpass4)))] -#[rustc_clean(cfg="bpass2")] +#[rustc_clean(cfg="bpass2", except="owner")] #[rustc_clean(cfg="bpass3")] -#[rustc_clean(cfg="bpass5")] +#[rustc_clean(cfg="bpass5", except="owner")] #[rustc_clean(cfg="bpass6")] #[thread_local] static STATIC_THREAD_LOCAL: u8 = 0; @@ -88,9 +88,9 @@ static STATIC_THREAD_LOCAL: u8 = 0; static STATIC_CHANGE_TYPE_1: i16 = 0; #[cfg(not(any(bpass1,bpass4)))] -#[rustc_clean(cfg="bpass2", except="opt_hir_owner_nodes,type_of")] +#[rustc_clean(cfg="bpass2", except="owner,type_of")] #[rustc_clean(cfg="bpass3")] -#[rustc_clean(cfg="bpass5", except="opt_hir_owner_nodes,type_of")] +#[rustc_clean(cfg="bpass5", except="owner,type_of")] #[rustc_clean(cfg="bpass6")] static STATIC_CHANGE_TYPE_1: u64 = 0; @@ -100,17 +100,17 @@ static STATIC_CHANGE_TYPE_1: u64 = 0; static STATIC_CHANGE_TYPE_2: Option = None; #[cfg(not(any(bpass1,bpass4)))] -#[rustc_clean(cfg="bpass2", except="opt_hir_owner_nodes,type_of")] +#[rustc_clean(cfg="bpass2", except="owner,type_of")] #[rustc_clean(cfg="bpass3")] -#[rustc_clean(cfg="bpass5", except="opt_hir_owner_nodes,type_of")] +#[rustc_clean(cfg="bpass5", except="owner,type_of")] #[rustc_clean(cfg="bpass6")] static STATIC_CHANGE_TYPE_2: Option = None; // Change value between simple literals -#[rustc_clean(cfg="bpass2", except="opt_hir_owner_nodes")] +#[rustc_clean(cfg="bpass2", except="owner")] #[rustc_clean(cfg="bpass3")] -#[rustc_clean(cfg="bpass5", except="opt_hir_owner_nodes")] +#[rustc_clean(cfg="bpass5", except="owner")] #[rustc_clean(cfg="bpass6")] static STATIC_CHANGE_VALUE_1: i16 = { #[cfg(any(bpass1,bpass4))] @@ -122,9 +122,9 @@ static STATIC_CHANGE_VALUE_1: i16 = { // Change value between expressions -#[rustc_clean(cfg="bpass2", except="opt_hir_owner_nodes")] +#[rustc_clean(cfg="bpass2", except="owner")] #[rustc_clean(cfg="bpass3")] -#[rustc_clean(cfg="bpass5", except="opt_hir_owner_nodes")] +#[rustc_clean(cfg="bpass5", except="owner")] #[rustc_clean(cfg="bpass6")] static STATIC_CHANGE_VALUE_2: i16 = { #[cfg(any(bpass1,bpass4))] @@ -134,9 +134,9 @@ static STATIC_CHANGE_VALUE_2: i16 = { { 1 + 2 } }; -#[rustc_clean(cfg="bpass2", except="opt_hir_owner_nodes")] +#[rustc_clean(cfg="bpass2", except="owner")] #[rustc_clean(cfg="bpass3")] -#[rustc_clean(cfg="bpass5", except="opt_hir_owner_nodes")] +#[rustc_clean(cfg="bpass5", except="owner")] #[rustc_clean(cfg="bpass6")] static STATIC_CHANGE_VALUE_3: i16 = { #[cfg(any(bpass1,bpass4))] @@ -146,9 +146,9 @@ static STATIC_CHANGE_VALUE_3: i16 = { { 2 * 3 } }; -#[rustc_clean(cfg="bpass2", except="opt_hir_owner_nodes")] +#[rustc_clean(cfg="bpass2", except="owner")] #[rustc_clean(cfg="bpass3")] -#[rustc_clean(cfg="bpass5", except="opt_hir_owner_nodes")] +#[rustc_clean(cfg="bpass5", except="owner")] #[rustc_clean(cfg="bpass6")] static STATIC_CHANGE_VALUE_4: i16 = { #[cfg(any(bpass1,bpass4))] @@ -170,15 +170,15 @@ mod static_change_type_indirectly { #[cfg(not(any(bpass1,bpass4)))] use super::ReferencedType2 as Type; - #[rustc_clean(cfg="bpass2", except="opt_hir_owner_nodes,type_of")] + #[rustc_clean(cfg="bpass2", except="owner,type_of")] #[rustc_clean(cfg="bpass3")] - #[rustc_clean(cfg="bpass5", except="opt_hir_owner_nodes,type_of")] + #[rustc_clean(cfg="bpass5", except="owner,type_of")] #[rustc_clean(cfg="bpass6")] static STATIC_CHANGE_TYPE_INDIRECTLY_1: Type = Type; - #[rustc_clean(cfg="bpass2", except="opt_hir_owner_nodes,type_of")] + #[rustc_clean(cfg="bpass2", except="owner,type_of")] #[rustc_clean(cfg="bpass3")] - #[rustc_clean(cfg="bpass5", except="opt_hir_owner_nodes,type_of")] + #[rustc_clean(cfg="bpass5", except="owner,type_of")] #[rustc_clean(cfg="bpass6")] static STATIC_CHANGE_TYPE_INDIRECTLY_2: Option = None; } diff --git a/tests/incremental/hashes/struct_constructors.rs b/tests/incremental/hashes/struct_constructors.rs index 08dd815bf6d68..e6fcd2fd9b915 100644 --- a/tests/incremental/hashes/struct_constructors.rs +++ b/tests/incremental/hashes/struct_constructors.rs @@ -35,9 +35,9 @@ pub fn change_field_value_regular_struct() -> RegularStruct { } #[cfg(not(any(bpass1,bpass4)))] -#[rustc_clean(cfg="bpass2", except="opt_hir_owner_nodes,optimized_mir")] +#[rustc_clean(cfg="bpass2", except="owner,optimized_mir")] #[rustc_clean(cfg="bpass3")] -#[rustc_clean(cfg="bpass5", except="opt_hir_owner_nodes,optimized_mir")] +#[rustc_clean(cfg="bpass5", except="owner,optimized_mir")] #[rustc_clean(cfg="bpass6")] pub fn change_field_value_regular_struct() -> RegularStruct { RegularStruct { @@ -60,9 +60,9 @@ pub fn change_field_order_regular_struct() -> RegularStruct { } #[cfg(not(any(bpass1,bpass4)))] -#[rustc_clean(cfg="bpass2", except="opt_hir_owner_nodes,typeck_root")] +#[rustc_clean(cfg="bpass2", except="owner,typeck_root")] #[rustc_clean(cfg="bpass3")] -#[rustc_clean(cfg="bpass5", except="opt_hir_owner_nodes,typeck_root")] +#[rustc_clean(cfg="bpass5", except="owner,typeck_root")] #[rustc_clean(cfg="bpass6")] pub fn change_field_order_regular_struct() -> RegularStruct { RegularStruct { @@ -91,9 +91,9 @@ pub fn add_field_regular_struct() -> RegularStruct { } #[cfg(not(any(bpass1,bpass4)))] -#[rustc_clean(cfg="bpass2", except="opt_hir_owner_nodes,optimized_mir,typeck_root")] +#[rustc_clean(cfg="bpass2", except="owner,optimized_mir,typeck_root")] #[rustc_clean(cfg="bpass3")] -#[rustc_clean(cfg="bpass5", except="opt_hir_owner_nodes,optimized_mir,typeck_root")] +#[rustc_clean(cfg="bpass5", except="owner,optimized_mir,typeck_root")] #[rustc_clean(cfg="bpass6")] pub fn add_field_regular_struct() -> RegularStruct { let struct1 = RegularStruct { @@ -128,9 +128,9 @@ pub fn change_field_label_regular_struct() -> RegularStruct { } #[cfg(not(any(bpass1,bpass4)))] -#[rustc_clean(cfg="bpass2", except="opt_hir_owner_nodes,optimized_mir,typeck_root")] +#[rustc_clean(cfg="bpass2", except="owner,optimized_mir,typeck_root")] #[rustc_clean(cfg="bpass3")] -#[rustc_clean(cfg="bpass5", except="opt_hir_owner_nodes,optimized_mir,typeck_root")] +#[rustc_clean(cfg="bpass5", except="owner,optimized_mir,typeck_root")] #[rustc_clean(cfg="bpass6")] pub fn change_field_label_regular_struct() -> RegularStruct { let struct1 = RegularStruct { @@ -165,9 +165,9 @@ pub fn change_constructor_path_regular_struct() { } #[cfg(not(any(bpass1,bpass4)))] -#[rustc_clean(cfg="bpass2", except="opt_hir_owner_nodes,typeck_root")] +#[rustc_clean(cfg="bpass2", except="owner,typeck_root")] #[rustc_clean(cfg="bpass3")] -#[rustc_clean(cfg="bpass5", except="opt_hir_owner_nodes,typeck_root")] +#[rustc_clean(cfg="bpass5", except="owner,typeck_root")] #[rustc_clean(cfg="bpass6")] pub fn change_constructor_path_regular_struct() { let _ = RegularStruct2 { @@ -186,9 +186,9 @@ pub mod change_constructor_path_indirectly_regular_struct { #[cfg(not(any(bpass1,bpass4)))] use super::RegularStruct2 as Struct; - #[rustc_clean(cfg="bpass2", except="fn_sig,opt_hir_owner_nodes,optimized_mir,typeck_root")] + #[rustc_clean(cfg="bpass2", except="fn_sig,owner,optimized_mir,typeck_root")] #[rustc_clean(cfg="bpass3")] - #[rustc_clean(cfg="bpass5", except="fn_sig,opt_hir_owner_nodes,optimized_mir,typeck_root")] + #[rustc_clean(cfg="bpass5", except="fn_sig,owner,optimized_mir,typeck_root")] #[rustc_clean(cfg="bpass6")] pub fn function() -> Struct { Struct { @@ -210,9 +210,9 @@ pub fn change_field_value_tuple_struct() -> TupleStruct { } #[cfg(not(any(bpass1,bpass4)))] -#[rustc_clean(cfg="bpass2", except="opt_hir_owner_nodes,optimized_mir")] +#[rustc_clean(cfg="bpass2", except="owner,optimized_mir")] #[rustc_clean(cfg="bpass3")] -#[rustc_clean(cfg="bpass5", except="opt_hir_owner_nodes,optimized_mir")] +#[rustc_clean(cfg="bpass5", except="owner,optimized_mir")] #[rustc_clean(cfg="bpass6")] pub fn change_field_value_tuple_struct() -> TupleStruct { TupleStruct(0, 1, 3) @@ -229,9 +229,9 @@ pub fn change_constructor_path_tuple_struct() { } #[cfg(not(any(bpass1,bpass4)))] -#[rustc_clean(cfg="bpass2", except="opt_hir_owner_nodes,typeck_root")] +#[rustc_clean(cfg="bpass2", except="owner,typeck_root")] #[rustc_clean(cfg="bpass3")] -#[rustc_clean(cfg="bpass5", except="opt_hir_owner_nodes,typeck_root")] +#[rustc_clean(cfg="bpass5", except="owner,typeck_root")] #[rustc_clean(cfg="bpass6")] pub fn change_constructor_path_tuple_struct() { let _ = TupleStruct2(0, 1, 2); @@ -246,9 +246,9 @@ pub mod change_constructor_path_indirectly_tuple_struct { #[cfg(not(any(bpass1,bpass4)))] use super::TupleStruct2 as Struct; - #[rustc_clean(cfg="bpass5", except="fn_sig,opt_hir_owner_nodes,optimized_mir,typeck_root")] + #[rustc_clean(cfg="bpass5", except="fn_sig,owner,optimized_mir,typeck_root")] #[rustc_clean(cfg="bpass6")] - #[rustc_clean(cfg="bpass2", except="fn_sig,opt_hir_owner_nodes,optimized_mir,typeck_root")] + #[rustc_clean(cfg="bpass2", except="fn_sig,owner,optimized_mir,typeck_root")] #[rustc_clean(cfg="bpass3")] pub fn function() -> Struct { Struct(0, 1, 2) diff --git a/tests/incremental/hashes/struct_defs.rs b/tests/incremental/hashes/struct_defs.rs index 00e86619338fb..e432aea049a60 100644 --- a/tests/incremental/hashes/struct_defs.rs +++ b/tests/incremental/hashes/struct_defs.rs @@ -27,9 +27,9 @@ pub struct LayoutPacked; #[cfg(not(any(bpass1,bpass4)))] -#[rustc_clean(except="type_of", cfg="bpass2")] +#[rustc_clean(except="type_of,owner", cfg="bpass2")] #[rustc_clean(cfg="bpass3")] -#[rustc_clean(except="type_of", cfg="bpass5")] +#[rustc_clean(except="type_of,owner", cfg="bpass5")] #[rustc_clean(cfg="bpass6")] #[repr(packed)] pub struct LayoutPacked; @@ -38,9 +38,9 @@ pub struct LayoutPacked; struct LayoutC; #[cfg(not(any(bpass1,bpass4)))] -#[rustc_clean(except="type_of", cfg="bpass2")] +#[rustc_clean(except="type_of,owner", cfg="bpass2")] #[rustc_clean(cfg="bpass3")] -#[rustc_clean(except="type_of", cfg="bpass5")] +#[rustc_clean(except="type_of,owner", cfg="bpass5")] #[rustc_clean(cfg="bpass6")] #[repr(C)] struct LayoutC; @@ -52,9 +52,9 @@ struct LayoutC; struct TupleStructFieldType(i32); #[cfg(not(any(bpass1,bpass4)))] -#[rustc_clean(except="opt_hir_owner_nodes", cfg="bpass2")] +#[rustc_clean(except="owner", cfg="bpass2")] #[rustc_clean(cfg="bpass3")] -#[rustc_clean(except="opt_hir_owner_nodes", cfg="bpass5")] +#[rustc_clean(except="owner", cfg="bpass5")] #[rustc_clean(cfg="bpass6")] // Note that changing the type of a field does not change the type of the struct or enum, but // adding/removing fields or changing a fields name or visibility does. @@ -69,9 +69,9 @@ struct TupleStructFieldType( struct TupleStructAddField(i32); #[cfg(not(any(bpass1,bpass4)))] -#[rustc_clean(except="opt_hir_owner_nodes,type_of", cfg="bpass2")] +#[rustc_clean(except="owner,type_of", cfg="bpass2")] #[rustc_clean(cfg="bpass3")] -#[rustc_clean(except="opt_hir_owner_nodes,type_of", cfg="bpass5")] +#[rustc_clean(except="owner,type_of", cfg="bpass5")] #[rustc_clean(cfg="bpass6")] struct TupleStructAddField( i32, @@ -85,9 +85,9 @@ struct TupleStructAddField( struct TupleStructFieldVisibility( char); #[cfg(not(any(bpass1,bpass4)))] -#[rustc_clean(cfg="bpass2", except="type_of")] +#[rustc_clean(cfg="bpass2,owner", except="type_of")] #[rustc_clean(cfg="bpass3")] -#[rustc_clean(cfg="bpass5", except="opt_hir_owner_nodes,type_of")] +#[rustc_clean(cfg="bpass5", except="owner,type_of")] #[rustc_clean(cfg="bpass6")] struct TupleStructFieldVisibility(pub char); @@ -98,9 +98,9 @@ struct TupleStructFieldVisibility(pub char); struct RecordStructFieldType { x: f32 } #[cfg(not(any(bpass1,bpass4)))] -#[rustc_clean(except="opt_hir_owner_nodes", cfg="bpass2")] +#[rustc_clean(except="owner", cfg="bpass2")] #[rustc_clean(cfg="bpass3")] -#[rustc_clean(except="opt_hir_owner_nodes", cfg="bpass5")] +#[rustc_clean(except="owner", cfg="bpass5")] #[rustc_clean(cfg="bpass6")] // Note that changing the type of a field does not change the type of the struct or enum, but // adding/removing fields or changing a fields name or visibility does. @@ -115,9 +115,9 @@ struct RecordStructFieldType { struct RecordStructFieldName { x: f32 } #[cfg(not(any(bpass1,bpass4)))] -#[rustc_clean(except="opt_hir_owner_nodes,type_of", cfg="bpass2")] +#[rustc_clean(except="owner,type_of", cfg="bpass2")] #[rustc_clean(cfg="bpass3")] -#[rustc_clean(except="opt_hir_owner_nodes,type_of", cfg="bpass5")] +#[rustc_clean(except="owner,type_of", cfg="bpass5")] #[rustc_clean(cfg="bpass6")] struct RecordStructFieldName { y: f32 } @@ -128,9 +128,9 @@ struct RecordStructFieldName { y: f32 } struct RecordStructAddField { x: f32 } #[cfg(not(any(bpass1,bpass4)))] -#[rustc_clean(except="opt_hir_owner_nodes,type_of", cfg="bpass2")] +#[rustc_clean(except="owner,type_of", cfg="bpass2")] #[rustc_clean(cfg="bpass3")] -#[rustc_clean(except="opt_hir_owner_nodes,type_of", cfg="bpass5")] +#[rustc_clean(except="owner,type_of", cfg="bpass5")] #[rustc_clean(cfg="bpass6")] struct RecordStructAddField { x: f32, @@ -143,9 +143,9 @@ struct RecordStructAddField { struct RecordStructFieldVisibility { x: f32 } #[cfg(not(any(bpass1,bpass4)))] -#[rustc_clean(cfg="bpass2", except="type_of")] +#[rustc_clean(cfg="bpass2,owner", except="type_of")] #[rustc_clean(cfg="bpass3")] -#[rustc_clean(cfg="bpass5", except="opt_hir_owner_nodes,type_of")] +#[rustc_clean(cfg="bpass5", except="owner,type_of")] #[rustc_clean(cfg="bpass6")] struct RecordStructFieldVisibility { pub x: f32 } @@ -156,9 +156,9 @@ struct RecordStructFieldVisibility { pub x: f32 } struct AddLifetimeParameter<'a>(&'a f32, &'a f64); #[cfg(not(any(bpass1,bpass4)))] -#[rustc_clean(except="opt_hir_owner_nodes,type_of,generics_of", cfg="bpass2")] +#[rustc_clean(except="owner,type_of,generics_of", cfg="bpass2")] #[rustc_clean(cfg="bpass3")] -#[rustc_clean(except="opt_hir_owner_nodes,type_of,generics_of", cfg="bpass5")] +#[rustc_clean(except="owner,type_of,generics_of", cfg="bpass5")] #[rustc_clean(cfg="bpass6")] struct AddLifetimeParameter<'a, 'b>(&'a f32, &'b f64); @@ -169,9 +169,9 @@ struct AddLifetimeParameter<'a, 'b>(&'a f32, &'b f64); struct AddLifetimeParameterBound<'a, 'b>(&'a f32, &'b f64); #[cfg(not(any(bpass1,bpass4)))] -#[rustc_clean(except="opt_hir_owner_nodes,predicates_of", cfg="bpass2")] +#[rustc_clean(except="owner,predicates_of", cfg="bpass2")] #[rustc_clean(cfg="bpass3")] -#[rustc_clean(except="opt_hir_owner_nodes,predicates_of", cfg="bpass5")] +#[rustc_clean(except="owner,predicates_of", cfg="bpass5")] #[rustc_clean(cfg="bpass6")] struct AddLifetimeParameterBound<'a, 'b: 'a>( &'a f32, @@ -182,9 +182,9 @@ struct AddLifetimeParameterBound<'a, 'b: 'a>( struct AddLifetimeParameterBoundWhereClause<'a, 'b>(&'a f32, &'b f64); #[cfg(not(any(bpass1,bpass4)))] -#[rustc_clean(except="opt_hir_owner_nodes,predicates_of", cfg="bpass2")] +#[rustc_clean(except="owner,predicates_of", cfg="bpass2")] #[rustc_clean(cfg="bpass3")] -#[rustc_clean(except="opt_hir_owner_nodes,predicates_of", cfg="bpass5")] +#[rustc_clean(except="owner,predicates_of", cfg="bpass5")] #[rustc_clean(cfg="bpass6")] struct AddLifetimeParameterBoundWhereClause<'a, 'b>( &'a f32, @@ -198,9 +198,9 @@ struct AddLifetimeParameterBoundWhereClause<'a, 'b>( struct AddTypeParameter(T1, T1); #[cfg(not(any(bpass1,bpass4)))] -#[rustc_clean(except="opt_hir_owner_nodes,type_of,generics_of,predicates_of", cfg="bpass2")] +#[rustc_clean(except="owner,type_of,generics_of,predicates_of", cfg="bpass2")] #[rustc_clean(cfg="bpass3")] -#[rustc_clean(except="opt_hir_owner_nodes,type_of,generics_of,predicates_of", cfg="bpass5")] +#[rustc_clean(except="owner,type_of,generics_of,predicates_of", cfg="bpass5")] #[rustc_clean(cfg="bpass6")] struct AddTypeParameter( // The field contains the parent's Generics, so it's dirty even though its @@ -216,9 +216,9 @@ struct AddTypeParameter( struct AddTypeParameterBound(T); #[cfg(not(any(bpass1,bpass4)))] -#[rustc_clean(except="opt_hir_owner_nodes,predicates_of", cfg="bpass2")] +#[rustc_clean(except="owner,predicates_of", cfg="bpass2")] #[rustc_clean(cfg="bpass3")] -#[rustc_clean(except="opt_hir_owner_nodes,predicates_of", cfg="bpass5")] +#[rustc_clean(except="owner,predicates_of", cfg="bpass5")] #[rustc_clean(cfg="bpass6")] struct AddTypeParameterBound( T @@ -229,9 +229,9 @@ struct AddTypeParameterBound( struct AddTypeParameterBoundWhereClause(T); #[cfg(not(any(bpass1,bpass4)))] -#[rustc_clean(except="opt_hir_owner_nodes,predicates_of", cfg="bpass2")] +#[rustc_clean(except="owner,predicates_of", cfg="bpass2")] #[rustc_clean(cfg="bpass3")] -#[rustc_clean(except="opt_hir_owner_nodes,predicates_of", cfg="bpass5")] +#[rustc_clean(except="owner,predicates_of", cfg="bpass5")] #[rustc_clean(cfg="bpass6")] struct AddTypeParameterBoundWhereClause( T @@ -256,9 +256,9 @@ pub struct EmptyStruct; struct Visibility; #[cfg(not(any(bpass1,bpass4)))] -#[rustc_clean(cfg="bpass2")] +#[rustc_clean(cfg="bpass2", except="owner")] #[rustc_clean(cfg="bpass3")] -#[rustc_clean(cfg="bpass5", except="opt_hir_owner_nodes")] +#[rustc_clean(cfg="bpass5", except="owner")] #[rustc_clean(cfg="bpass6")] pub struct Visibility; @@ -272,9 +272,9 @@ mod tuple_struct_change_field_type_indirectly { #[cfg(not(any(bpass1,bpass4)))] use super::ReferencedType2 as FieldType; - #[rustc_clean(except="opt_hir_owner_nodes", cfg="bpass2")] + #[rustc_clean(except="owner", cfg="bpass2")] #[rustc_clean(cfg="bpass3")] - #[rustc_clean(except="opt_hir_owner_nodes", cfg="bpass5")] + #[rustc_clean(except="owner", cfg="bpass5")] #[rustc_clean(cfg="bpass6")] struct TupleStruct( FieldType @@ -289,9 +289,9 @@ mod record_struct_change_field_type_indirectly { #[cfg(not(any(bpass1,bpass4)))] use super::ReferencedType2 as FieldType; - #[rustc_clean(except="opt_hir_owner_nodes", cfg="bpass2")] + #[rustc_clean(except="owner", cfg="bpass2")] #[rustc_clean(cfg="bpass3")] - #[rustc_clean(except="opt_hir_owner_nodes", cfg="bpass5")] + #[rustc_clean(except="owner", cfg="bpass5")] #[rustc_clean(cfg="bpass6")] struct RecordStruct { _x: FieldType @@ -311,9 +311,9 @@ mod change_trait_bound_indirectly { #[cfg(not(any(bpass1,bpass4)))] use super::ReferencedTrait2 as Trait; - #[rustc_clean(except="opt_hir_owner_nodes,predicates_of", cfg="bpass2")] + #[rustc_clean(except="owner,predicates_of", cfg="bpass2")] #[rustc_clean(cfg="bpass3")] - #[rustc_clean(except="opt_hir_owner_nodes,predicates_of", cfg="bpass5")] + #[rustc_clean(except="owner,predicates_of", cfg="bpass5")] #[rustc_clean(cfg="bpass6")] struct Struct(T); } @@ -325,9 +325,9 @@ mod change_trait_bound_indirectly_in_where_clause { #[cfg(not(any(bpass1,bpass4)))] use super::ReferencedTrait2 as Trait; - #[rustc_clean(except="opt_hir_owner_nodes,predicates_of", cfg="bpass2")] + #[rustc_clean(except="owner,predicates_of", cfg="bpass2")] #[rustc_clean(cfg="bpass3")] - #[rustc_clean(except="opt_hir_owner_nodes,predicates_of", cfg="bpass5")] + #[rustc_clean(except="owner,predicates_of", cfg="bpass5")] #[rustc_clean(cfg="bpass6")] struct Struct(T) where T : Trait; } diff --git a/tests/incremental/hashes/trait_defs.rs b/tests/incremental/hashes/trait_defs.rs index 6fad04c9e2c6e..cda5cef1bd9b0 100644 --- a/tests/incremental/hashes/trait_defs.rs +++ b/tests/incremental/hashes/trait_defs.rs @@ -29,9 +29,9 @@ trait TraitVisibility { } #[cfg(not(any(bpass1,bpass4)))] -#[rustc_clean(cfg="bpass2")] +#[rustc_clean(cfg="bpass2", except="owner")] #[rustc_clean(cfg="bpass3")] -#[rustc_clean(cfg="bpass5", except="opt_hir_owner_nodes,predicates_of")] +#[rustc_clean(cfg="bpass5", except="owner,predicates_of")] #[rustc_clean(cfg="bpass6")] pub trait TraitVisibility { } @@ -42,9 +42,9 @@ pub trait TraitVisibility { } trait TraitUnsafety { } #[cfg(not(any(bpass1,bpass4)))] -#[rustc_clean(except="opt_hir_owner_nodes", cfg="bpass2")] +#[rustc_clean(except="owner", cfg="bpass2")] #[rustc_clean(cfg="bpass3")] -#[rustc_clean(except="opt_hir_owner_nodes,predicates_of", cfg="bpass5")] +#[rustc_clean(except="owner,predicates_of", cfg="bpass5")] #[rustc_clean(cfg="bpass6")] unsafe trait TraitUnsafety { } @@ -56,9 +56,9 @@ trait TraitAddMethod { } #[cfg(not(any(bpass1,bpass4)))] -#[rustc_clean(except="opt_hir_owner_nodes,associated_item_def_ids", cfg="bpass2")] +#[rustc_clean(except="owner,associated_item_def_ids", cfg="bpass2")] #[rustc_clean(cfg="bpass3")] -#[rustc_clean(except="opt_hir_owner_nodes,associated_item_def_ids,predicates_of", cfg="bpass5")] +#[rustc_clean(except="owner,associated_item_def_ids,predicates_of", cfg="bpass5")] #[rustc_clean(cfg="bpass6")] pub trait TraitAddMethod { fn method(); @@ -73,9 +73,9 @@ trait TraitChangeMethodName { } #[cfg(not(any(bpass1,bpass4)))] -#[rustc_clean(except="opt_hir_owner_nodes,associated_item_def_ids", cfg="bpass2")] +#[rustc_clean(except="owner,associated_item_def_ids", cfg="bpass2")] #[rustc_clean(cfg="bpass3")] -#[rustc_clean(except="opt_hir_owner_nodes,associated_item_def_ids,predicates_of", cfg="bpass5")] +#[rustc_clean(except="owner,associated_item_def_ids,predicates_of", cfg="bpass5")] #[rustc_clean(cfg="bpass6")] trait TraitChangeMethodName { fn methodChanged(); @@ -94,14 +94,14 @@ trait TraitAddReturnType { } #[cfg(not(any(bpass1,bpass4)))] -#[rustc_clean(cfg="bpass2")] +#[rustc_clean(cfg="bpass2", except="owner")] #[rustc_clean(cfg="bpass3")] -#[rustc_clean(cfg="bpass5")] +#[rustc_clean(cfg="bpass5", except="owner,predicates_of")] #[rustc_clean(cfg="bpass6")] trait TraitAddReturnType { - #[rustc_clean(except="opt_hir_owner_nodes,fn_sig", cfg="bpass2")] + #[rustc_clean(except="owner,fn_sig", cfg="bpass2")] #[rustc_clean(cfg="bpass3")] - #[rustc_clean(except="opt_hir_owner_nodes,fn_sig", cfg="bpass5")] + #[rustc_clean(except="owner,fn_sig", cfg="bpass5")] #[rustc_clean(cfg="bpass6")] fn method() -> u32; } @@ -119,14 +119,14 @@ trait TraitChangeReturnType { } #[cfg(not(any(bpass1,bpass4)))] -#[rustc_clean(cfg="bpass2")] +#[rustc_clean(cfg="bpass2", except="owner")] #[rustc_clean(cfg="bpass3")] -#[rustc_clean(cfg="bpass5")] +#[rustc_clean(cfg="bpass5", except="owner,predicates_of")] #[rustc_clean(cfg="bpass6")] trait TraitChangeReturnType { - #[rustc_clean(except="opt_hir_owner_nodes,fn_sig", cfg="bpass2")] + #[rustc_clean(except="owner,fn_sig", cfg="bpass2")] #[rustc_clean(cfg="bpass3")] - #[rustc_clean(except="opt_hir_owner_nodes,fn_sig", cfg="bpass5")] + #[rustc_clean(except="owner,fn_sig", cfg="bpass5")] #[rustc_clean(cfg="bpass6")] fn method() -> u64; } @@ -144,14 +144,14 @@ trait TraitAddParameterToMethod { } #[cfg(not(any(bpass1,bpass4)))] -#[rustc_clean(cfg="bpass2")] +#[rustc_clean(cfg="bpass2", except="owner")] #[rustc_clean(cfg="bpass3")] -#[rustc_clean(cfg="bpass5")] +#[rustc_clean(cfg="bpass5", except="owner,predicates_of")] #[rustc_clean(cfg="bpass6")] trait TraitAddParameterToMethod { - #[rustc_clean(except="opt_hir_owner_nodes,fn_sig", cfg="bpass2")] + #[rustc_clean(except="owner,fn_sig", cfg="bpass2")] #[rustc_clean(cfg="bpass3")] - #[rustc_clean(except="opt_hir_owner_nodes,fn_sig", cfg="bpass5")] + #[rustc_clean(except="owner,fn_sig", cfg="bpass5")] #[rustc_clean(cfg="bpass6")] fn method(a: u32); } @@ -176,21 +176,21 @@ trait TraitChangeMethodParameterName { } #[cfg(not(any(bpass1,bpass4)))] -#[rustc_clean(cfg="bpass2")] +#[rustc_clean(cfg="bpass2", except="owner")] #[rustc_clean(cfg="bpass3")] -#[rustc_clean(cfg="bpass5")] +#[rustc_clean(cfg="bpass5", except="owner,predicates_of")] #[rustc_clean(cfg="bpass6")] trait TraitChangeMethodParameterName { // FIXME(#38501) This should preferably always be clean. - #[rustc_clean(except="opt_hir_owner_nodes", cfg="bpass2")] + #[rustc_clean(except="owner", cfg="bpass2")] #[rustc_clean(cfg="bpass3")] - #[rustc_clean(except="opt_hir_owner_nodes", cfg="bpass5")] + #[rustc_clean(except="owner", cfg="bpass5")] #[rustc_clean(cfg="bpass6")] fn method(b: u32); - #[rustc_clean(except="opt_hir_owner_nodes,optimized_mir", cfg="bpass2")] + #[rustc_clean(except="owner,optimized_mir", cfg="bpass2")] #[rustc_clean(cfg="bpass3")] - #[rustc_clean(except="opt_hir_owner_nodes,optimized_mir", cfg="bpass5")] + #[rustc_clean(except="owner,optimized_mir", cfg="bpass5")] #[rustc_clean(cfg="bpass6")] fn with_default(y: i32) {} } @@ -208,14 +208,14 @@ trait TraitChangeMethodParameterType { } #[cfg(not(any(bpass1,bpass4)))] -#[rustc_clean(cfg="bpass2")] +#[rustc_clean(cfg="bpass2", except="owner")] #[rustc_clean(cfg="bpass3")] -#[rustc_clean(cfg="bpass5")] +#[rustc_clean(cfg="bpass5", except="owner,predicates_of")] #[rustc_clean(cfg="bpass6")] trait TraitChangeMethodParameterType { - #[rustc_clean(except="opt_hir_owner_nodes,fn_sig", cfg="bpass2")] + #[rustc_clean(except="owner,fn_sig", cfg="bpass2")] #[rustc_clean(cfg="bpass3")] - #[rustc_clean(except="opt_hir_owner_nodes,fn_sig", cfg="bpass5")] + #[rustc_clean(except="owner,fn_sig", cfg="bpass5")] #[rustc_clean(cfg="bpass6")] fn method(a: i64); } @@ -233,14 +233,14 @@ trait TraitChangeMethodParameterTypeRef { } #[cfg(not(any(bpass1,bpass4)))] -#[rustc_clean(cfg="bpass2")] +#[rustc_clean(cfg="bpass2", except="owner")] #[rustc_clean(cfg="bpass3")] -#[rustc_clean(cfg="bpass5")] +#[rustc_clean(cfg="bpass5", except="owner,predicates_of")] #[rustc_clean(cfg="bpass6")] trait TraitChangeMethodParameterTypeRef { - #[rustc_clean(except="opt_hir_owner_nodes,fn_sig", cfg="bpass2")] + #[rustc_clean(except="owner,fn_sig", cfg="bpass2")] #[rustc_clean(cfg="bpass3")] - #[rustc_clean(except="opt_hir_owner_nodes,fn_sig", cfg="bpass5")] + #[rustc_clean(except="owner,fn_sig", cfg="bpass5")] #[rustc_clean(cfg="bpass6")] fn method(a: &mut i32); } @@ -258,14 +258,14 @@ trait TraitChangeMethodParametersOrder { } #[cfg(not(any(bpass1,bpass4)))] -#[rustc_clean(cfg="bpass2")] +#[rustc_clean(cfg="bpass2", except="owner")] #[rustc_clean(cfg="bpass3")] -#[rustc_clean(cfg="bpass5")] +#[rustc_clean(cfg="bpass5", except="owner,predicates_of")] #[rustc_clean(cfg="bpass6")] trait TraitChangeMethodParametersOrder { - #[rustc_clean(except="opt_hir_owner_nodes,fn_sig", cfg="bpass2")] + #[rustc_clean(except="owner,fn_sig", cfg="bpass2")] #[rustc_clean(cfg="bpass3")] - #[rustc_clean(except="opt_hir_owner_nodes,fn_sig", cfg="bpass5")] + #[rustc_clean(except="owner,fn_sig", cfg="bpass5")] #[rustc_clean(cfg="bpass6")] fn method(b: i64, a: i32); } @@ -283,14 +283,14 @@ trait TraitAddMethodAutoImplementation { } #[cfg(not(any(bpass1,bpass4)))] -#[rustc_clean(cfg="bpass2")] +#[rustc_clean(cfg="bpass2", except="owner")] #[rustc_clean(cfg="bpass3")] -#[rustc_clean(cfg="bpass5")] +#[rustc_clean(cfg="bpass5", except="owner,predicates_of")] #[rustc_clean(cfg="bpass6")] trait TraitAddMethodAutoImplementation { - #[rustc_clean(except="opt_hir_owner_nodes", cfg="bpass2")] + #[rustc_clean(except="owner", cfg="bpass2")] #[rustc_clean(cfg="bpass3")] - #[rustc_clean(except="opt_hir_owner_nodes", cfg="bpass5")] + #[rustc_clean(except="owner", cfg="bpass5")] #[rustc_clean(cfg="bpass6")] fn method() {} } @@ -305,9 +305,9 @@ trait TraitChangeOrderOfMethods { } #[cfg(not(any(bpass1,bpass4)))] -#[rustc_clean(except="opt_hir_owner_nodes,associated_item_def_ids", cfg="bpass2")] +#[rustc_clean(except="owner,associated_item_def_ids", cfg="bpass2")] #[rustc_clean(cfg="bpass3")] -#[rustc_clean(except="opt_hir_owner_nodes,associated_item_def_ids", cfg="bpass5")] +#[rustc_clean(except="owner,associated_item_def_ids", cfg="bpass5")] #[rustc_clean(cfg="bpass6")] trait TraitChangeOrderOfMethods { fn method1(); @@ -327,14 +327,14 @@ trait TraitChangeModeSelfRefToMut { } #[cfg(not(any(bpass1,bpass4)))] -#[rustc_clean(cfg="bpass2")] +#[rustc_clean(cfg="bpass2", except="owner")] #[rustc_clean(cfg="bpass3")] -#[rustc_clean(cfg="bpass5")] +#[rustc_clean(cfg="bpass5", except="owner,predicates_of")] #[rustc_clean(cfg="bpass6")] trait TraitChangeModeSelfRefToMut { - #[rustc_clean(except="opt_hir_owner_nodes,fn_sig", cfg="bpass2")] + #[rustc_clean(except="owner,fn_sig", cfg="bpass2")] #[rustc_clean(cfg="bpass3")] - #[rustc_clean(except="opt_hir_owner_nodes,fn_sig", cfg="bpass5")] + #[rustc_clean(except="owner,fn_sig", cfg="bpass5")] #[rustc_clean(cfg="bpass6")] fn method(&mut self); } @@ -351,14 +351,14 @@ trait TraitChangeModeSelfOwnToMut: Sized { } #[cfg(not(any(bpass1,bpass4)))] -#[rustc_clean(cfg="bpass2")] +#[rustc_clean(cfg="bpass2", except="owner")] #[rustc_clean(cfg="bpass3")] -#[rustc_clean(except="opt_hir_owner_nodes", cfg="bpass5")] +#[rustc_clean(except="owner", cfg="bpass5")] #[rustc_clean(cfg="bpass6")] trait TraitChangeModeSelfOwnToMut: Sized { - #[rustc_clean(except="opt_hir_owner_nodes,typeck_root,optimized_mir", cfg="bpass2")] + #[rustc_clean(except="owner,typeck_root,optimized_mir", cfg="bpass2")] #[rustc_clean(cfg="bpass3")] - #[rustc_clean(except="opt_hir_owner_nodes,typeck_root,optimized_mir", cfg="bpass5")] + #[rustc_clean(except="owner,typeck_root,optimized_mir", cfg="bpass5")] #[rustc_clean(cfg="bpass6")] fn method(mut self) {} } @@ -375,14 +375,14 @@ trait TraitChangeModeSelfOwnToRef { } #[cfg(not(any(bpass1,bpass4)))] -#[rustc_clean(cfg="bpass2")] +#[rustc_clean(cfg="bpass2", except="owner")] #[rustc_clean(cfg="bpass3")] -#[rustc_clean(cfg="bpass5")] +#[rustc_clean(cfg="bpass5", except="owner,predicates_of")] #[rustc_clean(cfg="bpass6")] trait TraitChangeModeSelfOwnToRef { - #[rustc_clean(except="opt_hir_owner_nodes,fn_sig,generics_of", cfg="bpass2")] + #[rustc_clean(except="owner,fn_sig,generics_of", cfg="bpass2")] #[rustc_clean(cfg="bpass3")] - #[rustc_clean(except="opt_hir_owner_nodes,fn_sig,generics_of", cfg="bpass5")] + #[rustc_clean(except="owner,fn_sig,generics_of", cfg="bpass5")] #[rustc_clean(cfg="bpass6")] fn method(&self); } @@ -400,14 +400,14 @@ trait TraitAddUnsafeModifier { } #[cfg(not(any(bpass1,bpass4)))] -#[rustc_clean(cfg="bpass2")] +#[rustc_clean(cfg="bpass2", except="owner")] #[rustc_clean(cfg="bpass3")] -#[rustc_clean(cfg="bpass5")] +#[rustc_clean(cfg="bpass5", except="owner,predicates_of")] #[rustc_clean(cfg="bpass6")] trait TraitAddUnsafeModifier { - #[rustc_clean(except="opt_hir_owner_nodes,fn_sig", cfg="bpass2")] + #[rustc_clean(except="owner,fn_sig", cfg="bpass2")] #[rustc_clean(cfg="bpass3")] - #[rustc_clean(except="opt_hir_owner_nodes,fn_sig", cfg="bpass5")] + #[rustc_clean(except="owner,fn_sig", cfg="bpass5")] #[rustc_clean(cfg="bpass6")] unsafe fn method(); } @@ -425,14 +425,14 @@ trait TraitAddExternModifier { } #[cfg(not(any(bpass1,bpass4)))] -#[rustc_clean(cfg="bpass2")] +#[rustc_clean(cfg="bpass2", except="owner")] #[rustc_clean(cfg="bpass3")] -#[rustc_clean(cfg="bpass5")] +#[rustc_clean(cfg="bpass5", except="owner,predicates_of")] #[rustc_clean(cfg="bpass6")] trait TraitAddExternModifier { - #[rustc_clean(except="opt_hir_owner_nodes,fn_sig", cfg="bpass2")] + #[rustc_clean(except="owner,fn_sig", cfg="bpass2")] #[rustc_clean(cfg="bpass3")] - #[rustc_clean(except="opt_hir_owner_nodes,fn_sig", cfg="bpass5")] + #[rustc_clean(except="owner,fn_sig", cfg="bpass5")] #[rustc_clean(cfg="bpass6")] extern "C" fn method(); } @@ -450,14 +450,14 @@ trait TraitChangeExternCToExternSystem { } #[cfg(not(any(bpass1,bpass4)))] -#[rustc_clean(cfg="bpass2")] +#[rustc_clean(cfg="bpass2", except="owner")] #[rustc_clean(cfg="bpass3")] -#[rustc_clean(cfg="bpass5")] +#[rustc_clean(cfg="bpass5", except="owner,predicates_of")] #[rustc_clean(cfg="bpass6")] trait TraitChangeExternCToRustIntrinsic { - #[rustc_clean(except="opt_hir_owner_nodes,fn_sig", cfg="bpass2")] + #[rustc_clean(except="owner,fn_sig", cfg="bpass2")] #[rustc_clean(cfg="bpass3")] - #[rustc_clean(except="opt_hir_owner_nodes,fn_sig", cfg="bpass5")] + #[rustc_clean(except="owner,fn_sig", cfg="bpass5")] #[rustc_clean(cfg="bpass6")] extern "system" fn method(); } @@ -477,15 +477,15 @@ trait TraitAddTypeParameterToMethod { } #[cfg(not(any(bpass1,bpass4)))] -#[rustc_clean(cfg="bpass2")] +#[rustc_clean(cfg="bpass2", except="owner")] #[rustc_clean(cfg="bpass3")] -#[rustc_clean(cfg="bpass5")] +#[rustc_clean(cfg="bpass5", except="owner,predicates_of")] #[rustc_clean(cfg="bpass6")] trait TraitAddTypeParameterToMethod { - #[rustc_clean(except="opt_hir_owner_nodes,generics_of,predicates_of,type_of", + #[rustc_clean(except="owner,generics_of,predicates_of,type_of", cfg="bpass2")] #[rustc_clean(cfg="bpass3")] - #[rustc_clean(except="opt_hir_owner_nodes,generics_of,predicates_of,type_of", + #[rustc_clean(except="owner,generics_of,predicates_of,type_of", cfg="bpass5")] #[rustc_clean(cfg="bpass6")] fn method(); @@ -504,14 +504,14 @@ trait TraitAddLifetimeParameterToMethod { } #[cfg(not(any(bpass1,bpass4)))] -#[rustc_clean(cfg="bpass2")] +#[rustc_clean(cfg="bpass2", except="owner")] #[rustc_clean(cfg="bpass3")] -#[rustc_clean(cfg="bpass5")] +#[rustc_clean(cfg="bpass5", except="owner,predicates_of")] #[rustc_clean(cfg="bpass6")] trait TraitAddLifetimeParameterToMethod { - #[rustc_clean(except="opt_hir_owner_nodes,fn_sig,generics_of", cfg="bpass2")] + #[rustc_clean(except="owner,fn_sig,generics_of", cfg="bpass2")] #[rustc_clean(cfg="bpass3")] - #[rustc_clean(except="opt_hir_owner_nodes,fn_sig,generics_of", cfg="bpass5")] + #[rustc_clean(except="owner,fn_sig,generics_of", cfg="bpass5")] #[rustc_clean(cfg="bpass6")] fn method<'a>(); } @@ -533,14 +533,14 @@ trait TraitAddTraitBoundToMethodTypeParameter { } #[cfg(not(any(bpass1,bpass4)))] -#[rustc_clean(cfg="bpass2")] +#[rustc_clean(cfg="bpass2", except="owner")] #[rustc_clean(cfg="bpass3")] -#[rustc_clean(cfg="bpass5")] +#[rustc_clean(cfg="bpass5", except="owner,predicates_of")] #[rustc_clean(cfg="bpass6")] trait TraitAddTraitBoundToMethodTypeParameter { - #[rustc_clean(except="opt_hir_owner_nodes,predicates_of", cfg="bpass2")] + #[rustc_clean(except="owner,predicates_of", cfg="bpass2")] #[rustc_clean(cfg="bpass3")] - #[rustc_clean(except="opt_hir_owner_nodes,predicates_of", cfg="bpass5")] + #[rustc_clean(except="owner,predicates_of", cfg="bpass5")] #[rustc_clean(cfg="bpass6")] fn method(); } @@ -558,14 +558,14 @@ trait TraitAddBuiltinBoundToMethodTypeParameter { } #[cfg(not(any(bpass1,bpass4)))] -#[rustc_clean(cfg="bpass2")] +#[rustc_clean(cfg="bpass2", except="owner")] #[rustc_clean(cfg="bpass3")] -#[rustc_clean(except="opt_hir_owner_nodes,predicates_of", cfg="bpass5")] +#[rustc_clean(except="owner,predicates_of", cfg="bpass5")] #[rustc_clean(cfg="bpass6")] trait TraitAddBuiltinBoundToMethodTypeParameter { - #[rustc_clean(except="opt_hir_owner_nodes", cfg="bpass2")] + #[rustc_clean(except="owner", cfg="bpass2")] #[rustc_clean(cfg="bpass3")] - #[rustc_clean(except="opt_hir_owner_nodes,predicates_of", cfg="bpass5")] + #[rustc_clean(except="owner,predicates_of", cfg="bpass5")] #[rustc_clean(cfg="bpass6")] fn method(); } @@ -589,18 +589,18 @@ trait TraitAddLifetimeBoundToMethodLifetimeParameter { } #[cfg(not(any(bpass1,bpass4)))] -#[rustc_clean(cfg="bpass2")] +#[rustc_clean(cfg="bpass2", except="owner")] #[rustc_clean(cfg="bpass3")] -#[rustc_clean(cfg="bpass5")] +#[rustc_clean(cfg="bpass5", except="owner,predicates_of")] #[rustc_clean(cfg="bpass6")] trait TraitAddLifetimeBoundToMethodLifetimeParameter { #[rustc_clean( - except="opt_hir_owner_nodes,generics_of,predicates_of,fn_sig,type_of", + except="owner,generics_of,predicates_of,fn_sig,type_of", cfg="bpass2", )] #[rustc_clean(cfg="bpass3")] #[rustc_clean( - except="opt_hir_owner_nodes,generics_of,predicates_of,fn_sig,type_of", + except="owner,generics_of,predicates_of,fn_sig,type_of", cfg="bpass5", )] #[rustc_clean(cfg="bpass6")] @@ -620,14 +620,14 @@ trait TraitAddSecondTraitBoundToMethodTypeParameter { } #[cfg(not(any(bpass1,bpass4)))] -#[rustc_clean(cfg="bpass2")] +#[rustc_clean(cfg="bpass2", except="owner")] #[rustc_clean(cfg="bpass3")] -#[rustc_clean(cfg="bpass5")] +#[rustc_clean(cfg="bpass5", except="owner,predicates_of")] #[rustc_clean(cfg="bpass6")] trait TraitAddSecondTraitBoundToMethodTypeParameter { - #[rustc_clean(except="opt_hir_owner_nodes,predicates_of", cfg="bpass2")] + #[rustc_clean(except="owner,predicates_of", cfg="bpass2")] #[rustc_clean(cfg="bpass3")] - #[rustc_clean(except="opt_hir_owner_nodes,predicates_of", cfg="bpass5")] + #[rustc_clean(except="owner,predicates_of", cfg="bpass5")] #[rustc_clean(cfg="bpass6")] fn method(); } @@ -645,14 +645,14 @@ trait TraitAddSecondBuiltinBoundToMethodTypeParameter { } #[cfg(not(any(bpass1,bpass4)))] -#[rustc_clean(cfg="bpass2")] +#[rustc_clean(cfg="bpass2", except="owner")] #[rustc_clean(cfg="bpass3")] -#[rustc_clean(cfg="bpass5")] +#[rustc_clean(cfg="bpass5", except="owner,predicates_of")] #[rustc_clean(cfg="bpass6")] trait TraitAddSecondBuiltinBoundToMethodTypeParameter { - #[rustc_clean(except="opt_hir_owner_nodes,predicates_of", cfg="bpass2")] + #[rustc_clean(except="owner,predicates_of", cfg="bpass2")] #[rustc_clean(cfg="bpass3")] - #[rustc_clean(except="opt_hir_owner_nodes,predicates_of", cfg="bpass5")] + #[rustc_clean(except="owner,predicates_of", cfg="bpass5")] #[rustc_clean(cfg="bpass6")] fn method(); } @@ -676,18 +676,18 @@ trait TraitAddSecondLifetimeBoundToMethodLifetimeParameter { } #[cfg(not(any(bpass1,bpass4)))] -#[rustc_clean(cfg="bpass2")] +#[rustc_clean(cfg="bpass2", except="owner")] #[rustc_clean(cfg="bpass3")] -#[rustc_clean(cfg="bpass5")] +#[rustc_clean(cfg="bpass5", except="owner,predicates_of")] #[rustc_clean(cfg="bpass6")] trait TraitAddSecondLifetimeBoundToMethodLifetimeParameter { #[rustc_clean( - except="opt_hir_owner_nodes,generics_of,predicates_of,fn_sig,type_of", + except="owner,generics_of,predicates_of,fn_sig,type_of", cfg="bpass2", )] #[rustc_clean(cfg="bpass3")] #[rustc_clean( - except="opt_hir_owner_nodes,generics_of,predicates_of,fn_sig,type_of", + except="owner,generics_of,predicates_of,fn_sig,type_of", cfg="bpass5", )] #[rustc_clean(cfg="bpass6")] @@ -711,18 +711,18 @@ trait TraitAddAssociatedType { } #[cfg(not(any(bpass1,bpass4)))] -#[rustc_clean(except="opt_hir_owner_nodes,associated_item_def_ids", cfg="bpass2")] +#[rustc_clean(except="owner,associated_item_def_ids", cfg="bpass2")] #[rustc_clean(cfg="bpass3")] -#[rustc_clean(except="opt_hir_owner_nodes,associated_item_def_ids", cfg="bpass5")] +#[rustc_clean(except="owner,associated_item_def_ids,predicates_of", cfg="bpass5")] #[rustc_clean(cfg="bpass6")] trait TraitAddAssociatedType { #[rustc_clean(cfg="bpass3")] #[rustc_clean(cfg="bpass6")] type Associated; - #[rustc_clean(cfg="bpass2")] + #[rustc_clean(cfg="bpass2", except="owner")] #[rustc_clean(cfg="bpass3")] - #[rustc_clean(cfg="bpass5")] + #[rustc_clean(cfg="bpass5", except="owner")] #[rustc_clean(cfg="bpass6")] fn method(); } @@ -745,14 +745,14 @@ trait TraitAddTraitBoundToAssociatedType { // Apparently the type bound contributes to the predicates of the trait, but // does not change the associated item itself. #[cfg(not(any(bpass1,bpass4)))] -#[rustc_clean(cfg="bpass2")] +#[rustc_clean(cfg="bpass2", except="owner")] #[rustc_clean(cfg="bpass3")] -#[rustc_clean(cfg="bpass5")] +#[rustc_clean(cfg="bpass5", except="owner,predicates_of")] #[rustc_clean(cfg="bpass6")] trait TraitAddTraitBoundToAssociatedType { - #[rustc_clean(except="opt_hir_owner_nodes", cfg="bpass2")] + #[rustc_clean(except="owner", cfg="bpass2")] #[rustc_clean(cfg="bpass3")] - #[rustc_clean(except="opt_hir_owner_nodes", cfg="bpass5")] + #[rustc_clean(except="owner", cfg="bpass5")] #[rustc_clean(cfg="bpass6")] type Associated: ReferencedTrait0; @@ -774,14 +774,14 @@ trait TraitAddLifetimeBoundToAssociatedType<'a> { } #[cfg(not(any(bpass1,bpass4)))] -#[rustc_clean(cfg="bpass2")] +#[rustc_clean(cfg="bpass2", except="owner")] #[rustc_clean(cfg="bpass3")] -#[rustc_clean(cfg="bpass5")] +#[rustc_clean(cfg="bpass5", except="owner,predicates_of")] #[rustc_clean(cfg="bpass6")] trait TraitAddLifetimeBoundToAssociatedType<'a> { - #[rustc_clean(except="opt_hir_owner_nodes", cfg="bpass2")] + #[rustc_clean(except="owner", cfg="bpass2")] #[rustc_clean(cfg="bpass3")] - #[rustc_clean(except="opt_hir_owner_nodes", cfg="bpass5")] + #[rustc_clean(except="owner", cfg="bpass5")] #[rustc_clean(cfg="bpass6")] type Associated: 'a; @@ -803,14 +803,14 @@ trait TraitAddDefaultToAssociatedType { } #[cfg(not(any(bpass1,bpass4)))] -#[rustc_clean(cfg="bpass2")] +#[rustc_clean(cfg="bpass2", except="owner")] #[rustc_clean(cfg="bpass3")] -#[rustc_clean(cfg="bpass5")] +#[rustc_clean(cfg="bpass5", except="owner,predicates_of")] #[rustc_clean(cfg="bpass6")] trait TraitAddDefaultToAssociatedType { - #[rustc_clean(except="opt_hir_owner_nodes", cfg="bpass2")] + #[rustc_clean(except="owner", cfg="bpass2")] #[rustc_clean(cfg="bpass3")] - #[rustc_clean(except="opt_hir_owner_nodes", cfg="bpass5")] + #[rustc_clean(except="owner", cfg="bpass5")] #[rustc_clean(cfg="bpass6")] type Associated = ReferenceType0; @@ -826,9 +826,9 @@ trait TraitAddAssociatedConstant { } #[cfg(not(any(bpass1,bpass4)))] -#[rustc_clean(except="opt_hir_owner_nodes,associated_item_def_ids", cfg="bpass2")] +#[rustc_clean(except="owner,associated_item_def_ids", cfg="bpass2")] #[rustc_clean(cfg="bpass3")] -#[rustc_clean(except="opt_hir_owner_nodes,associated_item_def_ids,predicates_of", cfg="bpass5")] +#[rustc_clean(except="owner,associated_item_def_ids,predicates_of", cfg="bpass5")] #[rustc_clean(cfg="bpass6")] trait TraitAddAssociatedConstant { const Value: u32; @@ -855,20 +855,20 @@ trait TraitAddInitializerToAssociatedConstant { } #[cfg(not(any(bpass1,bpass4)))] -#[rustc_clean(cfg="bpass2")] +#[rustc_clean(cfg="bpass2", except="owner")] #[rustc_clean(cfg="bpass3")] -#[rustc_clean(cfg="bpass5")] +#[rustc_clean(cfg="bpass5", except="owner,predicates_of")] #[rustc_clean(cfg="bpass6")] trait TraitAddInitializerToAssociatedConstant { - #[rustc_clean(except="opt_hir_owner_nodes", cfg="bpass2")] + #[rustc_clean(except="owner", cfg="bpass2")] #[rustc_clean(cfg="bpass3")] - #[rustc_clean(except="opt_hir_owner_nodes", cfg="bpass5")] + #[rustc_clean(except="owner", cfg="bpass5")] #[rustc_clean(cfg="bpass6")] const Value: u32 = 1; - #[rustc_clean(cfg="bpass2")] + #[rustc_clean(cfg="bpass2", except="owner")] #[rustc_clean(cfg="bpass3")] - #[rustc_clean(cfg="bpass5")] + #[rustc_clean(cfg="bpass5", except="owner")] #[rustc_clean(cfg="bpass6")] fn method(); } @@ -892,20 +892,20 @@ trait TraitChangeTypeOfAssociatedConstant { } #[cfg(not(any(bpass1,bpass4)))] -#[rustc_clean(cfg="bpass2")] +#[rustc_clean(cfg="bpass2", except="owner")] #[rustc_clean(cfg="bpass3")] -#[rustc_clean(cfg="bpass5")] +#[rustc_clean(cfg="bpass5", except="owner,predicates_of")] #[rustc_clean(cfg="bpass6")] trait TraitChangeTypeOfAssociatedConstant { - #[rustc_clean(except="opt_hir_owner_nodes,type_of", cfg="bpass2")] + #[rustc_clean(except="owner,type_of", cfg="bpass2")] #[rustc_clean(cfg="bpass3")] - #[rustc_clean(except="opt_hir_owner_nodes,type_of", cfg="bpass5")] + #[rustc_clean(except="owner,type_of", cfg="bpass5")] #[rustc_clean(cfg="bpass6")] const Value: f64; - #[rustc_clean(cfg="bpass2")] + #[rustc_clean(cfg="bpass2", except="owner")] #[rustc_clean(cfg="bpass3")] - #[rustc_clean(cfg="bpass5")] + #[rustc_clean(cfg="bpass5", except="owner")] #[rustc_clean(cfg="bpass6")] fn method(); } @@ -917,9 +917,9 @@ trait TraitChangeTypeOfAssociatedConstant { trait TraitAddSuperTrait { } #[cfg(not(any(bpass1,bpass4)))] -#[rustc_clean(except="opt_hir_owner_nodes,predicates_of", cfg="bpass2")] +#[rustc_clean(except="owner,predicates_of", cfg="bpass2")] #[rustc_clean(cfg="bpass3")] -#[rustc_clean(except="opt_hir_owner_nodes,predicates_of", cfg="bpass5")] +#[rustc_clean(except="owner,predicates_of", cfg="bpass5")] #[rustc_clean(cfg="bpass6")] trait TraitAddSuperTrait : ReferencedTrait0 { } @@ -930,9 +930,9 @@ trait TraitAddSuperTrait : ReferencedTrait0 { } trait TraitAddBuiltiBound { } #[cfg(not(any(bpass1,bpass4)))] -#[rustc_clean(except="opt_hir_owner_nodes,predicates_of", cfg="bpass2")] +#[rustc_clean(except="owner,predicates_of", cfg="bpass2")] #[rustc_clean(cfg="bpass3")] -#[rustc_clean(except="opt_hir_owner_nodes,predicates_of", cfg="bpass5")] +#[rustc_clean(except="owner,predicates_of", cfg="bpass5")] #[rustc_clean(cfg="bpass6")] trait TraitAddBuiltiBound : Send { } @@ -943,9 +943,9 @@ trait TraitAddBuiltiBound : Send { } trait TraitAddStaticLifetimeBound { } #[cfg(not(any(bpass1,bpass4)))] -#[rustc_clean(except="opt_hir_owner_nodes,predicates_of", cfg="bpass2")] +#[rustc_clean(except="owner,predicates_of", cfg="bpass2")] #[rustc_clean(cfg="bpass3")] -#[rustc_clean(except="opt_hir_owner_nodes,predicates_of", cfg="bpass5")] +#[rustc_clean(except="owner,predicates_of", cfg="bpass5")] #[rustc_clean(cfg="bpass6")] trait TraitAddStaticLifetimeBound : 'static { } @@ -956,9 +956,9 @@ trait TraitAddStaticLifetimeBound : 'static { } trait TraitAddTraitAsSecondBound : ReferencedTrait0 { } #[cfg(not(any(bpass1,bpass4)))] -#[rustc_clean(except="opt_hir_owner_nodes,predicates_of", cfg="bpass2")] +#[rustc_clean(except="owner,predicates_of", cfg="bpass2")] #[rustc_clean(cfg="bpass3")] -#[rustc_clean(except="opt_hir_owner_nodes,predicates_of", cfg="bpass5")] +#[rustc_clean(except="owner,predicates_of", cfg="bpass5")] #[rustc_clean(cfg="bpass6")] trait TraitAddTraitAsSecondBound : ReferencedTrait0 + ReferencedTrait1 { } @@ -966,9 +966,9 @@ trait TraitAddTraitAsSecondBound : ReferencedTrait0 + ReferencedTrait1 { } trait TraitAddTraitAsSecondBoundFromBuiltin : Send { } #[cfg(not(any(bpass1,bpass4)))] -#[rustc_clean(except="opt_hir_owner_nodes,predicates_of", cfg="bpass2")] +#[rustc_clean(except="owner,predicates_of", cfg="bpass2")] #[rustc_clean(cfg="bpass3")] -#[rustc_clean(except="opt_hir_owner_nodes,predicates_of", cfg="bpass5")] +#[rustc_clean(except="owner,predicates_of", cfg="bpass5")] #[rustc_clean(cfg="bpass6")] trait TraitAddTraitAsSecondBoundFromBuiltin : Send + ReferencedTrait0 { } @@ -979,9 +979,9 @@ trait TraitAddTraitAsSecondBoundFromBuiltin : Send + ReferencedTrait0 { } trait TraitAddBuiltinBoundAsSecondBound : ReferencedTrait0 { } #[cfg(not(any(bpass1,bpass4)))] -#[rustc_clean(except="opt_hir_owner_nodes,predicates_of", cfg="bpass2")] +#[rustc_clean(except="owner,predicates_of", cfg="bpass2")] #[rustc_clean(cfg="bpass3")] -#[rustc_clean(except="opt_hir_owner_nodes,predicates_of", cfg="bpass5")] +#[rustc_clean(except="owner,predicates_of", cfg="bpass5")] #[rustc_clean(cfg="bpass6")] trait TraitAddBuiltinBoundAsSecondBound : ReferencedTrait0 + Send { } @@ -989,9 +989,9 @@ trait TraitAddBuiltinBoundAsSecondBound : ReferencedTrait0 + Send { } trait TraitAddBuiltinBoundAsSecondBoundFromBuiltin : Send { } #[cfg(not(any(bpass1,bpass4)))] -#[rustc_clean(except="opt_hir_owner_nodes,predicates_of", cfg="bpass2")] +#[rustc_clean(except="owner,predicates_of", cfg="bpass2")] #[rustc_clean(cfg="bpass3")] -#[rustc_clean(except="opt_hir_owner_nodes,predicates_of", cfg="bpass5")] +#[rustc_clean(except="owner,predicates_of", cfg="bpass5")] #[rustc_clean(cfg="bpass6")] trait TraitAddBuiltinBoundAsSecondBoundFromBuiltin: Send + Copy { } @@ -1002,9 +1002,9 @@ trait TraitAddBuiltinBoundAsSecondBoundFromBuiltin: Send + Copy { } trait TraitAddStaticBoundAsSecondBound : ReferencedTrait0 { } #[cfg(not(any(bpass1,bpass4)))] -#[rustc_clean(except="opt_hir_owner_nodes,predicates_of", cfg="bpass2")] +#[rustc_clean(except="owner,predicates_of", cfg="bpass2")] #[rustc_clean(cfg="bpass3")] -#[rustc_clean(except="opt_hir_owner_nodes,predicates_of", cfg="bpass5")] +#[rustc_clean(except="owner,predicates_of", cfg="bpass5")] #[rustc_clean(cfg="bpass6")] trait TraitAddStaticBoundAsSecondBound : ReferencedTrait0 + 'static { } @@ -1012,9 +1012,9 @@ trait TraitAddStaticBoundAsSecondBound : ReferencedTrait0 + 'static { } trait TraitAddStaticBoundAsSecondBoundFromBuiltin : Send { } #[cfg(not(any(bpass1,bpass4)))] -#[rustc_clean(except="opt_hir_owner_nodes,predicates_of", cfg="bpass2")] +#[rustc_clean(except="owner,predicates_of", cfg="bpass2")] #[rustc_clean(cfg="bpass3")] -#[rustc_clean(except="opt_hir_owner_nodes,predicates_of", cfg="bpass5")] +#[rustc_clean(except="owner,predicates_of", cfg="bpass5")] #[rustc_clean(cfg="bpass6")] trait TraitAddStaticBoundAsSecondBoundFromBuiltin : Send + 'static { } @@ -1025,9 +1025,9 @@ trait TraitAddStaticBoundAsSecondBoundFromBuiltin : Send + 'static { } trait TraitAddTypeParameterToTrait { } #[cfg(not(any(bpass1,bpass4)))] -#[rustc_clean(except="opt_hir_owner_nodes,generics_of,predicates_of", cfg="bpass2")] +#[rustc_clean(except="owner,generics_of,predicates_of", cfg="bpass2")] #[rustc_clean(cfg="bpass3")] -#[rustc_clean(except="opt_hir_owner_nodes,generics_of,predicates_of", cfg="bpass5")] +#[rustc_clean(except="owner,generics_of,predicates_of", cfg="bpass5")] #[rustc_clean(cfg="bpass6")] trait TraitAddTypeParameterToTrait { } @@ -1038,9 +1038,9 @@ trait TraitAddTypeParameterToTrait { } trait TraitAddLifetimeParameterToTrait { } #[cfg(not(any(bpass1,bpass4)))] -#[rustc_clean(except="opt_hir_owner_nodes,generics_of,predicates_of", cfg="bpass2")] +#[rustc_clean(except="owner,generics_of,predicates_of", cfg="bpass2")] #[rustc_clean(cfg="bpass3")] -#[rustc_clean(except="opt_hir_owner_nodes,generics_of,predicates_of", cfg="bpass5")] +#[rustc_clean(except="owner,generics_of,predicates_of", cfg="bpass5")] #[rustc_clean(cfg="bpass6")] trait TraitAddLifetimeParameterToTrait<'a> { } @@ -1051,9 +1051,9 @@ trait TraitAddLifetimeParameterToTrait<'a> { } trait TraitAddTraitBoundToTypeParameterOfTrait { } #[cfg(not(any(bpass1,bpass4)))] -#[rustc_clean(except="opt_hir_owner_nodes,predicates_of", cfg="bpass2")] +#[rustc_clean(except="owner,predicates_of", cfg="bpass2")] #[rustc_clean(cfg="bpass3")] -#[rustc_clean(except="opt_hir_owner_nodes,predicates_of", cfg="bpass5")] +#[rustc_clean(except="owner,predicates_of", cfg="bpass5")] #[rustc_clean(cfg="bpass6")] trait TraitAddTraitBoundToTypeParameterOfTrait { } @@ -1064,9 +1064,9 @@ trait TraitAddTraitBoundToTypeParameterOfTrait { } trait TraitAddLifetimeBoundToTypeParameterOfTrait<'a, T> { } #[cfg(not(any(bpass1,bpass4)))] -#[rustc_clean(except="opt_hir_owner_nodes,predicates_of", cfg="bpass2")] +#[rustc_clean(except="owner,predicates_of", cfg="bpass2")] #[rustc_clean(cfg="bpass3")] -#[rustc_clean(except="opt_hir_owner_nodes,predicates_of", cfg="bpass5")] +#[rustc_clean(except="owner,predicates_of", cfg="bpass5")] #[rustc_clean(cfg="bpass6")] trait TraitAddLifetimeBoundToTypeParameterOfTrait<'a, T: 'a> { } @@ -1077,9 +1077,9 @@ trait TraitAddLifetimeBoundToTypeParameterOfTrait<'a, T: 'a> { } trait TraitAddLifetimeBoundToLifetimeParameterOfTrait<'a, 'b> { } #[cfg(not(any(bpass1,bpass4)))] -#[rustc_clean(except="opt_hir_owner_nodes,predicates_of", cfg="bpass2")] +#[rustc_clean(except="owner,predicates_of", cfg="bpass2")] #[rustc_clean(cfg="bpass3")] -#[rustc_clean(except="opt_hir_owner_nodes,predicates_of", cfg="bpass5")] +#[rustc_clean(except="owner,predicates_of", cfg="bpass5")] #[rustc_clean(cfg="bpass6")] trait TraitAddLifetimeBoundToLifetimeParameterOfTrait<'a: 'b, 'b> { } @@ -1090,9 +1090,9 @@ trait TraitAddLifetimeBoundToLifetimeParameterOfTrait<'a: 'b, 'b> { } trait TraitAddBuiltinBoundToTypeParameterOfTrait { } #[cfg(not(any(bpass1,bpass4)))] -#[rustc_clean(except="opt_hir_owner_nodes,predicates_of", cfg="bpass2")] +#[rustc_clean(except="owner,predicates_of", cfg="bpass2")] #[rustc_clean(cfg="bpass3")] -#[rustc_clean(except="opt_hir_owner_nodes,predicates_of", cfg="bpass5")] +#[rustc_clean(except="owner,predicates_of", cfg="bpass5")] #[rustc_clean(cfg="bpass6")] trait TraitAddBuiltinBoundToTypeParameterOfTrait { } @@ -1103,9 +1103,9 @@ trait TraitAddBuiltinBoundToTypeParameterOfTrait { } trait TraitAddSecondTypeParameterToTrait { } #[cfg(not(any(bpass1,bpass4)))] -#[rustc_clean(except="opt_hir_owner_nodes,generics_of,predicates_of", cfg="bpass2")] +#[rustc_clean(except="owner,generics_of,predicates_of", cfg="bpass2")] #[rustc_clean(cfg="bpass3")] -#[rustc_clean(except="opt_hir_owner_nodes,generics_of,predicates_of", cfg="bpass5")] +#[rustc_clean(except="owner,generics_of,predicates_of", cfg="bpass5")] #[rustc_clean(cfg="bpass6")] trait TraitAddSecondTypeParameterToTrait { } @@ -1116,9 +1116,9 @@ trait TraitAddSecondTypeParameterToTrait { } trait TraitAddSecondLifetimeParameterToTrait<'a> { } #[cfg(not(any(bpass1,bpass4)))] -#[rustc_clean(except="opt_hir_owner_nodes,generics_of,predicates_of", cfg="bpass2")] +#[rustc_clean(except="owner,generics_of,predicates_of", cfg="bpass2")] #[rustc_clean(cfg="bpass3")] -#[rustc_clean(except="opt_hir_owner_nodes,generics_of,predicates_of", cfg="bpass5")] +#[rustc_clean(except="owner,generics_of,predicates_of", cfg="bpass5")] #[rustc_clean(cfg="bpass6")] trait TraitAddSecondLifetimeParameterToTrait<'a, 'b> { } @@ -1129,9 +1129,9 @@ trait TraitAddSecondLifetimeParameterToTrait<'a, 'b> { } trait TraitAddSecondTraitBoundToTypeParameterOfTrait { } #[cfg(not(any(bpass1,bpass4)))] -#[rustc_clean(except="opt_hir_owner_nodes,predicates_of", cfg="bpass2")] +#[rustc_clean(except="owner,predicates_of", cfg="bpass2")] #[rustc_clean(cfg="bpass3")] -#[rustc_clean(except="opt_hir_owner_nodes,predicates_of", cfg="bpass5")] +#[rustc_clean(except="owner,predicates_of", cfg="bpass5")] #[rustc_clean(cfg="bpass6")] trait TraitAddSecondTraitBoundToTypeParameterOfTrait { } @@ -1142,9 +1142,9 @@ trait TraitAddSecondTraitBoundToTypeParameterOfTrait { } #[cfg(not(any(bpass1,bpass4)))] -#[rustc_clean(except="opt_hir_owner_nodes,predicates_of", cfg="bpass2")] +#[rustc_clean(except="owner,predicates_of", cfg="bpass2")] #[rustc_clean(cfg="bpass3")] -#[rustc_clean(except="opt_hir_owner_nodes,predicates_of", cfg="bpass5")] +#[rustc_clean(except="owner,predicates_of", cfg="bpass5")] #[rustc_clean(cfg="bpass6")] trait TraitAddSecondLifetimeBoundToTypeParameterOfTrait<'a, 'b, T: 'a + 'b> { } @@ -1155,9 +1155,9 @@ trait TraitAddSecondLifetimeBoundToTypeParameterOfTrait<'a, 'b, T: 'a + 'b> { } trait TraitAddSecondLifetimeBoundToLifetimeParameterOfTrait<'a: 'b, 'b, 'c> { } #[cfg(not(any(bpass1,bpass4)))] -#[rustc_clean(except="opt_hir_owner_nodes,predicates_of", cfg="bpass2")] +#[rustc_clean(except="owner,predicates_of", cfg="bpass2")] #[rustc_clean(cfg="bpass3")] -#[rustc_clean(except="opt_hir_owner_nodes,predicates_of", cfg="bpass5")] +#[rustc_clean(except="owner,predicates_of", cfg="bpass5")] #[rustc_clean(cfg="bpass6")] trait TraitAddSecondLifetimeBoundToLifetimeParameterOfTrait<'a: 'b + 'c, 'b, 'c> { } @@ -1168,9 +1168,9 @@ trait TraitAddSecondLifetimeBoundToLifetimeParameterOfTrait<'a: 'b + 'c, 'b, 'c> trait TraitAddSecondBuiltinBoundToTypeParameterOfTrait { } #[cfg(not(any(bpass1,bpass4)))] -#[rustc_clean(except="opt_hir_owner_nodes,predicates_of", cfg="bpass2")] +#[rustc_clean(except="owner,predicates_of", cfg="bpass2")] #[rustc_clean(cfg="bpass3")] -#[rustc_clean(except="opt_hir_owner_nodes,predicates_of", cfg="bpass5")] +#[rustc_clean(except="owner,predicates_of", cfg="bpass5")] #[rustc_clean(cfg="bpass6")] trait TraitAddSecondBuiltinBoundToTypeParameterOfTrait { } @@ -1186,9 +1186,9 @@ struct ReferenceType1 {} trait TraitAddTraitBoundToTypeParameterOfTraitWhere { } #[cfg(not(any(bpass1,bpass4)))] -#[rustc_clean(except="opt_hir_owner_nodes,predicates_of", cfg="bpass2")] +#[rustc_clean(except="owner,predicates_of", cfg="bpass2")] #[rustc_clean(cfg="bpass3")] -#[rustc_clean(except="opt_hir_owner_nodes,predicates_of", cfg="bpass5")] +#[rustc_clean(except="owner,predicates_of", cfg="bpass5")] #[rustc_clean(cfg="bpass6")] trait TraitAddTraitBoundToTypeParameterOfTraitWhere where T: ReferencedTrait0 { } @@ -1199,9 +1199,9 @@ trait TraitAddTraitBoundToTypeParameterOfTraitWhere where T: ReferencedTrait0 trait TraitAddLifetimeBoundToTypeParameterOfTraitWhere<'a, T> { } #[cfg(not(any(bpass1,bpass4)))] -#[rustc_clean(except="opt_hir_owner_nodes,predicates_of", cfg="bpass2")] +#[rustc_clean(except="owner,predicates_of", cfg="bpass2")] #[rustc_clean(cfg="bpass3")] -#[rustc_clean(except="opt_hir_owner_nodes,predicates_of", cfg="bpass5")] +#[rustc_clean(except="owner,predicates_of", cfg="bpass5")] #[rustc_clean(cfg="bpass6")] trait TraitAddLifetimeBoundToTypeParameterOfTraitWhere<'a, T> where T: 'a { } @@ -1212,9 +1212,9 @@ trait TraitAddLifetimeBoundToTypeParameterOfTraitWhere<'a, T> where T: 'a { } trait TraitAddLifetimeBoundToLifetimeParameterOfTraitWhere<'a, 'b> { } #[cfg(not(any(bpass1,bpass4)))] -#[rustc_clean(except="opt_hir_owner_nodes,predicates_of", cfg="bpass2")] +#[rustc_clean(except="owner,predicates_of", cfg="bpass2")] #[rustc_clean(cfg="bpass3")] -#[rustc_clean(except="opt_hir_owner_nodes,predicates_of", cfg="bpass5")] +#[rustc_clean(except="owner,predicates_of", cfg="bpass5")] #[rustc_clean(cfg="bpass6")] trait TraitAddLifetimeBoundToLifetimeParameterOfTraitWhere<'a, 'b> where 'a: 'b { } @@ -1225,9 +1225,9 @@ trait TraitAddLifetimeBoundToLifetimeParameterOfTraitWhere<'a, 'b> where 'a: 'b trait TraitAddBuiltinBoundToTypeParameterOfTraitWhere { } #[cfg(not(any(bpass1,bpass4)))] -#[rustc_clean(except="opt_hir_owner_nodes,predicates_of", cfg="bpass2")] +#[rustc_clean(except="owner,predicates_of", cfg="bpass2")] #[rustc_clean(cfg="bpass3")] -#[rustc_clean(except="opt_hir_owner_nodes,predicates_of", cfg="bpass5")] +#[rustc_clean(except="owner,predicates_of", cfg="bpass5")] #[rustc_clean(cfg="bpass6")] trait TraitAddBuiltinBoundToTypeParameterOfTraitWhere where T: Send { } @@ -1238,9 +1238,9 @@ trait TraitAddBuiltinBoundToTypeParameterOfTraitWhere where T: Send { } trait TraitAddSecondTraitBoundToTypeParameterOfTraitWhere where T: ReferencedTrait0 { } #[cfg(not(any(bpass1,bpass4)))] -#[rustc_clean(except="opt_hir_owner_nodes,predicates_of", cfg="bpass2")] +#[rustc_clean(except="owner,predicates_of", cfg="bpass2")] #[rustc_clean(cfg="bpass3")] -#[rustc_clean(except="opt_hir_owner_nodes,predicates_of", cfg="bpass5")] +#[rustc_clean(except="owner,predicates_of", cfg="bpass5")] #[rustc_clean(cfg="bpass6")] trait TraitAddSecondTraitBoundToTypeParameterOfTraitWhere where T: ReferencedTrait0 + ReferencedTrait1 { } @@ -1252,9 +1252,9 @@ trait TraitAddSecondTraitBoundToTypeParameterOfTraitWhere trait TraitAddSecondLifetimeBoundToTypeParameterOfTraitWhere<'a, 'b, T> where T: 'a { } #[cfg(not(any(bpass1,bpass4)))] -#[rustc_clean(except="opt_hir_owner_nodes,predicates_of", cfg="bpass2")] +#[rustc_clean(except="owner,predicates_of", cfg="bpass2")] #[rustc_clean(cfg="bpass3")] -#[rustc_clean(except="opt_hir_owner_nodes,predicates_of", cfg="bpass5")] +#[rustc_clean(except="owner,predicates_of", cfg="bpass5")] #[rustc_clean(cfg="bpass6")] trait TraitAddSecondLifetimeBoundToTypeParameterOfTraitWhere<'a, 'b, T> where T: 'a + 'b { } @@ -1265,9 +1265,9 @@ trait TraitAddSecondLifetimeBoundToTypeParameterOfTraitWhere<'a, 'b, T> where T: trait TraitAddSecondLifetimeBoundToLifetimeParameterOfTraitWhere<'a, 'b, 'c> where 'a: 'b { } #[cfg(not(any(bpass1,bpass4)))] -#[rustc_clean(except="opt_hir_owner_nodes,predicates_of", cfg="bpass2")] +#[rustc_clean(except="owner,predicates_of", cfg="bpass2")] #[rustc_clean(cfg="bpass3")] -#[rustc_clean(except="opt_hir_owner_nodes,predicates_of", cfg="bpass5")] +#[rustc_clean(except="owner,predicates_of", cfg="bpass5")] #[rustc_clean(cfg="bpass6")] trait TraitAddSecondLifetimeBoundToLifetimeParameterOfTraitWhere<'a, 'b, 'c> where 'a: 'b + 'c { } @@ -1278,9 +1278,9 @@ trait TraitAddSecondLifetimeBoundToLifetimeParameterOfTraitWhere<'a, 'b, 'c> whe trait TraitAddSecondBuiltinBoundToTypeParameterOfTraitWhere where T: Send { } #[cfg(not(any(bpass1,bpass4)))] -#[rustc_clean(except="opt_hir_owner_nodes,predicates_of", cfg="bpass2")] +#[rustc_clean(except="owner,predicates_of", cfg="bpass2")] #[rustc_clean(cfg="bpass3")] -#[rustc_clean(except="opt_hir_owner_nodes,predicates_of", cfg="bpass5")] +#[rustc_clean(except="owner,predicates_of", cfg="bpass5")] #[rustc_clean(cfg="bpass6")] trait TraitAddSecondBuiltinBoundToTypeParameterOfTraitWhere where T: Send + Sync { } @@ -1297,9 +1297,9 @@ mod change_return_type_of_method_indirectly_use { #[rustc_clean(cfg="bpass5")] #[rustc_clean(cfg="bpass6")] trait TraitChangeReturnType { - #[rustc_clean(except="opt_hir_owner_nodes,fn_sig", cfg="bpass2")] + #[rustc_clean(except="owner,fn_sig", cfg="bpass2")] #[rustc_clean(cfg="bpass3")] - #[rustc_clean(except="opt_hir_owner_nodes,fn_sig", cfg="bpass5")] + #[rustc_clean(except="owner,fn_sig", cfg="bpass5")] #[rustc_clean(cfg="bpass6")] fn method() -> ReturnType; } @@ -1319,9 +1319,9 @@ mod change_method_parameter_type_indirectly_by_use { #[rustc_clean(cfg="bpass5")] #[rustc_clean(cfg="bpass6")] trait TraitChangeArgType { - #[rustc_clean(except="opt_hir_owner_nodes,fn_sig", cfg="bpass2")] + #[rustc_clean(except="owner,fn_sig", cfg="bpass2")] #[rustc_clean(cfg="bpass3")] - #[rustc_clean(except="opt_hir_owner_nodes,fn_sig", cfg="bpass5")] + #[rustc_clean(except="owner,fn_sig", cfg="bpass5")] #[rustc_clean(cfg="bpass6")] fn method(a: ArgType); } @@ -1341,9 +1341,9 @@ mod change_method_parameter_type_bound_indirectly_by_use { #[rustc_clean(cfg="bpass5")] #[rustc_clean(cfg="bpass6")] trait TraitChangeBoundOfMethodTypeParameter { - #[rustc_clean(except="opt_hir_owner_nodes,predicates_of", cfg="bpass2")] + #[rustc_clean(except="owner,predicates_of", cfg="bpass2")] #[rustc_clean(cfg="bpass3")] - #[rustc_clean(except="opt_hir_owner_nodes,predicates_of", cfg="bpass5")] + #[rustc_clean(except="owner,predicates_of", cfg="bpass5")] #[rustc_clean(cfg="bpass6")] fn method(a: T); } @@ -1364,9 +1364,9 @@ mod change_method_parameter_type_bound_indirectly_by_use_where { #[rustc_clean(cfg="bpass5")] #[rustc_clean(cfg="bpass6")] trait TraitChangeBoundOfMethodTypeParameterWhere { - #[rustc_clean(except="opt_hir_owner_nodes,predicates_of", cfg="bpass2")] + #[rustc_clean(except="owner,predicates_of", cfg="bpass2")] #[rustc_clean(cfg="bpass3")] - #[rustc_clean(except="opt_hir_owner_nodes,predicates_of", cfg="bpass5")] + #[rustc_clean(except="owner,predicates_of", cfg="bpass5")] #[rustc_clean(cfg="bpass6")] fn method(a: T) where T: Bound; } @@ -1381,9 +1381,9 @@ mod change_method_type_parameter_bound_indirectly { #[cfg(not(any(bpass1,bpass4)))] use super::ReferencedTrait1 as Bound; - #[rustc_clean(except="opt_hir_owner_nodes,predicates_of", cfg="bpass2")] + #[rustc_clean(except="owner,predicates_of", cfg="bpass2")] #[rustc_clean(cfg="bpass3")] - #[rustc_clean(except="opt_hir_owner_nodes,predicates_of", cfg="bpass5")] + #[rustc_clean(except="owner,predicates_of", cfg="bpass5")] #[rustc_clean(cfg="bpass6")] trait TraitChangeTraitBound { fn method(a: T); @@ -1400,9 +1400,9 @@ mod change_method_type_parameter_bound_indirectly_where { #[cfg(not(any(bpass1,bpass4)))] use super::ReferencedTrait1 as Bound; - #[rustc_clean(except="opt_hir_owner_nodes,predicates_of", cfg="bpass2")] + #[rustc_clean(except="owner,predicates_of", cfg="bpass2")] #[rustc_clean(cfg="bpass3")] - #[rustc_clean(except="opt_hir_owner_nodes,predicates_of", cfg="bpass5")] + #[rustc_clean(except="owner,predicates_of", cfg="bpass5")] #[rustc_clean(cfg="bpass6")] trait TraitChangeTraitBoundWhere where T: Bound { fn method(a: T); diff --git a/tests/incremental/hashes/trait_impls.rs b/tests/incremental/hashes/trait_impls.rs index 4593507d281f0..630b4fe8a08fc 100644 --- a/tests/incremental/hashes/trait_impls.rs +++ b/tests/incremental/hashes/trait_impls.rs @@ -16,42 +16,42 @@ #![allow(warnings)] #![feature(rustc_attrs)] #![feature(specialization)] -#![crate_type="rlib"] +#![crate_type = "rlib"] struct Foo; // Change Method Name ----------------------------------------------------------- -#[cfg(any(bpass1,bpass4))] +#[cfg(any(bpass1, bpass4))] pub trait ChangeMethodNameTrait { fn method_name(); } -#[cfg(any(bpass1,bpass4))] +#[cfg(any(bpass1, bpass4))] impl ChangeMethodNameTrait for Foo { - fn method_name() { } + fn method_name() {} } -#[cfg(not(any(bpass1,bpass4)))] -#[rustc_clean(except="opt_hir_owner_nodes,associated_item_def_ids", cfg="bpass2")] -#[rustc_clean(cfg="bpass3")] -#[rustc_clean(except="opt_hir_owner_nodes,associated_item_def_ids,predicates_of", cfg="bpass5")] -#[rustc_clean(cfg="bpass6")] +#[cfg(not(any(bpass1, bpass4)))] +#[rustc_clean(except = "owner,associated_item_def_ids", cfg = "bpass2")] +#[rustc_clean(cfg = "bpass3")] +#[rustc_clean(except = "owner,associated_item_def_ids,predicates_of", cfg = "bpass5")] +#[rustc_clean(cfg = "bpass6")] pub trait ChangeMethodNameTrait { - #[rustc_clean(cfg="bpass3")] - #[rustc_clean(cfg="bpass6")] + #[rustc_clean(cfg = "bpass3")] + #[rustc_clean(cfg = "bpass6")] fn method_name2(); } -#[cfg(not(any(bpass1,bpass4)))] -#[rustc_clean(except="opt_hir_owner_nodes,associated_item_def_ids", cfg="bpass2")] -#[rustc_clean(cfg="bpass3")] -#[rustc_clean(except="opt_hir_owner_nodes,associated_item_def_ids", cfg="bpass5")] -#[rustc_clean(cfg="bpass6")] +#[cfg(not(any(bpass1, bpass4)))] +#[rustc_clean(except = "owner,associated_item_def_ids", cfg = "bpass2")] +#[rustc_clean(cfg = "bpass3")] +#[rustc_clean(except = "owner,associated_item_def_ids", cfg = "bpass5")] +#[rustc_clean(cfg = "bpass6")] impl ChangeMethodNameTrait for Foo { - #[rustc_clean(cfg="bpass3")] - #[rustc_clean(cfg="bpass6")] - fn method_name2() { } + #[rustc_clean(cfg = "bpass3")] + #[rustc_clean(cfg = "bpass6")] + fn method_name2() {} } // Change Method Body ----------------------------------------------------------- @@ -62,7 +62,7 @@ pub trait ChangeMethodBodyTrait { fn method_name(); } -#[cfg(any(bpass1,bpass4))] +#[cfg(any(bpass1, bpass4))] impl ChangeMethodBodyTrait for Foo { // -------------------------------------------------------------- // ------------------------- @@ -73,16 +73,16 @@ impl ChangeMethodBodyTrait for Foo { } } -#[cfg(not(any(bpass1,bpass4)))] -#[rustc_clean(cfg="bpass2")] -#[rustc_clean(cfg="bpass3")] -#[rustc_clean(except="opt_hir_owner_nodes", cfg="bpass5")] -#[rustc_clean(cfg="bpass6")] +#[cfg(not(any(bpass1, bpass4)))] +#[rustc_clean(cfg = "bpass2", except = "owner")] +#[rustc_clean(cfg = "bpass3")] +#[rustc_clean(except = "owner", cfg = "bpass5")] +#[rustc_clean(cfg = "bpass6")] impl ChangeMethodBodyTrait for Foo { - #[rustc_clean(except="opt_hir_owner_nodes,typeck_root", cfg="bpass2")] - #[rustc_clean(cfg="bpass3")] - #[rustc_clean(except="opt_hir_owner_nodes,typeck_root", cfg="bpass5")] - #[rustc_clean(cfg="bpass6")] + #[rustc_clean(except = "owner,typeck_root", cfg = "bpass2")] + #[rustc_clean(cfg = "bpass3")] + #[rustc_clean(except = "owner,typeck_root", cfg = "bpass5")] + #[rustc_clean(cfg = "bpass6")] fn method_name() { () } @@ -96,7 +96,7 @@ pub trait ChangeMethodBodyTraitInlined { fn method_name(); } -#[cfg(any(bpass1,bpass4))] +#[cfg(any(bpass1, bpass4))] impl ChangeMethodBodyTraitInlined for Foo { // ---------------------------------------------------------------------------- // ------------------------- @@ -108,16 +108,16 @@ impl ChangeMethodBodyTraitInlined for Foo { } } -#[cfg(not(any(bpass1,bpass4)))] -#[rustc_clean(cfg="bpass2")] -#[rustc_clean(cfg="bpass3")] -#[rustc_clean(except="opt_hir_owner_nodes", cfg="bpass5")] -#[rustc_clean(cfg="bpass6")] +#[cfg(not(any(bpass1, bpass4)))] +#[rustc_clean(cfg = "bpass2", except = "owner")] +#[rustc_clean(cfg = "bpass3")] +#[rustc_clean(except = "owner", cfg = "bpass5")] +#[rustc_clean(cfg = "bpass6")] impl ChangeMethodBodyTraitInlined for Foo { - #[rustc_clean(except="opt_hir_owner_nodes,typeck_root,optimized_mir", cfg="bpass2")] - #[rustc_clean(cfg="bpass3")] - #[rustc_clean(except="opt_hir_owner_nodes,typeck_root,optimized_mir", cfg="bpass5")] - #[rustc_clean(cfg="bpass6")] + #[rustc_clean(except = "owner,typeck_root,optimized_mir", cfg = "bpass2")] + #[rustc_clean(cfg = "bpass3")] + #[rustc_clean(except = "owner,typeck_root,optimized_mir", cfg = "bpass5")] + #[rustc_clean(cfg = "bpass6")] #[inline] fn method_name() { panic!() @@ -126,37 +126,37 @@ impl ChangeMethodBodyTraitInlined for Foo { // Change Method Selfness ------------------------------------------------------ -#[cfg(any(bpass1,bpass4))] +#[cfg(any(bpass1, bpass4))] pub trait ChangeMethodSelfnessTrait { fn method_name(); } -#[cfg(any(bpass1,bpass4))] +#[cfg(any(bpass1, bpass4))] impl ChangeMethodSelfnessTrait for Foo { - fn method_name() { } + fn method_name() {} } -#[cfg(not(any(bpass1,bpass4)))] +#[cfg(not(any(bpass1, bpass4)))] pub trait ChangeMethodSelfnessTrait { fn method_name(&self); } -#[cfg(not(any(bpass1,bpass4)))] -#[rustc_clean(cfg="bpass2")] -#[rustc_clean(cfg="bpass3")] -#[rustc_clean(except="opt_hir_owner_nodes", cfg="bpass5")] -#[rustc_clean(cfg="bpass6")] +#[cfg(not(any(bpass1, bpass4)))] +#[rustc_clean(cfg = "bpass2", except = "owner")] +#[rustc_clean(cfg = "bpass3")] +#[rustc_clean(except = "owner", cfg = "bpass5")] +#[rustc_clean(cfg = "bpass6")] impl ChangeMethodSelfnessTrait for Foo { #[rustc_clean( - except="opt_hir_owner_nodes,associated_item,generics_of,fn_sig,typeck_root,optimized_mir", - cfg="bpass2", + except = "owner,associated_item,generics_of,fn_sig,typeck_root,optimized_mir", + cfg = "bpass2" )] - #[rustc_clean(cfg="bpass3")] + #[rustc_clean(cfg = "bpass3")] #[rustc_clean( - except="opt_hir_owner_nodes,associated_item,generics_of,fn_sig,typeck_root,optimized_mir", - cfg="bpass5", + except = "owner,associated_item,generics_of,fn_sig,typeck_root,optimized_mir", + cfg = "bpass5" )] - #[rustc_clean(cfg="bpass6")] + #[rustc_clean(cfg = "bpass6")] fn method_name(&self) { () } @@ -164,192 +164,192 @@ impl ChangeMethodSelfnessTrait for Foo { // Change Method Selfness ----------------------------------------------------------- -#[cfg(any(bpass1,bpass4))] +#[cfg(any(bpass1, bpass4))] pub trait RemoveMethodSelfnessTrait { fn method_name(&self); } -#[cfg(any(bpass1,bpass4))] +#[cfg(any(bpass1, bpass4))] impl RemoveMethodSelfnessTrait for Foo { - fn method_name(&self) { } + fn method_name(&self) {} } -#[cfg(not(any(bpass1,bpass4)))] +#[cfg(not(any(bpass1, bpass4)))] pub trait RemoveMethodSelfnessTrait { fn method_name(); } -#[cfg(not(any(bpass1,bpass4)))] -#[rustc_clean(cfg="bpass2")] -#[rustc_clean(cfg="bpass3")] -#[rustc_clean(except="opt_hir_owner_nodes", cfg="bpass5")] -#[rustc_clean(cfg="bpass6")] +#[cfg(not(any(bpass1, bpass4)))] +#[rustc_clean(cfg = "bpass2", except = "owner")] +#[rustc_clean(cfg = "bpass3")] +#[rustc_clean(except = "owner", cfg = "bpass5")] +#[rustc_clean(cfg = "bpass6")] impl RemoveMethodSelfnessTrait for Foo { #[rustc_clean( - except="opt_hir_owner_nodes,associated_item,generics_of,fn_sig,typeck_root,optimized_mir", - cfg="bpass2", + except = "owner,associated_item,generics_of,fn_sig,typeck_root,optimized_mir", + cfg = "bpass2" )] - #[rustc_clean(cfg="bpass3")] + #[rustc_clean(cfg = "bpass3")] #[rustc_clean( - except="opt_hir_owner_nodes,associated_item,generics_of,fn_sig,typeck_root,optimized_mir", - cfg="bpass5", + except = "owner,associated_item,generics_of,fn_sig,typeck_root,optimized_mir", + cfg = "bpass5" )] - #[rustc_clean(cfg="bpass6")] + #[rustc_clean(cfg = "bpass6")] fn method_name() {} } // Change Method Selfmutness ----------------------------------------------------------- -#[cfg(any(bpass1,bpass4))] +#[cfg(any(bpass1, bpass4))] pub trait ChangeMethodSelfmutnessTrait { fn method_name(&self); } -#[cfg(any(bpass1,bpass4))] +#[cfg(any(bpass1, bpass4))] impl ChangeMethodSelfmutnessTrait for Foo { // ----------------------------------------------------------------------------------- // ------------------------- // ----------------------------------------------------------------------------------- // ------------------------- - fn method_name(& self) {} + fn method_name(&self) {} } -#[cfg(not(any(bpass1,bpass4)))] +#[cfg(not(any(bpass1, bpass4)))] pub trait ChangeMethodSelfmutnessTrait { fn method_name(&mut self); } -#[cfg(not(any(bpass1,bpass4)))] -#[rustc_clean(cfg="bpass2")] -#[rustc_clean(cfg="bpass3")] -#[rustc_clean(except="opt_hir_owner_nodes", cfg="bpass5")] -#[rustc_clean(cfg="bpass6")] +#[cfg(not(any(bpass1, bpass4)))] +#[rustc_clean(cfg = "bpass2", except = "owner")] +#[rustc_clean(cfg = "bpass3")] +#[rustc_clean(except = "owner", cfg = "bpass5")] +#[rustc_clean(cfg = "bpass6")] impl ChangeMethodSelfmutnessTrait for Foo { - #[rustc_clean(except="opt_hir_owner_nodes,fn_sig,typeck_root,optimized_mir", cfg="bpass2")] - #[rustc_clean(cfg="bpass3")] - #[rustc_clean(except="opt_hir_owner_nodes,fn_sig,typeck_root,optimized_mir", cfg="bpass5")] - #[rustc_clean(cfg="bpass6")] + #[rustc_clean(except = "owner,fn_sig,typeck_root,optimized_mir", cfg = "bpass2")] + #[rustc_clean(cfg = "bpass3")] + #[rustc_clean(except = "owner,fn_sig,typeck_root,optimized_mir", cfg = "bpass5")] + #[rustc_clean(cfg = "bpass6")] fn method_name(&mut self) {} } // Change item kind ----------------------------------------------------------- -#[cfg(any(bpass1,bpass4))] +#[cfg(any(bpass1, bpass4))] pub trait ChangeItemKindTrait { fn name(); } -#[cfg(any(bpass1,bpass4))] +#[cfg(any(bpass1, bpass4))] impl ChangeItemKindTrait for Foo { - fn name() { } + fn name() {} } -#[cfg(not(any(bpass1,bpass4)))] +#[cfg(not(any(bpass1, bpass4)))] pub trait ChangeItemKindTrait { type name; } -#[cfg(not(any(bpass1,bpass4)))] -#[rustc_clean(except="opt_hir_owner_nodes,associated_item_def_ids", cfg="bpass2")] -#[rustc_clean(cfg="bpass3")] -#[rustc_clean(except="opt_hir_owner_nodes,associated_item_def_ids", cfg="bpass5")] -#[rustc_clean(cfg="bpass6")] +#[cfg(not(any(bpass1, bpass4)))] +#[rustc_clean(except = "owner,associated_item_def_ids", cfg = "bpass2")] +#[rustc_clean(cfg = "bpass3")] +#[rustc_clean(except = "owner,associated_item_def_ids", cfg = "bpass5")] +#[rustc_clean(cfg = "bpass6")] impl ChangeItemKindTrait for Foo { type name = (); } // Remove item ----------------------------------------------------------- -#[cfg(any(bpass1,bpass4))] +#[cfg(any(bpass1, bpass4))] pub trait RemoveItemTrait { type TypeName; fn method_name(); } -#[cfg(any(bpass1,bpass4))] +#[cfg(any(bpass1, bpass4))] impl RemoveItemTrait for Foo { type TypeName = (); - fn method_name() { } + fn method_name() {} } -#[cfg(not(any(bpass1,bpass4)))] +#[cfg(not(any(bpass1, bpass4)))] pub trait RemoveItemTrait { type TypeName; } -#[cfg(not(any(bpass1,bpass4)))] -#[rustc_clean(except="opt_hir_owner_nodes,associated_item_def_ids", cfg="bpass2")] -#[rustc_clean(cfg="bpass3")] -#[rustc_clean(except="opt_hir_owner_nodes,associated_item_def_ids", cfg="bpass5")] -#[rustc_clean(cfg="bpass6")] +#[cfg(not(any(bpass1, bpass4)))] +#[rustc_clean(except = "owner,associated_item_def_ids", cfg = "bpass2")] +#[rustc_clean(cfg = "bpass3")] +#[rustc_clean(except = "owner,associated_item_def_ids", cfg = "bpass5")] +#[rustc_clean(cfg = "bpass6")] impl RemoveItemTrait for Foo { type TypeName = (); } // Add item ----------------------------------------------------------- -#[cfg(any(bpass1,bpass4))] +#[cfg(any(bpass1, bpass4))] pub trait AddItemTrait { type TypeName; } -#[cfg(any(bpass1,bpass4))] +#[cfg(any(bpass1, bpass4))] impl AddItemTrait for Foo { type TypeName = (); } -#[cfg(not(any(bpass1,bpass4)))] +#[cfg(not(any(bpass1, bpass4)))] pub trait AddItemTrait { type TypeName; fn method_name(); } -#[cfg(not(any(bpass1,bpass4)))] -#[rustc_clean(except="opt_hir_owner_nodes,associated_item_def_ids", cfg="bpass2")] -#[rustc_clean(cfg="bpass3")] -#[rustc_clean(except="opt_hir_owner_nodes,associated_item_def_ids", cfg="bpass5")] -#[rustc_clean(cfg="bpass6")] +#[cfg(not(any(bpass1, bpass4)))] +#[rustc_clean(except = "owner,associated_item_def_ids", cfg = "bpass2")] +#[rustc_clean(cfg = "bpass3")] +#[rustc_clean(except = "owner,associated_item_def_ids", cfg = "bpass5")] +#[rustc_clean(cfg = "bpass6")] impl AddItemTrait for Foo { type TypeName = (); - fn method_name() { } + fn method_name() {} } // Change has-value ----------------------------------------------------------- -#[cfg(any(bpass1,bpass4))] +#[cfg(any(bpass1, bpass4))] pub trait ChangeHasValueTrait { //-------------------------------------------------------- //-------------------------- //-------------------------------------------------------- //-------------------------- - fn method_name() ; + fn method_name(); } -#[cfg(any(bpass1,bpass4))] +#[cfg(any(bpass1, bpass4))] impl ChangeHasValueTrait for Foo { - fn method_name() { } + fn method_name() {} } -#[cfg(not(any(bpass1,bpass4)))] -#[rustc_clean(cfg="bpass2")] -#[rustc_clean(cfg="bpass3")] -#[rustc_clean(cfg="bpass5")] -#[rustc_clean(cfg="bpass6")] +#[cfg(not(any(bpass1, bpass4)))] +#[rustc_clean(cfg = "bpass2", except = "owner")] +#[rustc_clean(cfg = "bpass3")] +#[rustc_clean(cfg = "bpass5", except = "owner,predicates_of")] +#[rustc_clean(cfg = "bpass6")] pub trait ChangeHasValueTrait { - #[rustc_clean(except="opt_hir_owner_nodes", cfg="bpass2")] - #[rustc_clean(cfg="bpass3")] - #[rustc_clean(except="opt_hir_owner_nodes", cfg="bpass5")] - #[rustc_clean(cfg="bpass6")] - fn method_name() { } -} - -#[cfg(not(any(bpass1,bpass4)))] -#[rustc_clean(cfg="bpass2")] -#[rustc_clean(cfg="bpass3")] -#[rustc_clean(cfg="bpass5")] -#[rustc_clean(cfg="bpass6")] + #[rustc_clean(except = "owner", cfg = "bpass2")] + #[rustc_clean(cfg = "bpass3")] + #[rustc_clean(except = "owner", cfg = "bpass5")] + #[rustc_clean(cfg = "bpass6")] + fn method_name() {} +} + +#[cfg(not(any(bpass1, bpass4)))] +#[rustc_clean(cfg = "bpass2", except = "owner")] +#[rustc_clean(cfg = "bpass3")] +#[rustc_clean(cfg = "bpass5", except = "owner")] +#[rustc_clean(cfg = "bpass6")] impl ChangeHasValueTrait for Foo { - fn method_name() { } + fn method_name() {} } // Add default @@ -358,98 +358,96 @@ pub trait AddDefaultTrait { fn method_name(); } -#[cfg(any(bpass1,bpass4))] +#[cfg(any(bpass1, bpass4))] impl AddDefaultTrait for Foo { // ------------------------------------------------------- // ------------------------- // ------------------------------------------------------- // ------------------------- - fn method_name() { } + fn method_name() {} } -#[cfg(not(any(bpass1,bpass4)))] -#[rustc_clean(cfg="bpass2")] -#[rustc_clean(cfg="bpass3")] -#[rustc_clean(cfg="bpass5")] -#[rustc_clean(cfg="bpass6")] +#[cfg(not(any(bpass1, bpass4)))] +#[rustc_clean(cfg = "bpass2", except = "owner")] +#[rustc_clean(cfg = "bpass3")] +#[rustc_clean(cfg = "bpass5", except = "owner")] +#[rustc_clean(cfg = "bpass6")] impl AddDefaultTrait for Foo { - #[rustc_clean(except="opt_hir_owner_nodes", cfg="bpass2")] - #[rustc_clean(cfg="bpass3")] - #[rustc_clean(except="opt_hir_owner_nodes", cfg="bpass5")] - #[rustc_clean(cfg="bpass6")] - default fn method_name() { } + #[rustc_clean(except = "owner", cfg = "bpass2")] + #[rustc_clean(cfg = "bpass3")] + #[rustc_clean(except = "owner,optimized_mir ", cfg = "bpass5")] + #[rustc_clean(cfg = "bpass6")] + default fn method_name() {} } // Add arguments -#[cfg(any(bpass1,bpass4))] +#[cfg(any(bpass1, bpass4))] pub trait AddArgumentTrait { fn method_name(&self); } -#[cfg(any(bpass1,bpass4))] +#[cfg(any(bpass1, bpass4))] impl AddArgumentTrait for Foo { // ----------------------------------------------------------------------------------- // ------------------------- // ----------------------------------------------------------------------------------- // ------------------------- - fn method_name(&self ) { } + fn method_name(&self) {} } -#[cfg(not(any(bpass1,bpass4)))] +#[cfg(not(any(bpass1, bpass4)))] pub trait AddArgumentTrait { fn method_name(&self, x: u32); } -#[cfg(not(any(bpass1,bpass4)))] -#[rustc_clean(cfg="bpass2")] -#[rustc_clean(cfg="bpass3")] -#[rustc_clean(except="opt_hir_owner_nodes", cfg="bpass5")] -#[rustc_clean(cfg="bpass6")] +#[cfg(not(any(bpass1, bpass4)))] +#[rustc_clean(cfg = "bpass2", except = "owner")] +#[rustc_clean(cfg = "bpass3")] +#[rustc_clean(except = "owner", cfg = "bpass5")] +#[rustc_clean(cfg = "bpass6")] impl AddArgumentTrait for Foo { - #[rustc_clean(except="opt_hir_owner_nodes,fn_sig,typeck_root,optimized_mir", cfg="bpass2")] - #[rustc_clean(cfg="bpass3")] - #[rustc_clean(except="opt_hir_owner_nodes,fn_sig,typeck_root,optimized_mir", cfg="bpass5")] - #[rustc_clean(cfg="bpass6")] - fn method_name(&self, _x: u32) { } + #[rustc_clean(except = "owner,fn_sig,typeck_root,optimized_mir", cfg = "bpass2")] + #[rustc_clean(cfg = "bpass3")] + #[rustc_clean(except = "owner,fn_sig,typeck_root,optimized_mir", cfg = "bpass5")] + #[rustc_clean(cfg = "bpass6")] + fn method_name(&self, _x: u32) {} } // Change argument type -#[cfg(any(bpass1,bpass4))] +#[cfg(any(bpass1, bpass4))] pub trait ChangeArgumentTypeTrait { fn method_name(&self, x: u32); } -#[cfg(any(bpass1,bpass4))] +#[cfg(any(bpass1, bpass4))] impl ChangeArgumentTypeTrait for Foo { // ----------------------------------------------------------------------------------- // ------------------------- // ----------------------------------------------------------------------------------- // ------------------------- - fn method_name(&self, _x: u32 ) { } + fn method_name(&self, _x: u32) {} } -#[cfg(not(any(bpass1,bpass4)))] +#[cfg(not(any(bpass1, bpass4)))] pub trait ChangeArgumentTypeTrait { fn method_name(&self, x: char); } -#[cfg(not(any(bpass1,bpass4)))] -#[rustc_clean(cfg="bpass2")] -#[rustc_clean(cfg="bpass3")] -#[rustc_clean(except="opt_hir_owner_nodes", cfg="bpass5")] -#[rustc_clean(cfg="bpass6")] +#[cfg(not(any(bpass1, bpass4)))] +#[rustc_clean(cfg = "bpass2", except = "owner")] +#[rustc_clean(cfg = "bpass3")] +#[rustc_clean(except = "owner", cfg = "bpass5")] +#[rustc_clean(cfg = "bpass6")] impl ChangeArgumentTypeTrait for Foo { - #[rustc_clean(except="opt_hir_owner_nodes,fn_sig,typeck_root,optimized_mir", cfg="bpass2")] - #[rustc_clean(cfg="bpass3")] - #[rustc_clean(except="opt_hir_owner_nodes,fn_sig,typeck_root,optimized_mir", cfg="bpass5")] - #[rustc_clean(cfg="bpass6")] - fn method_name(&self, _x: char) { } + #[rustc_clean(except = "owner,fn_sig,typeck_root,optimized_mir", cfg = "bpass2")] + #[rustc_clean(cfg = "bpass3")] + #[rustc_clean(except = "owner,fn_sig,typeck_root,optimized_mir", cfg = "bpass5")] + #[rustc_clean(cfg = "bpass6")] + fn method_name(&self, _x: char) {} } - - struct Bar(T); // Add Type Parameter To Impl -------------------------------------------------- @@ -457,162 +455,175 @@ trait AddTypeParameterToImpl { fn id(t: T) -> T; } -#[cfg(any(bpass1,bpass4))] +#[cfg(any(bpass1, bpass4))] impl AddTypeParameterToImpl for Bar { - fn id(t: u32) -> u32 { t } + fn id(t: u32) -> u32 { + t + } } -#[cfg(not(any(bpass1,bpass4)))] -#[rustc_clean(except="opt_hir_owner_nodes,generics_of,impl_trait_header", cfg="bpass2")] -#[rustc_clean(cfg="bpass3")] -#[rustc_clean(except="opt_hir_owner_nodes,generics_of,impl_trait_header", cfg="bpass5")] -#[rustc_clean(cfg="bpass6")] +#[cfg(not(any(bpass1, bpass4)))] +#[rustc_clean(except = "owner,generics_of,impl_trait_header", cfg = "bpass2")] +#[rustc_clean(cfg = "bpass3")] +#[rustc_clean(except = "owner,generics_of,impl_trait_header", cfg = "bpass5")] +#[rustc_clean(cfg = "bpass6")] impl AddTypeParameterToImpl for Bar { #[rustc_clean( - except="opt_hir_owner_nodes,generics_of,fn_sig,type_of,typeck_root,optimized_mir", - cfg="bpass2", + except = "owner,generics_of,fn_sig,type_of,typeck_root,optimized_mir", + cfg = "bpass2" )] - #[rustc_clean(cfg="bpass3")] + #[rustc_clean(cfg = "bpass3")] #[rustc_clean( - except="opt_hir_owner_nodes,generics_of,fn_sig,type_of,typeck_root,optimized_mir", - cfg="bpass5", + except = "owner,generics_of,fn_sig,type_of,typeck_root,optimized_mir", + cfg = "bpass5" )] - #[rustc_clean(cfg="bpass6")] - fn id(t: TTT) -> TTT { t } + #[rustc_clean(cfg = "bpass6")] + fn id(t: TTT) -> TTT { + t + } } - - // Change Self Type of Impl ---------------------------------------------------- trait ChangeSelfTypeOfImpl { fn id(self) -> Self; } -#[cfg(any(bpass1,bpass4))] +#[cfg(any(bpass1, bpass4))] impl ChangeSelfTypeOfImpl for u32 { - fn id(self) -> Self { self } + fn id(self) -> Self { + self + } } -#[cfg(not(any(bpass1,bpass4)))] -#[rustc_clean(except="opt_hir_owner_nodes,impl_trait_header", cfg="bpass2")] -#[rustc_clean(cfg="bpass3")] -#[rustc_clean(except="opt_hir_owner_nodes,impl_trait_header", cfg="bpass5")] -#[rustc_clean(cfg="bpass6")] +#[cfg(not(any(bpass1, bpass4)))] +#[rustc_clean(except = "owner,impl_trait_header", cfg = "bpass2")] +#[rustc_clean(cfg = "bpass3")] +#[rustc_clean(except = "owner,impl_trait_header", cfg = "bpass5")] +#[rustc_clean(cfg = "bpass6")] impl ChangeSelfTypeOfImpl for u64 { - #[rustc_clean(except="fn_sig,typeck_root,optimized_mir", cfg="bpass2")] - #[rustc_clean(cfg="bpass3")] - #[rustc_clean(except="fn_sig,typeck_root,optimized_mir", cfg="bpass5")] - #[rustc_clean(cfg="bpass6")] - fn id(self) -> Self { self } + #[rustc_clean(except = "fn_sig,typeck_root,optimized_mir,owner", cfg = "bpass2")] + #[rustc_clean(cfg = "bpass3")] + #[rustc_clean(except = "fn_sig,typeck_root,optimized_mir,owner", cfg = "bpass5")] + #[rustc_clean(cfg = "bpass6")] + fn id(self) -> Self { + self + } } - - // Add Lifetime Bound to Impl -------------------------------------------------- trait AddLifetimeBoundToImplParameter { fn id(self) -> Self; } -#[cfg(any(bpass1,bpass4))] +#[cfg(any(bpass1, bpass4))] impl AddLifetimeBoundToImplParameter for T { - fn id(self) -> Self { self } + fn id(self) -> Self { + self + } } -#[cfg(not(any(bpass1,bpass4)))] -#[rustc_clean(except="opt_hir_owner_nodes", cfg="bpass2")] -#[rustc_clean(cfg="bpass3")] -#[rustc_clean(except="opt_hir_owner_nodes", cfg="bpass5")] -#[rustc_clean(cfg="bpass6")] +#[cfg(not(any(bpass1, bpass4)))] +#[rustc_clean(except = "owner", cfg = "bpass2")] +#[rustc_clean(cfg = "bpass3")] +#[rustc_clean(except = "owner", cfg = "bpass5")] +#[rustc_clean(cfg = "bpass6")] impl AddLifetimeBoundToImplParameter for T { - #[rustc_clean(cfg="bpass2")] - #[rustc_clean(cfg="bpass3")] - #[rustc_clean(cfg="bpass5")] - #[rustc_clean(cfg="bpass6")] - fn id(self) -> Self { self } + #[rustc_clean(cfg = "bpass2", except = "owner")] + #[rustc_clean(cfg = "bpass3")] + #[rustc_clean(cfg = "bpass5", except = "owner")] + #[rustc_clean(cfg = "bpass6")] + fn id(self) -> Self { + self + } } - - // Add Trait Bound to Impl Parameter ------------------------------------------- trait AddTraitBoundToImplParameter { fn id(self) -> Self; } -#[cfg(any(bpass1,bpass4))] +#[cfg(any(bpass1, bpass4))] impl AddTraitBoundToImplParameter for T { - fn id(self) -> Self { self } + fn id(self) -> Self { + self + } } -#[cfg(not(any(bpass1,bpass4)))] -#[rustc_clean(except="opt_hir_owner_nodes", cfg="bpass2")] -#[rustc_clean(cfg="bpass3")] -#[rustc_clean(except="opt_hir_owner_nodes", cfg="bpass5")] -#[rustc_clean(cfg="bpass6")] +#[cfg(not(any(bpass1, bpass4)))] +#[rustc_clean(except = "owner", cfg = "bpass2")] +#[rustc_clean(cfg = "bpass3")] +#[rustc_clean(except = "owner", cfg = "bpass5")] +#[rustc_clean(cfg = "bpass6")] impl AddTraitBoundToImplParameter for T { - #[rustc_clean(cfg="bpass2")] - #[rustc_clean(cfg="bpass3")] - #[rustc_clean(cfg="bpass5")] - #[rustc_clean(cfg="bpass6")] - fn id(self) -> Self { self } + #[rustc_clean(cfg = "bpass2", except = "owner")] + #[rustc_clean(cfg = "bpass3")] + #[rustc_clean(cfg = "bpass5", except = "owner")] + #[rustc_clean(cfg = "bpass6")] + fn id(self) -> Self { + self + } } - - // Add #[no_mangle] to Method -------------------------------------------------- trait AddNoMangleToMethod { - fn add_no_mangle_to_method(&self) { } + fn add_no_mangle_to_method(&self) {} } -#[cfg(any(bpass1,bpass4))] +#[cfg(any(bpass1, bpass4))] impl AddNoMangleToMethod for Foo { // ------------------------- // ------------------------- // ------------------------- // ------------------------- // ----------------- - fn add_no_mangle_to_method(&self) { } + fn add_no_mangle_to_method(&self) {} } -#[cfg(not(any(bpass1,bpass4)))] -#[rustc_clean(cfg="bpass2")] -#[rustc_clean(cfg="bpass3")] -#[rustc_clean(cfg="bpass5")] -#[rustc_clean(cfg="bpass6")] +#[cfg(not(any(bpass1, bpass4)))] +#[rustc_clean(cfg = "bpass2", except = "owner")] +#[rustc_clean(cfg = "bpass3")] +#[rustc_clean(cfg = "bpass5", except = "owner")] +#[rustc_clean(cfg = "bpass6")] impl AddNoMangleToMethod for Foo { - #[rustc_clean(cfg="bpass2")] - #[rustc_clean(cfg="bpass3")] - #[rustc_clean(cfg="bpass5")] - #[rustc_clean(cfg="bpass6")] + #[rustc_clean(cfg = "bpass2", except = "owner")] + #[rustc_clean(cfg = "bpass3")] + #[rustc_clean(cfg = "bpass5", except = "owner")] + #[rustc_clean(cfg = "bpass6")] #[unsafe(no_mangle)] - fn add_no_mangle_to_method(&self) { } + fn add_no_mangle_to_method(&self) {} } - // Make Method #[inline] ------------------------------------------------------- trait MakeMethodInline { - fn make_method_inline(&self) -> u8 { 0 } + fn make_method_inline(&self) -> u8 { + 0 + } } -#[cfg(any(bpass1,bpass4))] +#[cfg(any(bpass1, bpass4))] impl MakeMethodInline for Foo { // ------------------------- // ------------------------- // ------------------------- // ------------------------- // ------ - fn make_method_inline(&self) -> u8 { 0 } + fn make_method_inline(&self) -> u8 { + 0 + } } -#[cfg(not(any(bpass1,bpass4)))] -#[rustc_clean(cfg="bpass2")] -#[rustc_clean(cfg="bpass3")] -#[rustc_clean(cfg="bpass5")] -#[rustc_clean(cfg="bpass6")] +#[cfg(not(any(bpass1, bpass4)))] +#[rustc_clean(cfg = "bpass2", except = "owner")] +#[rustc_clean(cfg = "bpass3")] +#[rustc_clean(cfg = "bpass5", except = "owner")] +#[rustc_clean(cfg = "bpass6")] impl MakeMethodInline for Foo { - #[rustc_clean(cfg="bpass2")] - #[rustc_clean(cfg="bpass3")] - #[rustc_clean(cfg="bpass5")] - #[rustc_clean(cfg="bpass6")] + #[rustc_clean(cfg = "bpass2", except = "owner")] + #[rustc_clean(cfg = "bpass3")] + #[rustc_clean(cfg = "bpass5", except = "owner")] + #[rustc_clean(cfg = "bpass6")] #[inline] - fn make_method_inline(&self) -> u8 { 0 } + fn make_method_inline(&self) -> u8 { + 0 + } } diff --git a/tests/incremental/hashes/type_defs.rs b/tests/incremental/hashes/type_defs.rs index a4b64f8cb5ce5..2160751795e7b 100644 --- a/tests/incremental/hashes/type_defs.rs +++ b/tests/incremental/hashes/type_defs.rs @@ -25,7 +25,7 @@ type ChangePrimitiveType = i32; #[cfg(not(bpass1))] -#[rustc_clean(cfg="bpass2", except="opt_hir_owner_nodes")] +#[rustc_clean(cfg="bpass2", except="owner")] #[rustc_clean(cfg="bpass3")] type ChangePrimitiveType = i64; @@ -36,7 +36,7 @@ type ChangePrimitiveType = i64; type ChangeMutability = &'static i32; #[cfg(not(bpass1))] -#[rustc_clean(cfg="bpass2", except="opt_hir_owner_nodes")] +#[rustc_clean(cfg="bpass2", except="owner")] #[rustc_clean(cfg="bpass3")] type ChangeMutability = &'static mut i32; @@ -47,7 +47,7 @@ type ChangeMutability = &'static mut i32; type ChangeLifetime<'a> = (&'static i32, &'a i32); #[cfg(not(bpass1))] -#[rustc_clean(cfg="bpass2", except="opt_hir_owner_nodes")] +#[rustc_clean(cfg="bpass2", except="owner")] #[rustc_clean(cfg="bpass3")] type ChangeLifetime<'a> = (&'a i32, &'a i32); @@ -61,7 +61,7 @@ struct Struct2; type ChangeTypeStruct = Struct1; #[cfg(not(bpass1))] -#[rustc_clean(cfg="bpass2", except="opt_hir_owner_nodes")] +#[rustc_clean(cfg="bpass2", except="owner")] #[rustc_clean(cfg="bpass3")] type ChangeTypeStruct = Struct2; @@ -72,7 +72,7 @@ type ChangeTypeStruct = Struct2; type ChangeTypeTuple = (u32, u64); #[cfg(not(bpass1))] -#[rustc_clean(cfg="bpass2", except="opt_hir_owner_nodes")] +#[rustc_clean(cfg="bpass2", except="owner")] #[rustc_clean(cfg="bpass3")] type ChangeTypeTuple = (u32, i64); @@ -92,7 +92,7 @@ enum Enum2 { type ChangeTypeEnum = Enum1; #[cfg(not(bpass1))] -#[rustc_clean(cfg="bpass2", except="opt_hir_owner_nodes")] +#[rustc_clean(cfg="bpass2", except="owner")] #[rustc_clean(cfg="bpass3")] type ChangeTypeEnum = Enum2; @@ -103,7 +103,7 @@ type ChangeTypeEnum = Enum2; type AddTupleField = (i32, i64); #[cfg(not(bpass1))] -#[rustc_clean(cfg="bpass2", except="opt_hir_owner_nodes")] +#[rustc_clean(cfg="bpass2", except="owner")] #[rustc_clean(cfg="bpass3")] type AddTupleField = (i32, i64, i16); @@ -114,7 +114,7 @@ type AddTupleField = (i32, i64, i16); type ChangeNestedTupleField = (i32, (i64, i16)); #[cfg(not(bpass1))] -#[rustc_clean(cfg="bpass2", except="opt_hir_owner_nodes")] +#[rustc_clean(cfg="bpass2", except="owner")] #[rustc_clean(cfg="bpass3")] type ChangeNestedTupleField = (i32, (i64, i8)); @@ -125,7 +125,7 @@ type ChangeNestedTupleField = (i32, (i64, i8)); type AddTypeParam = (T1, T1); #[cfg(not(bpass1))] -#[rustc_clean(cfg="bpass2", except="opt_hir_owner_nodes")] +#[rustc_clean(cfg="bpass2", except="owner")] #[rustc_clean(cfg="bpass3")] type AddTypeParam = (T1, T2); @@ -136,7 +136,7 @@ type AddTypeParam = (T1, T2); type AddTypeParamBound = (T1, u32); #[cfg(not(bpass1))] -#[rustc_clean(cfg="bpass2", except="opt_hir_owner_nodes")] +#[rustc_clean(cfg="bpass2", except="owner")] #[rustc_clean(cfg="bpass3")] type AddTypeParamBound = (T1, u32); @@ -147,7 +147,7 @@ type AddTypeParamBound = (T1, u32); type AddTypeParamBoundWhereClause where T1: Clone = (T1, u32); #[cfg(not(bpass1))] -#[rustc_clean(cfg="bpass2", except="opt_hir_owner_nodes")] +#[rustc_clean(cfg="bpass2", except="owner")] #[rustc_clean(cfg="bpass3")] type AddTypeParamBoundWhereClause where T1: Clone+Copy = (T1, u32); @@ -158,7 +158,7 @@ type AddTypeParamBoundWhereClause where T1: Clone+Copy = (T1, u32); type AddLifetimeParam<'a> = (&'a u32, &'a u32); #[cfg(not(bpass1))] -#[rustc_clean(cfg="bpass2", except="opt_hir_owner_nodes")] +#[rustc_clean(cfg="bpass2", except="owner")] #[rustc_clean(cfg="bpass3")] type AddLifetimeParam<'a, 'b> = (&'a u32, &'b u32); @@ -169,7 +169,7 @@ type AddLifetimeParam<'a, 'b> = (&'a u32, &'b u32); type AddLifetimeParamBound<'a, 'b> = (&'a u32, &'b u32); #[cfg(not(bpass1))] -#[rustc_clean(cfg="bpass2", except="opt_hir_owner_nodes")] +#[rustc_clean(cfg="bpass2", except="owner")] #[rustc_clean(cfg="bpass3")] type AddLifetimeParamBound<'a, 'b: 'a> = (&'a u32, &'b u32); @@ -182,7 +182,7 @@ where 'b: 'a = (&'a u32, &'b u32, &'c u32); #[cfg(not(bpass1))] -#[rustc_clean(cfg="bpass2", except="opt_hir_owner_nodes")] +#[rustc_clean(cfg="bpass2", except="owner")] #[rustc_clean(cfg="bpass3")] type AddLifetimeParamBoundWhereClause<'a, 'b, 'c> where 'b: 'a, @@ -201,7 +201,7 @@ mod change_trait_bound_indirectly { #[cfg(not(bpass1))] use super::ReferencedTrait2 as Trait; - #[rustc_clean(cfg="bpass2", except="opt_hir_owner_nodes")] + #[rustc_clean(cfg="bpass2", except="owner")] #[rustc_clean(cfg="bpass3")] type ChangeTraitBoundIndirectly = (T, u32); } @@ -215,7 +215,7 @@ mod change_trait_bound_indirectly_in_where_clause { #[cfg(not(bpass1))] use super::ReferencedTrait2 as Trait; - #[rustc_clean(cfg="bpass2", except="opt_hir_owner_nodes")] + #[rustc_clean(cfg="bpass2", except="owner")] #[rustc_clean(cfg="bpass3")] type ChangeTraitBoundIndirectly where T : Trait = (T, u32); } diff --git a/tests/incremental/hashes/unary_and_binary_exprs.rs b/tests/incremental/hashes/unary_and_binary_exprs.rs index 036b5a8529a01..dac778d57252d 100644 --- a/tests/incremental/hashes/unary_and_binary_exprs.rs +++ b/tests/incremental/hashes/unary_and_binary_exprs.rs @@ -25,9 +25,9 @@ pub fn const_negation() -> i32 { } #[cfg(not(any(bpass1,bpass4)))] -#[rustc_clean(except="opt_hir_owner_nodes,optimized_mir", cfg="bpass2")] +#[rustc_clean(except="owner,optimized_mir", cfg="bpass2")] #[rustc_clean(cfg="bpass3")] -#[rustc_clean(except="opt_hir_owner_nodes,optimized_mir", cfg="bpass5")] +#[rustc_clean(except="owner,optimized_mir", cfg="bpass5")] #[rustc_clean(cfg="bpass6")] pub fn const_negation() -> i32 { -1 @@ -42,9 +42,9 @@ pub fn const_bitwise_not() -> i32 { } #[cfg(not(any(bpass1,bpass4)))] -#[rustc_clean(except="opt_hir_owner_nodes,optimized_mir", cfg="bpass2")] +#[rustc_clean(except="owner,optimized_mir", cfg="bpass2")] #[rustc_clean(cfg="bpass3")] -#[rustc_clean(except="opt_hir_owner_nodes,optimized_mir", cfg="bpass5")] +#[rustc_clean(except="owner,optimized_mir", cfg="bpass5")] #[rustc_clean(cfg="bpass6")] pub fn const_bitwise_not() -> i32 { !99 @@ -59,9 +59,9 @@ pub fn var_negation(x: i32, y: i32) -> i32 { } #[cfg(not(any(bpass1,bpass4)))] -#[rustc_clean(except="opt_hir_owner_nodes,optimized_mir", cfg="bpass2")] +#[rustc_clean(except="owner,optimized_mir", cfg="bpass2")] #[rustc_clean(cfg="bpass3")] -#[rustc_clean(except="opt_hir_owner_nodes,optimized_mir", cfg="bpass5")] +#[rustc_clean(except="owner,optimized_mir", cfg="bpass5")] #[rustc_clean(cfg="bpass6")] pub fn var_negation(x: i32, y: i32) -> i32 { -y @@ -76,9 +76,9 @@ pub fn var_bitwise_not(x: i32, y: i32) -> i32 { } #[cfg(not(any(bpass1,bpass4)))] -#[rustc_clean(except="opt_hir_owner_nodes,optimized_mir", cfg="bpass2")] +#[rustc_clean(except="owner,optimized_mir", cfg="bpass2")] #[rustc_clean(cfg="bpass3")] -#[rustc_clean(except="opt_hir_owner_nodes,optimized_mir", cfg="bpass5")] +#[rustc_clean(except="owner,optimized_mir", cfg="bpass5")] #[rustc_clean(cfg="bpass6")] pub fn var_bitwise_not(x: i32, y: i32) -> i32 { !y @@ -93,9 +93,9 @@ pub fn var_deref(x: &i32, y: &i32) -> i32 { } #[cfg(not(any(bpass1,bpass4)))] -#[rustc_clean(except="opt_hir_owner_nodes,optimized_mir", cfg="bpass2")] +#[rustc_clean(except="owner,optimized_mir", cfg="bpass2")] #[rustc_clean(cfg="bpass3")] -#[rustc_clean(except="opt_hir_owner_nodes,optimized_mir", cfg="bpass5")] +#[rustc_clean(except="owner,optimized_mir", cfg="bpass5")] #[rustc_clean(cfg="bpass6")] pub fn var_deref(x: &i32, y: &i32) -> i32 { *y @@ -110,9 +110,9 @@ pub fn first_const_add() -> i32 { } #[cfg(not(any(bpass1,bpass4)))] -#[rustc_clean(except="opt_hir_owner_nodes,optimized_mir", cfg="bpass2")] +#[rustc_clean(except="owner,optimized_mir", cfg="bpass2")] #[rustc_clean(cfg="bpass3")] -#[rustc_clean(except="opt_hir_owner_nodes,optimized_mir", cfg="bpass5")] +#[rustc_clean(except="owner,optimized_mir", cfg="bpass5")] #[rustc_clean(cfg="bpass6")] pub fn first_const_add() -> i32 { 2 + 3 @@ -127,9 +127,9 @@ pub fn second_const_add() -> i32 { } #[cfg(not(any(bpass1,bpass4)))] -#[rustc_clean(except="opt_hir_owner_nodes,optimized_mir", cfg="bpass2")] +#[rustc_clean(except="owner,optimized_mir", cfg="bpass2")] #[rustc_clean(cfg="bpass3")] -#[rustc_clean(except="opt_hir_owner_nodes,optimized_mir", cfg="bpass5")] +#[rustc_clean(except="owner,optimized_mir", cfg="bpass5")] #[rustc_clean(cfg="bpass6")] pub fn second_const_add() -> i32 { 1 + 3 @@ -144,9 +144,9 @@ pub fn first_var_add(a: i32, b: i32) -> i32 { } #[cfg(not(any(bpass1,bpass4)))] -#[rustc_clean(except="opt_hir_owner_nodes,optimized_mir", cfg="bpass2")] +#[rustc_clean(except="owner,optimized_mir", cfg="bpass2")] #[rustc_clean(cfg="bpass3")] -#[rustc_clean(except="opt_hir_owner_nodes,optimized_mir", cfg="bpass5")] +#[rustc_clean(except="owner,optimized_mir", cfg="bpass5")] #[rustc_clean(cfg="bpass6")] pub fn first_var_add(a: i32, b: i32) -> i32 { b + 2 @@ -161,9 +161,9 @@ pub fn second_var_add(a: i32, b: i32) -> i32 { } #[cfg(not(any(bpass1,bpass4)))] -#[rustc_clean(except="opt_hir_owner_nodes,optimized_mir", cfg="bpass2")] +#[rustc_clean(except="owner,optimized_mir", cfg="bpass2")] #[rustc_clean(cfg="bpass3")] -#[rustc_clean(except="opt_hir_owner_nodes,optimized_mir", cfg="bpass5")] +#[rustc_clean(except="owner,optimized_mir", cfg="bpass5")] #[rustc_clean(cfg="bpass6")] pub fn second_var_add(a: i32, b: i32) -> i32 { 1 + b @@ -178,9 +178,9 @@ pub fn plus_to_minus(a: i32) -> i32 { } #[cfg(not(any(bpass1,bpass4)))] -#[rustc_clean(except="opt_hir_owner_nodes,optimized_mir", cfg="bpass2")] +#[rustc_clean(except="owner,optimized_mir", cfg="bpass2")] #[rustc_clean(cfg="bpass3")] -#[rustc_clean(except="opt_hir_owner_nodes,optimized_mir", cfg="bpass5")] +#[rustc_clean(except="owner,optimized_mir", cfg="bpass5")] #[rustc_clean(cfg="bpass6")] pub fn plus_to_minus(a: i32) -> i32 { 1 - a @@ -195,9 +195,9 @@ pub fn plus_to_mult(a: i32) -> i32 { } #[cfg(not(any(bpass1,bpass4)))] -#[rustc_clean(except="opt_hir_owner_nodes,optimized_mir", cfg="bpass2")] +#[rustc_clean(except="owner,optimized_mir", cfg="bpass2")] #[rustc_clean(cfg="bpass3")] -#[rustc_clean(except="opt_hir_owner_nodes,optimized_mir", cfg="bpass5")] +#[rustc_clean(except="owner,optimized_mir", cfg="bpass5")] #[rustc_clean(cfg="bpass6")] pub fn plus_to_mult(a: i32) -> i32 { 1 * a @@ -212,9 +212,9 @@ pub fn plus_to_div(a: i32) -> i32 { } #[cfg(not(any(bpass1,bpass4)))] -#[rustc_clean(except="opt_hir_owner_nodes,optimized_mir", cfg="bpass2")] +#[rustc_clean(except="owner,optimized_mir", cfg="bpass2")] #[rustc_clean(cfg="bpass3")] -#[rustc_clean(except="opt_hir_owner_nodes,optimized_mir", cfg="bpass5")] +#[rustc_clean(except="owner,optimized_mir", cfg="bpass5")] #[rustc_clean(cfg="bpass6")] pub fn plus_to_div(a: i32) -> i32 { 1 / a @@ -229,9 +229,9 @@ pub fn plus_to_mod(a: i32) -> i32 { } #[cfg(not(any(bpass1,bpass4)))] -#[rustc_clean(except="opt_hir_owner_nodes,optimized_mir", cfg="bpass2")] +#[rustc_clean(except="owner,optimized_mir", cfg="bpass2")] #[rustc_clean(cfg="bpass3")] -#[rustc_clean(except="opt_hir_owner_nodes,optimized_mir", cfg="bpass5")] +#[rustc_clean(except="owner,optimized_mir", cfg="bpass5")] #[rustc_clean(cfg="bpass6")] pub fn plus_to_mod(a: i32) -> i32 { 1 % a @@ -246,9 +246,9 @@ pub fn and_to_or(a: bool, b: bool) -> bool { } #[cfg(not(any(bpass1,bpass4)))] -#[rustc_clean(except="opt_hir_owner_nodes,optimized_mir", cfg="bpass2")] +#[rustc_clean(except="owner,optimized_mir", cfg="bpass2")] #[rustc_clean(cfg="bpass3")] -#[rustc_clean(except="opt_hir_owner_nodes,optimized_mir", cfg="bpass5")] +#[rustc_clean(except="owner,optimized_mir", cfg="bpass5")] #[rustc_clean(cfg="bpass6")] pub fn and_to_or(a: bool, b: bool) -> bool { a || b @@ -263,9 +263,9 @@ pub fn bitwise_and_to_bitwise_or(a: i32) -> i32 { } #[cfg(not(any(bpass1,bpass4)))] -#[rustc_clean(except="opt_hir_owner_nodes,optimized_mir", cfg="bpass2")] +#[rustc_clean(except="owner,optimized_mir", cfg="bpass2")] #[rustc_clean(cfg="bpass3")] -#[rustc_clean(except="opt_hir_owner_nodes,optimized_mir", cfg="bpass5")] +#[rustc_clean(except="owner,optimized_mir", cfg="bpass5")] #[rustc_clean(cfg="bpass6")] pub fn bitwise_and_to_bitwise_or(a: i32) -> i32 { 1 | a @@ -280,9 +280,9 @@ pub fn bitwise_and_to_bitwise_xor(a: i32) -> i32 { } #[cfg(not(any(bpass1,bpass4)))] -#[rustc_clean(except="opt_hir_owner_nodes,optimized_mir", cfg="bpass2")] +#[rustc_clean(except="owner,optimized_mir", cfg="bpass2")] #[rustc_clean(cfg="bpass3")] -#[rustc_clean(except="opt_hir_owner_nodes,optimized_mir", cfg="bpass5")] +#[rustc_clean(except="owner,optimized_mir", cfg="bpass5")] #[rustc_clean(cfg="bpass6")] pub fn bitwise_and_to_bitwise_xor(a: i32) -> i32 { 1 ^ a @@ -297,9 +297,9 @@ pub fn bitwise_and_to_lshift(a: i32) -> i32 { } #[cfg(not(any(bpass1,bpass4)))] -#[rustc_clean(except="opt_hir_owner_nodes,optimized_mir", cfg="bpass2")] +#[rustc_clean(except="owner,optimized_mir", cfg="bpass2")] #[rustc_clean(cfg="bpass3")] -#[rustc_clean(except="opt_hir_owner_nodes,optimized_mir", cfg="bpass5")] +#[rustc_clean(except="owner,optimized_mir", cfg="bpass5")] #[rustc_clean(cfg="bpass6")] pub fn bitwise_and_to_lshift(a: i32) -> i32 { a << 1 @@ -314,9 +314,9 @@ pub fn bitwise_and_to_rshift(a: i32) -> i32 { } #[cfg(not(any(bpass1,bpass4)))] -#[rustc_clean(except="opt_hir_owner_nodes,optimized_mir", cfg="bpass2")] +#[rustc_clean(except="owner,optimized_mir", cfg="bpass2")] #[rustc_clean(cfg="bpass3")] -#[rustc_clean(except="opt_hir_owner_nodes,optimized_mir", cfg="bpass5")] +#[rustc_clean(except="owner,optimized_mir", cfg="bpass5")] #[rustc_clean(cfg="bpass6")] pub fn bitwise_and_to_rshift(a: i32) -> i32 { a >> 1 @@ -331,9 +331,9 @@ pub fn eq_to_uneq(a: i32) -> bool { } #[cfg(not(any(bpass1,bpass4)))] -#[rustc_clean(except="opt_hir_owner_nodes,optimized_mir", cfg="bpass2")] +#[rustc_clean(except="owner,optimized_mir", cfg="bpass2")] #[rustc_clean(cfg="bpass3")] -#[rustc_clean(except="opt_hir_owner_nodes,optimized_mir", cfg="bpass5")] +#[rustc_clean(except="owner,optimized_mir", cfg="bpass5")] #[rustc_clean(cfg="bpass6")] pub fn eq_to_uneq(a: i32) -> bool { a != 1 @@ -348,9 +348,9 @@ pub fn eq_to_lt(a: i32) -> bool { } #[cfg(not(any(bpass1,bpass4)))] -#[rustc_clean(except="opt_hir_owner_nodes,optimized_mir", cfg="bpass2")] +#[rustc_clean(except="owner,optimized_mir", cfg="bpass2")] #[rustc_clean(cfg="bpass3")] -#[rustc_clean(except="opt_hir_owner_nodes,optimized_mir", cfg="bpass5")] +#[rustc_clean(except="owner,optimized_mir", cfg="bpass5")] #[rustc_clean(cfg="bpass6")] pub fn eq_to_lt(a: i32) -> bool { a < 1 @@ -365,9 +365,9 @@ pub fn eq_to_gt(a: i32) -> bool { } #[cfg(not(any(bpass1,bpass4)))] -#[rustc_clean(except="opt_hir_owner_nodes,optimized_mir", cfg="bpass2")] +#[rustc_clean(except="owner,optimized_mir", cfg="bpass2")] #[rustc_clean(cfg="bpass3")] -#[rustc_clean(except="opt_hir_owner_nodes,optimized_mir", cfg="bpass5")] +#[rustc_clean(except="owner,optimized_mir", cfg="bpass5")] #[rustc_clean(cfg="bpass6")] pub fn eq_to_gt(a: i32) -> bool { a > 1 @@ -382,9 +382,9 @@ pub fn eq_to_le(a: i32) -> bool { } #[cfg(not(any(bpass1,bpass4)))] -#[rustc_clean(except="opt_hir_owner_nodes,optimized_mir", cfg="bpass2")] +#[rustc_clean(except="owner,optimized_mir", cfg="bpass2")] #[rustc_clean(cfg="bpass3")] -#[rustc_clean(except="opt_hir_owner_nodes,optimized_mir", cfg="bpass5")] +#[rustc_clean(except="owner,optimized_mir", cfg="bpass5")] #[rustc_clean(cfg="bpass6")] pub fn eq_to_le(a: i32) -> bool { a <= 1 @@ -399,9 +399,9 @@ pub fn eq_to_ge(a: i32) -> bool { } #[cfg(not(any(bpass1,bpass4)))] -#[rustc_clean(except="opt_hir_owner_nodes,optimized_mir", cfg="bpass2")] +#[rustc_clean(except="owner,optimized_mir", cfg="bpass2")] #[rustc_clean(cfg="bpass3")] -#[rustc_clean(except="opt_hir_owner_nodes,optimized_mir", cfg="bpass5")] +#[rustc_clean(except="owner,optimized_mir", cfg="bpass5")] #[rustc_clean(cfg="bpass6")] pub fn eq_to_ge(a: i32) -> bool { a >= 1 @@ -418,9 +418,9 @@ pub fn type_cast(a: u8) -> u64 { } #[cfg(not(any(bpass1,bpass4)))] -#[rustc_clean(except="opt_hir_owner_nodes,optimized_mir,typeck_root", cfg="bpass2")] +#[rustc_clean(except="owner,optimized_mir,typeck_root", cfg="bpass2")] #[rustc_clean(cfg="bpass3")] -#[rustc_clean(except="opt_hir_owner_nodes,optimized_mir,typeck_root", cfg="bpass5")] +#[rustc_clean(except="owner,optimized_mir,typeck_root", cfg="bpass5")] #[rustc_clean(cfg="bpass6")] pub fn type_cast(a: u8) -> u64 { let b = a as u32; @@ -437,9 +437,9 @@ pub fn value_cast(a: u32) -> i32 { } #[cfg(not(any(bpass1,bpass4)))] -#[rustc_clean(except="opt_hir_owner_nodes,optimized_mir", cfg="bpass2")] +#[rustc_clean(except="owner,optimized_mir", cfg="bpass2")] #[rustc_clean(cfg="bpass3")] -#[rustc_clean(except="opt_hir_owner_nodes,optimized_mir", cfg="bpass5")] +#[rustc_clean(except="owner,optimized_mir", cfg="bpass5")] #[rustc_clean(cfg="bpass6")] pub fn value_cast(a: u32) -> i32 { 2 as i32 @@ -457,9 +457,9 @@ pub fn place() -> i32 { } #[cfg(not(any(bpass1,bpass4)))] -#[rustc_clean(except="opt_hir_owner_nodes,optimized_mir", cfg="bpass2")] +#[rustc_clean(except="owner,optimized_mir", cfg="bpass2")] #[rustc_clean(cfg="bpass3")] -#[rustc_clean(except="opt_hir_owner_nodes,optimized_mir", cfg="bpass5")] +#[rustc_clean(except="owner,optimized_mir", cfg="bpass5")] #[rustc_clean(cfg="bpass6")] pub fn place() -> i32 { let mut x = 10; @@ -479,9 +479,9 @@ pub fn rvalue() -> i32 { } #[cfg(not(any(bpass1,bpass4)))] -#[rustc_clean(except="opt_hir_owner_nodes,optimized_mir", cfg="bpass2")] +#[rustc_clean(except="owner,optimized_mir", cfg="bpass2")] #[rustc_clean(cfg="bpass3")] -#[rustc_clean(except="opt_hir_owner_nodes,optimized_mir", cfg="bpass5")] +#[rustc_clean(except="owner,optimized_mir", cfg="bpass5")] #[rustc_clean(cfg="bpass6")] pub fn rvalue() -> i32 { let mut x = 10; @@ -498,9 +498,9 @@ pub fn index_to_slice(s: &[u8], i: usize, j: usize) -> u8 { } #[cfg(not(any(bpass1,bpass4)))] -#[rustc_clean(except="opt_hir_owner_nodes,optimized_mir", cfg="bpass2")] +#[rustc_clean(except="owner,optimized_mir", cfg="bpass2")] #[rustc_clean(cfg="bpass3")] -#[rustc_clean(except="opt_hir_owner_nodes,optimized_mir", cfg="bpass5")] +#[rustc_clean(except="owner,optimized_mir", cfg="bpass5")] #[rustc_clean(cfg="bpass6")] pub fn index_to_slice(s: &[u8], i: usize, j: usize) -> u8 { s[j] diff --git a/tests/incremental/hashes/while_let_loops.rs b/tests/incremental/hashes/while_let_loops.rs index 89b37f31503fc..a028badbf9f67 100644 --- a/tests/incremental/hashes/while_let_loops.rs +++ b/tests/incremental/hashes/while_let_loops.rs @@ -29,9 +29,9 @@ pub fn change_loop_body() { } #[cfg(not(any(bpass1,bpass4)))] -#[rustc_clean(cfg="bpass2", except="opt_hir_owner_nodes")] +#[rustc_clean(cfg="bpass2", except="owner")] #[rustc_clean(cfg="bpass3")] -#[rustc_clean(cfg="bpass5", except="opt_hir_owner_nodes")] +#[rustc_clean(cfg="bpass5", except="owner")] #[rustc_clean(cfg="bpass6")] pub fn change_loop_body() { let mut _x = 0; @@ -54,9 +54,9 @@ pub fn change_loop_condition() { } #[cfg(not(any(bpass1,bpass4)))] -#[rustc_clean(cfg="bpass2", except="opt_hir_owner_nodes")] +#[rustc_clean(cfg="bpass2", except="owner")] #[rustc_clean(cfg="bpass3")] -#[rustc_clean(cfg="bpass5", except="opt_hir_owner_nodes")] +#[rustc_clean(cfg="bpass5", except="owner")] #[rustc_clean(cfg="bpass6")] pub fn change_loop_condition() { let mut _x = 0; @@ -79,9 +79,9 @@ pub fn add_break() { } #[cfg(not(any(bpass1,bpass4)))] -#[rustc_clean(cfg="bpass2", except="opt_hir_owner_nodes, typeck_root")] +#[rustc_clean(cfg="bpass2", except="owner, typeck_root")] #[rustc_clean(cfg="bpass3")] -#[rustc_clean(cfg="bpass5", except="opt_hir_owner_nodes, typeck_root")] +#[rustc_clean(cfg="bpass5", except="owner, typeck_root")] #[rustc_clean(cfg="bpass6")] pub fn add_break() { let mut _x = 0; @@ -104,9 +104,9 @@ pub fn add_loop_label() { } #[cfg(not(any(bpass1,bpass4)))] -#[rustc_clean(cfg="bpass2", except="opt_hir_owner_nodes")] +#[rustc_clean(cfg="bpass2", except="owner")] #[rustc_clean(cfg="bpass3")] -#[rustc_clean(cfg="bpass5", except="opt_hir_owner_nodes")] +#[rustc_clean(cfg="bpass5", except="owner")] #[rustc_clean(cfg="bpass6")] pub fn add_loop_label() { let mut _x = 0; @@ -129,9 +129,9 @@ pub fn add_loop_label_to_break() { } #[cfg(not(any(bpass1,bpass4)))] -#[rustc_clean(cfg="bpass2", except="opt_hir_owner_nodes")] +#[rustc_clean(cfg="bpass2", except="owner")] #[rustc_clean(cfg="bpass3")] -#[rustc_clean(cfg="bpass5", except="opt_hir_owner_nodes")] +#[rustc_clean(cfg="bpass5", except="owner")] #[rustc_clean(cfg="bpass6")] pub fn add_loop_label_to_break() { let mut _x = 0; @@ -156,9 +156,9 @@ pub fn change_break_label() { } #[cfg(not(any(bpass1,bpass4)))] -#[rustc_clean(cfg="bpass2", except="opt_hir_owner_nodes")] +#[rustc_clean(cfg="bpass2", except="owner")] #[rustc_clean(cfg="bpass3")] -#[rustc_clean(cfg="bpass5", except="opt_hir_owner_nodes")] +#[rustc_clean(cfg="bpass5", except="owner")] #[rustc_clean(cfg="bpass6")] pub fn change_break_label() { let mut _x = 0; @@ -181,9 +181,9 @@ pub fn add_loop_label_to_continue() { } #[cfg(not(any(bpass1,bpass4)))] -#[rustc_clean(cfg="bpass2", except="opt_hir_owner_nodes")] +#[rustc_clean(cfg="bpass2", except="owner")] #[rustc_clean(cfg="bpass3")] -#[rustc_clean(cfg="bpass5", except="opt_hir_owner_nodes")] +#[rustc_clean(cfg="bpass5", except="owner")] #[rustc_clean(cfg="bpass6")] pub fn add_loop_label_to_continue() { let mut _x = 0; @@ -208,9 +208,9 @@ pub fn change_continue_label() { } #[cfg(not(any(bpass1,bpass4)))] -#[rustc_clean(cfg="bpass2", except="opt_hir_owner_nodes")] +#[rustc_clean(cfg="bpass2", except="owner")] #[rustc_clean(cfg="bpass3")] -#[rustc_clean(cfg="bpass5", except="opt_hir_owner_nodes")] +#[rustc_clean(cfg="bpass5", except="owner")] #[rustc_clean(cfg="bpass6")] pub fn change_continue_label() { let mut _x = 0; @@ -235,9 +235,9 @@ pub fn change_continue_to_break() { } #[cfg(not(any(bpass1,bpass4)))] -#[rustc_clean(cfg="bpass2", except="opt_hir_owner_nodes")] +#[rustc_clean(cfg="bpass2", except="owner")] #[rustc_clean(cfg="bpass3")] -#[rustc_clean(cfg="bpass5", except="opt_hir_owner_nodes")] +#[rustc_clean(cfg="bpass5", except="owner")] #[rustc_clean(cfg="bpass6")] pub fn change_continue_to_break() { let mut _x = 0; diff --git a/tests/incremental/hashes/while_loops.rs b/tests/incremental/hashes/while_loops.rs index 8bf9309028711..7c1ff6c9c69bf 100644 --- a/tests/incremental/hashes/while_loops.rs +++ b/tests/incremental/hashes/while_loops.rs @@ -29,9 +29,9 @@ pub fn change_loop_body() { } #[cfg(not(any(bpass1,bpass4)))] -#[rustc_clean(cfg="bpass2", except="opt_hir_owner_nodes, optimized_mir")] +#[rustc_clean(cfg="bpass2", except="owner, optimized_mir")] #[rustc_clean(cfg="bpass3")] -#[rustc_clean(cfg="bpass5", except="opt_hir_owner_nodes, optimized_mir")] +#[rustc_clean(cfg="bpass5", except="owner, optimized_mir")] #[rustc_clean(cfg="bpass6")] pub fn change_loop_body() { let mut _x = 0; @@ -54,9 +54,9 @@ pub fn change_loop_condition() { } #[cfg(not(any(bpass1,bpass4)))] -#[rustc_clean(cfg="bpass2", except="opt_hir_owner_nodes, optimized_mir")] +#[rustc_clean(cfg="bpass2", except="owner, optimized_mir")] #[rustc_clean(cfg="bpass3")] -#[rustc_clean(cfg="bpass5", except="opt_hir_owner_nodes, optimized_mir")] +#[rustc_clean(cfg="bpass5", except="owner, optimized_mir")] #[rustc_clean(cfg="bpass6")] pub fn change_loop_condition() { let mut _x = 0; @@ -79,9 +79,9 @@ pub fn add_break() { } #[cfg(not(any(bpass1,bpass4)))] -#[rustc_clean(cfg="bpass2", except="opt_hir_owner_nodes, optimized_mir, typeck_root")] +#[rustc_clean(cfg="bpass2", except="owner, optimized_mir, typeck_root")] #[rustc_clean(cfg="bpass3")] -#[rustc_clean(cfg="bpass5", except="opt_hir_owner_nodes, optimized_mir, typeck_root")] +#[rustc_clean(cfg="bpass5", except="owner, optimized_mir, typeck_root")] #[rustc_clean(cfg="bpass6")] pub fn add_break() { let mut _x = 0; @@ -104,9 +104,9 @@ pub fn add_loop_label() { } #[cfg(not(any(bpass1,bpass4)))] -#[rustc_clean(cfg="bpass2", except="opt_hir_owner_nodes")] +#[rustc_clean(cfg="bpass2", except="owner")] #[rustc_clean(cfg="bpass3")] -#[rustc_clean(cfg="bpass5", except="opt_hir_owner_nodes")] +#[rustc_clean(cfg="bpass5", except="owner")] #[rustc_clean(cfg="bpass6")] pub fn add_loop_label() { let mut _x = 0; @@ -129,9 +129,9 @@ pub fn add_loop_label_to_break() { } #[cfg(not(any(bpass1,bpass4)))] -#[rustc_clean(cfg="bpass2", except="opt_hir_owner_nodes")] +#[rustc_clean(cfg="bpass2", except="owner")] #[rustc_clean(cfg="bpass3")] -#[rustc_clean(cfg="bpass5", except="opt_hir_owner_nodes")] +#[rustc_clean(cfg="bpass5", except="owner")] #[rustc_clean(cfg="bpass6")] pub fn add_loop_label_to_break() { let mut _x = 0; @@ -156,9 +156,9 @@ pub fn change_break_label() { } #[cfg(not(any(bpass1,bpass4)))] -#[rustc_clean(cfg="bpass2", except="opt_hir_owner_nodes,optimized_mir")] +#[rustc_clean(cfg="bpass2", except="owner,optimized_mir")] #[rustc_clean(cfg="bpass3")] -#[rustc_clean(cfg="bpass5", except="opt_hir_owner_nodes,optimized_mir")] +#[rustc_clean(cfg="bpass5", except="owner,optimized_mir")] #[rustc_clean(cfg="bpass6")] pub fn change_break_label() { let mut _x = 0; @@ -183,9 +183,9 @@ pub fn add_loop_label_to_continue() { } #[cfg(not(any(bpass1,bpass4)))] -#[rustc_clean(cfg="bpass2", except="opt_hir_owner_nodes")] +#[rustc_clean(cfg="bpass2", except="owner")] #[rustc_clean(cfg="bpass3")] -#[rustc_clean(cfg="bpass5", except="opt_hir_owner_nodes")] +#[rustc_clean(cfg="bpass5", except="owner")] #[rustc_clean(cfg="bpass6")] pub fn add_loop_label_to_continue() { let mut _x = 0; @@ -210,9 +210,9 @@ pub fn change_continue_label() { } #[cfg(not(any(bpass1,bpass4)))] -#[rustc_clean(cfg="bpass2", except="opt_hir_owner_nodes")] +#[rustc_clean(cfg="bpass2", except="owner")] #[rustc_clean(cfg="bpass3")] -#[rustc_clean(cfg="bpass5", except="opt_hir_owner_nodes")] +#[rustc_clean(cfg="bpass5", except="owner")] #[rustc_clean(cfg="bpass6")] pub fn change_continue_label() { let mut _x = 0; @@ -237,9 +237,9 @@ pub fn change_continue_to_break() { } #[cfg(not(any(bpass1,bpass4)))] -#[rustc_clean(cfg="bpass2", except="opt_hir_owner_nodes, optimized_mir")] +#[rustc_clean(cfg="bpass2", except="owner, optimized_mir")] #[rustc_clean(cfg="bpass3")] -#[rustc_clean(cfg="bpass5", except="opt_hir_owner_nodes, optimized_mir")] +#[rustc_clean(cfg="bpass5", except="owner, optimized_mir")] #[rustc_clean(cfg="bpass6")] pub fn change_continue_to_break() { let mut _x = 0; diff --git a/tests/incremental/hygiene/auxiliary/cached_hygiene.rs b/tests/incremental/hygiene/auxiliary/cached_hygiene.rs index d52a6397590fd..35c1e5b12e114 100644 --- a/tests/incremental/hygiene/auxiliary/cached_hygiene.rs +++ b/tests/incremental/hygiene/auxiliary/cached_hygiene.rs @@ -13,7 +13,7 @@ macro_rules! first_macro { } } -#[rustc_clean(except="opt_hir_owner_nodes,typeck_root,optimized_mir", cfg="rpass2")] +#[rustc_clean(except="owner,typeck_root,optimized_mir", cfg="rpass2")] #[inline(always)] pub fn changed_fn() { // This will cause additional hygiene to be generate, diff --git a/tests/incremental/ich_method_call_trait_scope.rs b/tests/incremental/ich_method_call_trait_scope.rs index 58a56e6646f02..a74d5b9ee93d1 100644 --- a/tests/incremental/ich_method_call_trait_scope.rs +++ b/tests/incremental/ich_method_call_trait_scope.rs @@ -27,7 +27,7 @@ mod mod3 { #[cfg(rpass2)] use Trait2; - #[rustc_clean(except="typeck_root", cfg="rpass2")] + #[rustc_clean(except="owner,typeck_root", cfg="rpass2")] fn bar() { ().method(); } diff --git a/tests/incremental/ich_nested_items.rs b/tests/incremental/ich_nested_items.rs index 2852b09d03bb7..f45158a97331c 100644 --- a/tests/incremental/ich_nested_items.rs +++ b/tests/incremental/ich_nested_items.rs @@ -10,7 +10,7 @@ #![feature(rustc_attrs)] #![allow(dead_code)] -#[rustc_clean(except = "opt_hir_owner_nodes", cfg = "bpass2")] +#[rustc_clean(except = "owner", cfg = "bpass2")] pub fn foo() { #[cfg(bpass1)] pub fn baz() {} // order is different... diff --git a/tests/incremental/ich_resolve_results.rs b/tests/incremental/ich_resolve_results.rs index 60d3fd929479a..8161bab379889 100644 --- a/tests/incremental/ich_resolve_results.rs +++ b/tests/incremental/ich_resolve_results.rs @@ -31,13 +31,13 @@ mod mod3 { use mod2::Foo; #[rustc_clean(cfg="rpass2")] - #[rustc_clean(except="opt_hir_owner_nodes,typeck_root", cfg="rpass3")] + #[rustc_clean(except="owner,typeck_root", cfg="rpass3")] fn in_expr() { Foo(0); } #[rustc_clean(cfg="rpass2")] - #[rustc_clean(except="opt_hir_owner_nodes,typeck_root", cfg="rpass3")] + #[rustc_clean(except="owner,typeck_root", cfg="rpass3")] fn in_type() { test::(); } diff --git a/tests/incremental/source_loc_macros.rs b/tests/incremental/source_loc_macros.rs index ba67fa2fadada..8b2ea91af73a8 100644 --- a/tests/incremental/source_loc_macros.rs +++ b/tests/incremental/source_loc_macros.rs @@ -23,7 +23,7 @@ fn file_same() { let _ = file!(); } -#[rustc_clean(except="opt_hir_owner_nodes,optimized_mir", cfg="rpass2")] +#[rustc_clean(except="owner,optimized_mir", cfg="rpass2")] fn line_different() { #[cfg(rpass1)] { @@ -35,7 +35,7 @@ fn line_different() { } } -#[rustc_clean(except="opt_hir_owner_nodes,optimized_mir", cfg="rpass2")] +#[rustc_clean(except="owner,optimized_mir", cfg="rpass2")] fn col_different() { #[cfg(rpass1)] { diff --git a/tests/incremental/spans_significant_w_debuginfo.rs b/tests/incremental/spans_significant_w_debuginfo.rs index 06baecd75e5b4..650af1bfa48ac 100644 --- a/tests/incremental/spans_significant_w_debuginfo.rs +++ b/tests/incremental/spans_significant_w_debuginfo.rs @@ -13,5 +13,5 @@ pub fn main() {} #[cfg(rpass2)] -#[rustc_clean(cfg = "rpass2")] +#[rustc_clean(cfg = "rpass2", except = "owner")] pub fn main() {} diff --git a/tests/incremental/spans_significant_w_panic.rs b/tests/incremental/spans_significant_w_panic.rs index 34363c359dca1..126e2656dac34 100644 --- a/tests/incremental/spans_significant_w_panic.rs +++ b/tests/incremental/spans_significant_w_panic.rs @@ -17,7 +17,7 @@ pub fn main() { } #[cfg(rpass2)] -#[rustc_clean(cfg = "rpass2")] +#[rustc_clean(cfg = "rpass2",except = "owner")] pub fn main() { if std::hint::black_box(false) { panic!() diff --git a/tests/incremental/string_constant.rs b/tests/incremental/string_constant.rs index d0d0a3c4a701d..97805a6e04b38 100644 --- a/tests/incremental/string_constant.rs +++ b/tests/incremental/string_constant.rs @@ -17,7 +17,7 @@ pub mod x { } #[cfg(bpass2)] - #[rustc_clean(except = "opt_hir_owner_nodes,optimized_mir", cfg = "bpass2")] + #[rustc_clean(except = "owner,optimized_mir", cfg = "bpass2")] pub fn x() { println!("{}", "2"); } diff --git a/tests/ui/parallel-rustc/default-trait-shadow-cycle-issue-151358.stderr b/tests/ui/parallel-rustc/default-trait-shadow-cycle-issue-151358.stderr index d81b7d142c92f..792236a8382f6 100644 --- a/tests/ui/parallel-rustc/default-trait-shadow-cycle-issue-151358.stderr +++ b/tests/ui/parallel-rustc/default-trait-shadow-cycle-issue-151358.stderr @@ -1,16 +1,16 @@ error: internal compiler error: query cycle when printing cycle detected | - = note: ...when getting HIR ID of `Default` + = note: ...when getting owner for `Default` = note: ...which requires getting the crate HIR... = note: ...which requires perform lints prior to AST lowering... = note: ...which requires looking up span for `Default`... - = note: ...which again requires getting HIR ID of `Default`, completing the cycle + = note: ...which again requires getting owner for `Default`, completing the cycle = note: cycle used when getting the resolver for lowering = note: see https://rustc-dev-guide.rust-lang.org/overview.html#queries and https://rustc-dev-guide.rust-lang.org/query.html for more information error[E0391]: cycle detected when getting the resolver for lowering | - = note: ...which requires getting HIR ID of `Default`... + = note: ...which requires getting owner for `Default`... = note: ...which requires getting the crate HIR... = note: ...which requires perform lints prior to AST lowering... = note: ...which again requires getting the resolver for lowering, completing the cycle diff --git a/tests/ui/query-system/query-cycle-printing-issue-151358.stderr b/tests/ui/query-system/query-cycle-printing-issue-151358.stderr index d81b7d142c92f..792236a8382f6 100644 --- a/tests/ui/query-system/query-cycle-printing-issue-151358.stderr +++ b/tests/ui/query-system/query-cycle-printing-issue-151358.stderr @@ -1,16 +1,16 @@ error: internal compiler error: query cycle when printing cycle detected | - = note: ...when getting HIR ID of `Default` + = note: ...when getting owner for `Default` = note: ...which requires getting the crate HIR... = note: ...which requires perform lints prior to AST lowering... = note: ...which requires looking up span for `Default`... - = note: ...which again requires getting HIR ID of `Default`, completing the cycle + = note: ...which again requires getting owner for `Default`, completing the cycle = note: cycle used when getting the resolver for lowering = note: see https://rustc-dev-guide.rust-lang.org/overview.html#queries and https://rustc-dev-guide.rust-lang.org/query.html for more information error[E0391]: cycle detected when getting the resolver for lowering | - = note: ...which requires getting HIR ID of `Default`... + = note: ...which requires getting owner for `Default`... = note: ...which requires getting the crate HIR... = note: ...which requires perform lints prior to AST lowering... = note: ...which again requires getting the resolver for lowering, completing the cycle diff --git a/tests/ui/resolve/query-cycle-issue-124901.stderr b/tests/ui/resolve/query-cycle-issue-124901.stderr index d81b7d142c92f..792236a8382f6 100644 --- a/tests/ui/resolve/query-cycle-issue-124901.stderr +++ b/tests/ui/resolve/query-cycle-issue-124901.stderr @@ -1,16 +1,16 @@ error: internal compiler error: query cycle when printing cycle detected | - = note: ...when getting HIR ID of `Default` + = note: ...when getting owner for `Default` = note: ...which requires getting the crate HIR... = note: ...which requires perform lints prior to AST lowering... = note: ...which requires looking up span for `Default`... - = note: ...which again requires getting HIR ID of `Default`, completing the cycle + = note: ...which again requires getting owner for `Default`, completing the cycle = note: cycle used when getting the resolver for lowering = note: see https://rustc-dev-guide.rust-lang.org/overview.html#queries and https://rustc-dev-guide.rust-lang.org/query.html for more information error[E0391]: cycle detected when getting the resolver for lowering | - = note: ...which requires getting HIR ID of `Default`... + = note: ...which requires getting owner for `Default`... = note: ...which requires getting the crate HIR... = note: ...which requires perform lints prior to AST lowering... = note: ...which again requires getting the resolver for lowering, completing the cycle From 3e8cb4ac5e70ad68ae793009ab556737f7ca146a Mon Sep 17 00:00:00 2001 From: aerooneqq Date: Thu, 23 Apr 2026 19:01:50 +0300 Subject: [PATCH 2/5] Ignore parenting --- compiler/rustc_hir/src/hir.rs | 1 + 1 file changed, 1 insertion(+) diff --git a/compiler/rustc_hir/src/hir.rs b/compiler/rustc_hir/src/hir.rs index 5d5422ee93399..649ab4ac66cff 100644 --- a/compiler/rustc_hir/src/hir.rs +++ b/compiler/rustc_hir/src/hir.rs @@ -1622,6 +1622,7 @@ pub struct OwnerInfo<'hir> { /// Contents of the HIR. pub nodes: OwnerNodes<'hir>, /// Map from each nested owner to its parent's local id. + #[stable_hasher(ignore)] pub parenting: LocalDefIdMap, /// Collected attributes of the HIR nodes. pub attrs: AttributeMap<'hir>, From 1533d0bedf19a37cac265cdf4da78395f6d1cb91 Mon Sep 17 00:00:00 2001 From: aerooneqq Date: Fri, 24 Apr 2026 13:04:02 +0300 Subject: [PATCH 3/5] Return hir_attr_map query --- compiler/rustc_middle/src/hir/map.rs | 6 +----- compiler/rustc_middle/src/hir/mod.rs | 2 ++ compiler/rustc_middle/src/queries.rs | 9 +++++++++ 3 files changed, 12 insertions(+), 5 deletions(-) diff --git a/compiler/rustc_middle/src/hir/map.rs b/compiler/rustc_middle/src/hir/map.rs index 2a77efda74986..c5c987b83af42 100644 --- a/compiler/rustc_middle/src/hir/map.rs +++ b/compiler/rustc_middle/src/hir/map.rs @@ -18,7 +18,7 @@ use rustc_hir_pretty as pprust_hir; use rustc_span::def_id::StableCrateId; use rustc_span::{ErrorGuaranteed, Ident, Span, Symbol, kw, with_metavar_spans}; -use crate::hir::{ModuleItems, nested_filter}; +use crate::hir::{MaybeOwner, ModuleItems, nested_filter}; use crate::middle::debugger_visualizer::DebuggerVisualizerFile; use crate::query::{IntoQueryKey, LocalCrate}; use crate::ty::TyCtxt; @@ -115,10 +115,6 @@ impl<'tcx> TyCtxt<'tcx> { self.owner(id.def_id).as_owner().map(|o| &o.delayed_lints) } - pub fn hir_attr_map(self, id: OwnerId) -> &'tcx AttributeMap<'tcx> { - self.owner(id.def_id).as_owner().map_or(AttributeMap::EMPTY, |o| &o.attrs) - } - pub fn in_scope_traits_map( self, id: OwnerId, diff --git a/compiler/rustc_middle/src/hir/mod.rs b/compiler/rustc_middle/src/hir/mod.rs index ffeeefbae2d4c..a361dd2a0e1da 100644 --- a/compiler/rustc_middle/src/hir/mod.rs +++ b/compiler/rustc_middle/src/hir/mod.rs @@ -443,6 +443,8 @@ pub fn provide(providers: &mut Providers) { providers.hir_crate_items = map::hir_crate_items; providers.crate_hash = map::crate_hash; providers.hir_module_items = map::hir_module_items; + providers.hir_attr_map = + |tcx, id| tcx.owner(id.def_id).as_owner().map_or(AttributeMap::EMPTY, |o| &o.attrs); // Serves as an entry point for getting `MaybeOwner`. As owner can either be in // `owners` of `hir_crate` or it can be delayed AST owner (i.e., delegations) // we need to firstly check in `hir_crate` and then delayed AST owners. diff --git a/compiler/rustc_middle/src/queries.rs b/compiler/rustc_middle/src/queries.rs index b05f9345d73d2..e8fcdce5776db 100644 --- a/compiler/rustc_middle/src/queries.rs +++ b/compiler/rustc_middle/src/queries.rs @@ -251,6 +251,15 @@ rustc_queries! { desc { "getting HIR parent of `{}`", tcx.def_path_str(key) } } + /// Gives access to the HIR attributes inside the HIR owner `key`. + /// + /// This can be conveniently accessed by `tcx.hir_*` methods. + /// Avoid calling this query directly. + query hir_attr_map(key: hir::OwnerId) -> &'tcx hir::AttributeMap<'tcx> { + desc { "getting HIR owner attributes in `{}`", tcx.def_path_str(key) } + feedable + } + /// Returns the *default* of the const pararameter given by `DefId`. /// /// E.g., given `struct Ty;` this returns `3` for `N`. From 464a7a0819cd590d907bdd5e6c515a398fbf7383 Mon Sep 17 00:00:00 2001 From: aerooneqq Date: Fri, 24 Apr 2026 14:16:54 +0300 Subject: [PATCH 4/5] Remove attributes from projected owners, fix tests --- compiler/rustc_middle/src/arena.rs | 6 +- compiler/rustc_middle/src/hir/map.rs | 13 ++- compiler/rustc_middle/src/hir/mod.rs | 98 +++++++++++++---- compiler/rustc_middle/src/queries.rs | 6 +- compiler/rustc_middle/src/ty/context.rs | 24 ++--- tests/incremental/hashes/enum_defs.rs | 10 +- tests/incremental/hashes/extern_mods.rs | 102 +++++++++--------- .../incremental/hashes/function_interfaces.rs | 16 +-- tests/incremental/hashes/inherent_impls.rs | 72 ++++++------- tests/incremental/hashes/statics.rs | 14 +-- tests/incremental/hashes/struct_defs.rs | 14 +-- tests/incremental/hashes/trait_defs.rs | 70 ++++++------ tests/incremental/hashes/trait_impls.rs | 46 ++++---- .../spans_significant_w_debuginfo.rs | 2 +- .../incremental/spans_significant_w_panic.rs | 2 +- 15 files changed, 277 insertions(+), 218 deletions(-) diff --git a/compiler/rustc_middle/src/arena.rs b/compiler/rustc_middle/src/arena.rs index e1abde88a9ef2..eef4d60d41dc1 100644 --- a/compiler/rustc_middle/src/arena.rs +++ b/compiler/rustc_middle/src/arena.rs @@ -119,7 +119,11 @@ macro_rules! arena_types { [] crate_inherent_impls: rustc_middle::ty::CrateInherentImpls, [] hir_owner_nodes: rustc_hir::OwnerNodes<'tcx>, [decode] token_stream: rustc_ast::tokenstream::TokenStream, - [] owner_info: rustc_hir::OwnerInfo<'tcx>, + [] maybe_owner: rustc_middle::hir::ProjectedMaybeOwner<'tcx>, + [] owner_info: rustc_middle::hir::ProjectedOwnerInfo<'tcx>, + [] parenting: rustc_hir::def_id::LocalDefIdMap, + [] trait_candidates: rustc_hir::ItemLocalMap<&'tcx [rustc_hir::TraitCandidate<'tcx>]>, + [] delayed_lints: rustc_hir::lints::DelayedLints, ]); ) } diff --git a/compiler/rustc_middle/src/hir/map.rs b/compiler/rustc_middle/src/hir/map.rs index c5c987b83af42..426fe5d2f0237 100644 --- a/compiler/rustc_middle/src/hir/map.rs +++ b/compiler/rustc_middle/src/hir/map.rs @@ -18,7 +18,7 @@ use rustc_hir_pretty as pprust_hir; use rustc_span::def_id::StableCrateId; use rustc_span::{ErrorGuaranteed, Ident, Span, Symbol, kw, with_metavar_spans}; -use crate::hir::{MaybeOwner, ModuleItems, nested_filter}; +use crate::hir::{ModuleItems, ProjectedMaybeOwner, nested_filter}; use crate::middle::debugger_visualizer::DebuggerVisualizerFile; use crate::query::{IntoQueryKey, LocalCrate}; use crate::ty::TyCtxt; @@ -105,25 +105,24 @@ impl<'tcx> TyCtxt<'tcx> { pub fn local_def_id_to_hir_id(self, def_id: impl IntoQueryKey) -> HirId { let def_id = def_id.into_query_key(); match self.owner(def_id) { - MaybeOwner::Owner(_) => HirId::make_owner(def_id), - MaybeOwner::NonOwner(hir_id) => hir_id, - MaybeOwner::Phantom => bug!("No HirId for {:?}", def_id), + ProjectedMaybeOwner::Owner(_) => HirId::make_owner(def_id), + ProjectedMaybeOwner::NonOwner(hir_id) => *hir_id, } } pub fn opt_ast_lowering_delayed_lints(self, id: OwnerId) -> Option<&'tcx DelayedLints> { - self.owner(id.def_id).as_owner().map(|o| &o.delayed_lints) + self.owner(id.def_id).as_owner().map(|o| o.delayed_lints) } pub fn in_scope_traits_map( self, id: OwnerId, ) -> Option<&'tcx ItemLocalMap<&'tcx [TraitCandidate<'tcx>]>> { - self.owner(id.def_id).as_owner().map(|owner_info| &owner_info.trait_map) + self.owner(id.def_id).as_owner().map(|owner_info| owner_info.trait_map) } pub fn opt_hir_owner_nodes(self, def_id: LocalDefId) -> Option<&'tcx OwnerNodes<'tcx>> { - self.owner(def_id).as_owner().map(|i| &i.nodes) + self.owner(def_id).as_owner().map(|i| i.nodes) } #[inline] diff --git a/compiler/rustc_middle/src/hir/mod.rs b/compiler/rustc_middle/src/hir/mod.rs index a361dd2a0e1da..f305345cae705 100644 --- a/compiler/rustc_middle/src/hir/mod.rs +++ b/compiler/rustc_middle/src/hir/mod.rs @@ -18,6 +18,7 @@ use rustc_data_structures::sync::{DynSend, DynSync, try_par_for_each_in}; use rustc_hir::def::{DefKind, Res}; use rustc_hir::def_id::{DefId, LocalDefId, LocalDefIdMap, LocalModDefId}; use rustc_hir::definitions::PerParentDisambiguatorState; +use rustc_hir::lints::DelayedLints; use rustc_hir::*; use rustc_index::IndexVec; use rustc_macros::{Decodable, Encodable, HashStable}; @@ -62,6 +63,27 @@ impl<'hir> Crate<'hir> { ) -> Crate<'hir> { Crate { owners, delayed_ids, delayed_resolver, opt_hir_hash } } + + /// Serves as an entry point for getting `MaybeOwner`. As owner can either be in + /// `owners` of `hir_crate` or it can be delayed AST owner (i.e., delegations) + /// we need to firstly check in `hir_crate` and then delayed AST owners. + /// This method can be invoked when not all delayed AST owners are lowered. + pub fn owner(&'hir self, tcx: TyCtxt<'hir>, def_id: LocalDefId) -> &'hir MaybeOwner<'hir> { + // Delayed LocalDefId can be in `self.owners` if there exists non-delayed LocalDefId + // which is greater than delayed LocalDefId, we use IndexVec for owners, + // so we will call ensure_contains_elem which will grow it. + if let Some(owner) = self.owners.get(def_id) + && (self.delayed_ids.is_empty() || !matches!(owner, MaybeOwner::Phantom)) + { + return owner; + } + + if self.delayed_ids.contains(&def_id) { + tcx.ensure_done().lower_delayed_owner(def_id); + } + + tcx.delayed_owner(def_id) + } } impl HashStable for Crate<'_> { @@ -439,33 +461,65 @@ pub struct Hashes { pub attrs_hash: Option, } -pub fn provide(providers: &mut Providers) { - providers.hir_crate_items = map::hir_crate_items; - providers.crate_hash = map::crate_hash; - providers.hir_module_items = map::hir_module_items; - providers.hir_attr_map = - |tcx, id| tcx.owner(id.def_id).as_owner().map_or(AttributeMap::EMPTY, |o| &o.attrs); - // Serves as an entry point for getting `MaybeOwner`. As owner can either be in - // `owners` of `hir_crate` or it can be delayed AST owner (i.e., delegations) - // we need to firstly check in `hir_crate` and then delayed AST owners. - // This method can be invoked when not all delayed AST owners are lowered. - providers.owner = |tcx, def_id| { - // Delayed LocalDefId can be in `self.owners` if there exists non-delayed LocalDefId - // which is greater than delayed LocalDefId, we use IndexVec for owners, - // so we will call ensure_contains_elem which will grow it. - let krate = tcx.hir_crate(()); - if let Some(owner) = krate.owners.get(def_id) - && (krate.delayed_ids.is_empty() || !matches!(owner, MaybeOwner::Phantom)) - { - return *owner; +#[derive(Debug, HashStable)] +pub struct ProjectedOwnerInfo<'tcx> { + /// Contents of the HIR. + pub nodes: &'tcx OwnerNodes<'tcx>, + + /// Map from each nested owner to its parent's local id. + #[stable_hasher(ignore)] + pub parenting: &'tcx LocalDefIdMap, + + /// Map indicating what traits are in scope for places where this + /// is relevant; generated by resolve. + pub trait_map: &'tcx ItemLocalMap<&'tcx [TraitCandidate<'tcx>]>, + + #[stable_hasher(ignore)] + pub delayed_lints: &'tcx DelayedLints, +} + +#[derive(Debug, HashStable)] +pub enum ProjectedMaybeOwner<'tcx> { + Owner(ProjectedOwnerInfo<'tcx>), + NonOwner(HirId), +} + +impl<'tcx> From<&'tcx MaybeOwner<'tcx>> for ProjectedMaybeOwner<'tcx> { + fn from(value: &'tcx MaybeOwner<'tcx>) -> Self { + match value { + MaybeOwner::Owner(o) => ProjectedMaybeOwner::Owner(ProjectedOwnerInfo { + nodes: &o.nodes, + parenting: &o.parenting, + trait_map: &o.trait_map, + delayed_lints: &o.delayed_lints, + }), + MaybeOwner::NonOwner(hir_id) => ProjectedMaybeOwner::NonOwner(*hir_id), + MaybeOwner::Phantom => panic!(), } + } +} - if krate.delayed_ids.contains(&def_id) { - tcx.ensure_done().lower_delayed_owner(def_id); +impl<'tcx> ProjectedMaybeOwner<'tcx> { + pub fn as_owner(&'tcx self) -> Option<&'tcx ProjectedOwnerInfo<'tcx>> { + match self { + ProjectedMaybeOwner::Owner(i) => Some(i), + ProjectedMaybeOwner::NonOwner(_) => None, } + } - tcx.delayed_owner(def_id) + pub fn unwrap(&'tcx self) -> &'tcx ProjectedOwnerInfo<'tcx> { + self.as_owner().unwrap_or_else(|| panic!("Not a HIR owner")) + } +} + +pub fn provide(providers: &mut Providers) { + providers.hir_crate_items = map::hir_crate_items; + providers.crate_hash = map::crate_hash; + providers.hir_module_items = map::hir_module_items; + providers.hir_attr_map = |tcx, id| { + tcx.hir_crate(()).owner(tcx, id.def_id).as_owner().map_or(AttributeMap::EMPTY, |o| &o.attrs) }; + providers.owner = |tcx, def_id| ProjectedMaybeOwner::from(tcx.hir_crate(()).owner(tcx, def_id)); providers.hir_owner_parent_q = |tcx, owner_id| tcx.hir_owner_parent_impl(owner_id); providers.def_span = |tcx, def_id| tcx.hir_span(tcx.local_def_id_to_hir_id(def_id)); providers.def_ident_span = |tcx, def_id| { diff --git a/compiler/rustc_middle/src/queries.rs b/compiler/rustc_middle/src/queries.rs index e8fcdce5776db..ecec6ebad54b1 100644 --- a/compiler/rustc_middle/src/queries.rs +++ b/compiler/rustc_middle/src/queries.rs @@ -216,13 +216,15 @@ rustc_queries! { desc { "lowering the delayed AST owner `{}`", tcx.def_path_str(def_id) } } - query owner(def_id: LocalDefId) -> hir::MaybeOwner<'tcx> { + query owner(def_id: LocalDefId) -> &'tcx rustc_middle::hir::ProjectedMaybeOwner<'tcx> { desc { "getting owner for `{}`", tcx.def_path_str(def_id) } + arena_cache feedable } - query delayed_owner(def_id: LocalDefId) -> hir::MaybeOwner<'tcx> { + query delayed_owner(def_id: LocalDefId) -> &'tcx hir::MaybeOwner<'tcx> { feedable + arena_cache desc { "getting child of lowered delayed AST owner `{}`", tcx.def_path_str(def_id) } } diff --git a/compiler/rustc_middle/src/ty/context.rs b/compiler/rustc_middle/src/ty/context.rs index e33e7a4e123db..362822ba77d78 100644 --- a/compiler/rustc_middle/src/ty/context.rs +++ b/compiler/rustc_middle/src/ty/context.rs @@ -36,9 +36,7 @@ use rustc_hir::definitions::{DefPathData, Definitions, PerParentDisambiguatorSta use rustc_hir::intravisit::VisitorExt; use rustc_hir::lang_items::LangItem; use rustc_hir::limit::Limit; -use rustc_hir::{ - self as hir, CRATE_HIR_ID, HirId, MaybeOwner, Node, OwnerInfo, TraitCandidate, find_attr, -}; +use rustc_hir::{self as hir, CRATE_HIR_ID, HirId, MaybeOwner, Node, TraitCandidate, find_attr}; use rustc_index::IndexVec; use rustc_macros::Diagnostic; use rustc_session::Session; @@ -57,6 +55,7 @@ use tracing::{debug, instrument}; use crate::arena::Arena; use crate::dep_graph::dep_node::make_metadata; use crate::dep_graph::{DepGraph, DepKindVTable, DepNodeIndex}; +use crate::hir::{ProjectedMaybeOwner, ProjectedOwnerInfo}; use crate::ich::StableHashingContext; use crate::infer::canonical::{CanonicalParamEnvCache, CanonicalVarKind}; use crate::lint::emit_lint_base; @@ -763,26 +762,27 @@ impl<'tcx> TyCtxtFeed<'tcx, LocalDefId> { pub fn feed_hir(&self) { let node = hir::OwnerNode::Synthetic; let bodies = Default::default(); - let attrs = hir::AttributeMap::EMPTY.clone(); + let attrs = hir::AttributeMap::EMPTY; let rustc_middle::hir::Hashes { opt_hash_including_bodies, .. } = self.tcx.hash_owner_nodes(node, &bodies, &attrs.map, attrs.define_opaque); let node = node.into(); - self.owner(hir::MaybeOwner::Owner(self.tcx.arena.alloc(OwnerInfo { - attrs, - nodes: hir::OwnerNodes { + self.owner(ProjectedMaybeOwner::Owner(ProjectedOwnerInfo { + nodes: self.tcx.arena.alloc(hir::OwnerNodes { opt_hash_including_bodies, nodes: IndexVec::from_elem_n( hir::ParentedNode { parent: hir::ItemLocalId::INVALID, node }, 1, ), bodies, - }, - parenting: Default::default(), - delayed_lints: Default::default(), - trait_map: Default::default(), - }))); + }), + parenting: self.tcx.arena.alloc(Default::default()), + delayed_lints: self.tcx.arena.alloc(Default::default()), + trait_map: self.tcx.arena.alloc(Default::default()), + })); + + self.feed_owner_id().hir_attr_map(attrs); } } diff --git a/tests/incremental/hashes/enum_defs.rs b/tests/incremental/hashes/enum_defs.rs index 91108ddc36205..401373a68e965 100644 --- a/tests/incremental/hashes/enum_defs.rs +++ b/tests/incremental/hashes/enum_defs.rs @@ -30,7 +30,7 @@ enum EnumVisibility { A } #[cfg(not(any(bpass1,bpass4)))] -#[rustc_clean(cfg="bpass2", except="owner")] +#[rustc_clean(cfg="bpass2")] #[rustc_clean(cfg="bpass3")] #[rustc_clean(cfg="bpass5", except="owner")] #[rustc_clean(cfg="bpass6")] @@ -373,9 +373,9 @@ enum EnumAddMustUse { } #[cfg(not(any(bpass1,bpass4)))] -#[rustc_clean(cfg="bpass2", except="owner")] +#[rustc_clean(cfg="bpass2")] #[rustc_clean(cfg="bpass3")] -#[rustc_clean(cfg="bpass5", except="owner")] +#[rustc_clean(cfg="bpass5")] #[rustc_clean(cfg="bpass6")] #[must_use] enum EnumAddMustUse { @@ -393,9 +393,9 @@ enum EnumAddReprC { } #[cfg(not(any(bpass1,bpass4)))] -#[rustc_clean(cfg="bpass2", except="type_of,owner")] +#[rustc_clean(cfg="bpass2", except="type_of")] #[rustc_clean(cfg="bpass3")] -#[rustc_clean(cfg="bpass5", except="type_of,owner")] +#[rustc_clean(cfg="bpass5", except="type_of")] #[rustc_clean(cfg="bpass6")] #[repr(C)] enum EnumAddReprC { diff --git a/tests/incremental/hashes/extern_mods.rs b/tests/incremental/hashes/extern_mods.rs index a2ed81a9e9d4e..79a3ff5a8a750 100644 --- a/tests/incremental/hashes/extern_mods.rs +++ b/tests/incremental/hashes/extern_mods.rs @@ -19,12 +19,12 @@ #![crate_type = "rlib"] // Change function name -------------------------------------------------------- -#[cfg(any(bpass1,bpass4))] +#[cfg(any(bpass1, bpass4))] extern "C" { pub fn change_function_name1(c: i64) -> i32; } -#[cfg(not(any(bpass1,bpass4)))] +#[cfg(not(any(bpass1, bpass4)))] #[rustc_clean(cfg = "bpass2", except = "owner")] #[rustc_clean(cfg = "bpass3")] #[rustc_clean(cfg = "bpass5", except = "owner")] @@ -34,102 +34,102 @@ extern "C" { } // Change parameter name ------------------------------------------------------- -#[cfg(any(bpass1,bpass4))] +#[cfg(any(bpass1, bpass4))] extern "C" { pub fn change_parameter_name(c: i64) -> i32; } -#[cfg(not(any(bpass1,bpass4)))] -#[rustc_clean(cfg="bpass2", except="owner")] +#[cfg(not(any(bpass1, bpass4)))] +#[rustc_clean(cfg = "bpass2")] #[rustc_clean(cfg = "bpass3")] -#[rustc_clean(cfg="bpass5", except="owner")] +#[rustc_clean(cfg = "bpass5")] #[rustc_clean(cfg = "bpass6")] extern "C" { pub fn change_parameter_name(d: i64) -> i32; } // Change parameter type ------------------------------------------------------- -#[cfg(any(bpass1,bpass4))] +#[cfg(any(bpass1, bpass4))] extern "C" { pub fn change_parameter_type(c: i64) -> i32; } -#[cfg(not(any(bpass1,bpass4)))] -#[rustc_clean(cfg="bpass2", except="owner")] +#[cfg(not(any(bpass1, bpass4)))] +#[rustc_clean(cfg = "bpass2")] #[rustc_clean(cfg = "bpass3")] -#[rustc_clean(cfg="bpass5", except="owner")] +#[rustc_clean(cfg = "bpass5")] #[rustc_clean(cfg = "bpass6")] extern "C" { pub fn change_parameter_type(c: i32) -> i32; } // Change return type ---------------------------------------------------------- -#[cfg(any(bpass1,bpass4))] +#[cfg(any(bpass1, bpass4))] extern "C" { pub fn change_return_type(c: i32) -> i32; } -#[cfg(not(any(bpass1,bpass4)))] -#[rustc_clean(cfg="bpass2", except="owner")] +#[cfg(not(any(bpass1, bpass4)))] +#[rustc_clean(cfg = "bpass2")] #[rustc_clean(cfg = "bpass3")] -#[rustc_clean(cfg="bpass5", except="owner")] +#[rustc_clean(cfg = "bpass5", except = "owner")] #[rustc_clean(cfg = "bpass6")] extern "C" { - pub fn change_return_type(c: i32) -> i8 ; + pub fn change_return_type(c: i32) -> i8; } // Add parameter --------------------------------------------------------------- -#[cfg(any(bpass1,bpass4))] +#[cfg(any(bpass1, bpass4))] extern "C" { - pub fn add_parameter(c: i32 ) -> i32; + pub fn add_parameter(c: i32) -> i32; } -#[cfg(not(any(bpass1,bpass4)))] -#[rustc_clean(cfg="bpass2", except="owner")] +#[cfg(not(any(bpass1, bpass4)))] +#[rustc_clean(cfg = "bpass2")] #[rustc_clean(cfg = "bpass3")] -#[rustc_clean(cfg="bpass5", except="owner")] +#[rustc_clean(cfg = "bpass5", except = "owner")] #[rustc_clean(cfg = "bpass6")] extern "C" { pub fn add_parameter(c: i32, d: i32) -> i32; } // Add return type ------------------------------------------------------------- -#[cfg(any(bpass1,bpass4))] +#[cfg(any(bpass1, bpass4))] extern "C" { - pub fn add_return_type(c: i32) ; + pub fn add_return_type(c: i32); } -#[cfg(not(any(bpass1,bpass4)))] -#[rustc_clean(cfg="bpass2", except="owner")] +#[cfg(not(any(bpass1, bpass4)))] +#[rustc_clean(cfg = "bpass2")] #[rustc_clean(cfg = "bpass3")] -#[rustc_clean(cfg="bpass5", except="owner")] +#[rustc_clean(cfg = "bpass5", except = "owner")] #[rustc_clean(cfg = "bpass6")] extern "C" { pub fn add_return_type(c: i32) -> i32; } // Make function variadic ------------------------------------------------------ -#[cfg(any(bpass1,bpass4))] +#[cfg(any(bpass1, bpass4))] extern "C" { - pub fn make_function_variadic(c: i32 ); + pub fn make_function_variadic(c: i32); } -#[cfg(not(any(bpass1,bpass4)))] -#[rustc_clean(cfg="bpass2", except="owner")] +#[cfg(not(any(bpass1, bpass4)))] +#[rustc_clean(cfg = "bpass2")] #[rustc_clean(cfg = "bpass3")] -#[rustc_clean(cfg="bpass5", except="owner")] +#[rustc_clean(cfg = "bpass5", except = "owner")] #[rustc_clean(cfg = "bpass6")] extern "C" { pub fn make_function_variadic(c: i32, ...); } // Change calling convention --------------------------------------------------- -#[cfg(any(bpass1,bpass4))] +#[cfg(any(bpass1, bpass4))] extern "C" { pub fn change_calling_convention(c: (i32,)); } -#[cfg(not(any(bpass1,bpass4)))] +#[cfg(not(any(bpass1, bpass4)))] #[rustc_clean(cfg = "bpass2", except = "owner")] #[rustc_clean(cfg = "bpass3")] #[rustc_clean(cfg = "bpass5", except = "owner")] @@ -139,27 +139,27 @@ extern "rust-call" { } // Make function public -------------------------------------------------------- -#[cfg(any(bpass1,bpass4))] +#[cfg(any(bpass1, bpass4))] extern "C" { - fn make_function_public(c: i32); + fn make_function_public(c: i32); } -#[cfg(not(any(bpass1,bpass4)))] -#[rustc_clean(cfg="bpass2", except="owner")] +#[cfg(not(any(bpass1, bpass4)))] +#[rustc_clean(cfg = "bpass2")] #[rustc_clean(cfg = "bpass3")] -#[rustc_clean(cfg="bpass5", except="owner")] +#[rustc_clean(cfg = "bpass5", except = "owner")] #[rustc_clean(cfg = "bpass6")] extern "C" { pub fn make_function_public(c: i32); } // Add function ---------------------------------------------------------------- -#[cfg(any(bpass1,bpass4))] +#[cfg(any(bpass1, bpass4))] extern "C" { pub fn add_function1(c: i32); } -#[cfg(not(any(bpass1,bpass4)))] +#[cfg(not(any(bpass1, bpass4)))] #[rustc_clean(cfg = "bpass2", except = "owner")] #[rustc_clean(cfg = "bpass3")] #[rustc_clean(cfg = "bpass5", except = "owner")] @@ -170,16 +170,16 @@ extern "C" { } // Change link-name ------------------------------------------------------------ -#[cfg(any(bpass1,bpass4))] +#[cfg(any(bpass1, bpass4))] #[link(name = "foo")] extern "C" { pub fn change_link_name(c: i32); } -#[cfg(not(any(bpass1,bpass4)))] -#[rustc_clean(cfg="bpass2", except="owner")] +#[cfg(not(any(bpass1, bpass4)))] +#[rustc_clean(cfg = "bpass2")] #[rustc_clean(cfg = "bpass3")] -#[rustc_clean(cfg="bpass5", except="owner")] +#[rustc_clean(cfg = "bpass5")] #[rustc_clean(cfg = "bpass6")] #[link(name = "bar")] extern "C" { @@ -191,14 +191,14 @@ type c_i64 = i64; // Indirectly change parameter type -------------------------------------------- mod indirectly_change_parameter_type { - #[cfg(any(bpass1,bpass4))] + #[cfg(any(bpass1, bpass4))] use super::c_i32 as c_int; - #[cfg(not(any(bpass1,bpass4)))] + #[cfg(not(any(bpass1, bpass4)))] use super::c_i64 as c_int; - #[rustc_clean(cfg="bpass2")] + #[rustc_clean(cfg = "bpass2")] #[rustc_clean(cfg = "bpass3")] - #[rustc_clean(cfg="bpass5")] + #[rustc_clean(cfg = "bpass5")] #[rustc_clean(cfg = "bpass6")] extern "C" { pub fn indirectly_change_parameter_type(c: c_int); @@ -207,14 +207,14 @@ mod indirectly_change_parameter_type { // Indirectly change return type -------------------------------------------- mod indirectly_change_return_type { - #[cfg(any(bpass1,bpass4))] + #[cfg(any(bpass1, bpass4))] use super::c_i32 as c_int; - #[cfg(not(any(bpass1,bpass4)))] + #[cfg(not(any(bpass1, bpass4)))] use super::c_i64 as c_int; - #[rustc_clean(cfg="bpass2")] + #[rustc_clean(cfg = "bpass2")] #[rustc_clean(cfg = "bpass3")] - #[rustc_clean(cfg="bpass5")] + #[rustc_clean(cfg = "bpass5")] #[rustc_clean(cfg = "bpass6")] extern "C" { pub fn indirectly_change_return_type() -> c_int; diff --git a/tests/incremental/hashes/function_interfaces.rs b/tests/incremental/hashes/function_interfaces.rs index 64beeb2c8c19a..921c492ca9a26 100644 --- a/tests/incremental/hashes/function_interfaces.rs +++ b/tests/incremental/hashes/function_interfaces.rs @@ -248,9 +248,9 @@ pub fn second_lifetime_bound<'a, 'b, T: 'a + 'b>() {} pub fn inline() {} #[cfg(not(any(bpass1,bpass4)))] -#[rustc_clean(cfg="bpass2", except="owner")] +#[rustc_clean(cfg="bpass2")] #[rustc_clean(cfg = "bpass3")] -#[rustc_clean(cfg="bpass5", except="owner")] +#[rustc_clean(cfg="bpass5")] #[rustc_clean(cfg = "bpass6")] #[inline] pub fn inline() {} @@ -262,9 +262,9 @@ pub fn inline() {} pub fn inline_never() {} #[cfg(not(any(bpass1,bpass4)))] -#[rustc_clean(cfg="bpass2", except="owner")] +#[rustc_clean(cfg="bpass2")] #[rustc_clean(cfg = "bpass3")] -#[rustc_clean(cfg="bpass5", except="owner")] +#[rustc_clean(cfg="bpass5")] #[rustc_clean(cfg = "bpass6")] #[inline(never)] pub fn inline_never() {} @@ -275,9 +275,9 @@ pub fn inline_never() {} pub fn no_mangle() {} #[cfg(not(any(bpass1,bpass4)))] -#[rustc_clean(cfg="bpass2", except="owner")] +#[rustc_clean(cfg="bpass2")] #[rustc_clean(cfg = "bpass3")] -#[rustc_clean(cfg="bpass5", except="owner")] +#[rustc_clean(cfg="bpass5")] #[rustc_clean(cfg = "bpass6")] #[unsafe(no_mangle)] pub fn no_mangle() {} @@ -288,9 +288,9 @@ pub fn no_mangle() {} pub fn linkage() {} #[cfg(not(any(bpass1,bpass4)))] -#[rustc_clean(cfg="bpass2", except="owner")] +#[rustc_clean(cfg="bpass2")] #[rustc_clean(cfg = "bpass3")] -#[rustc_clean(cfg="bpass5", except="owner")] +#[rustc_clean(cfg="bpass5")] #[rustc_clean(cfg = "bpass6")] #[linkage = "weak_odr"] pub fn linkage() {} diff --git a/tests/incremental/hashes/inherent_impls.rs b/tests/incremental/hashes/inherent_impls.rs index eb5bc9c51f542..c6986df7754df 100644 --- a/tests/incremental/hashes/inherent_impls.rs +++ b/tests/incremental/hashes/inherent_impls.rs @@ -52,7 +52,7 @@ impl Foo { } #[cfg(not(any(bpass1,bpass4)))] -#[rustc_clean(cfg="bpass2", except="owner")] +#[rustc_clean(cfg="bpass2")] #[rustc_clean(cfg="bpass3")] #[rustc_clean(except="owner", cfg="bpass5")] #[rustc_clean(cfg="bpass6")] @@ -83,7 +83,7 @@ impl Foo { } #[cfg(not(any(bpass1,bpass4)))] -#[rustc_clean(cfg="bpass2", except="owner")] +#[rustc_clean(cfg="bpass2")] #[rustc_clean(cfg="bpass3")] #[rustc_clean(except="owner", cfg="bpass5")] #[rustc_clean(cfg="bpass6")] @@ -110,12 +110,12 @@ impl Foo { } #[cfg(not(any(bpass1,bpass4)))] -#[rustc_clean(cfg="bpass2", except="owner")] +#[rustc_clean(cfg="bpass2")] #[rustc_clean(cfg="bpass3")] #[rustc_clean(cfg="bpass5", except="owner")] #[rustc_clean(cfg="bpass6")] impl Foo { - #[rustc_clean(cfg="bpass2", except="owner")] + #[rustc_clean(cfg="bpass2")] #[rustc_clean(cfg="bpass3")] #[rustc_clean(cfg="bpass5", except="owner")] #[rustc_clean(cfg="bpass6")] @@ -139,7 +139,7 @@ impl Foo { } #[cfg(not(any(bpass1,bpass4)))] -#[rustc_clean(cfg="bpass2", except="owner")] +#[rustc_clean(cfg="bpass2")] #[rustc_clean(cfg="bpass3")] #[rustc_clean(cfg="bpass5", except="owner")] #[rustc_clean(cfg="bpass6")] @@ -168,7 +168,7 @@ impl Foo { } #[cfg(not(any(bpass1,bpass4)))] -#[rustc_clean(cfg="bpass2", except="owner")] +#[rustc_clean(cfg="bpass2")] #[rustc_clean(cfg="bpass3")] #[rustc_clean(except="owner", cfg="bpass5")] #[rustc_clean(cfg="bpass6")] @@ -194,9 +194,9 @@ impl Foo { #[rustc_clean(cfg="bpass5", except="owner,associated_item_def_ids")] #[rustc_clean(cfg="bpass6")] impl Foo { - #[rustc_clean(cfg="bpass2", except="owner")] + #[rustc_clean(cfg="bpass2")] #[rustc_clean(cfg="bpass3")] - #[rustc_clean(cfg="bpass5", except="owner")] + #[rustc_clean(cfg="bpass5")] #[rustc_clean(cfg="bpass6")] pub fn add_method_to_impl1(&self) { } @@ -218,7 +218,7 @@ impl Foo { } #[cfg(not(any(bpass1,bpass4)))] -#[rustc_clean(cfg="bpass2", except="owner")] +#[rustc_clean(cfg="bpass2")] #[rustc_clean(cfg="bpass3")] #[rustc_clean(except="owner", cfg="bpass5")] #[rustc_clean(cfg="bpass6")] @@ -243,7 +243,7 @@ impl Foo { } #[cfg(not(any(bpass1,bpass4)))] -#[rustc_clean(cfg="bpass2", except="owner")] +#[rustc_clean(cfg="bpass2")] #[rustc_clean(cfg="bpass3")] #[rustc_clean(cfg="bpass5", except="owner")] #[rustc_clean(cfg="bpass6")] @@ -268,7 +268,7 @@ impl Foo { } #[cfg(not(any(bpass1,bpass4)))] -#[rustc_clean(cfg="bpass2", except="owner")] +#[rustc_clean(cfg="bpass2")] #[rustc_clean(cfg="bpass3")] #[rustc_clean(except="owner", cfg="bpass5")] #[rustc_clean(cfg="bpass6")] @@ -294,14 +294,14 @@ impl Foo { } #[cfg(not(any(bpass1,bpass4)))] -#[rustc_clean(cfg="bpass2", except="owner")] +#[rustc_clean(cfg="bpass2")] #[rustc_clean(cfg="bpass3")] -#[rustc_clean(cfg="bpass5", except="owner")] +#[rustc_clean(cfg="bpass5")] #[rustc_clean(cfg="bpass6")] impl Foo { - #[rustc_clean(cfg="bpass2", except="owner")] + #[rustc_clean(cfg="bpass2")] #[rustc_clean(cfg="bpass3")] - #[rustc_clean(cfg="bpass5", except="owner")] + #[rustc_clean(cfg="bpass5")] #[rustc_clean(cfg="bpass6")] #[inline] pub fn make_method_inline(&self) -> u8 { 0 } @@ -320,7 +320,7 @@ impl Foo { } #[cfg(not(any(bpass1,bpass4)))] -#[rustc_clean(cfg="bpass2", except="owner")] +#[rustc_clean(cfg="bpass2")] #[rustc_clean(cfg="bpass3")] #[rustc_clean(cfg="bpass5", except="owner")] #[rustc_clean(cfg="bpass6")] @@ -345,7 +345,7 @@ impl Foo { } #[cfg(not(any(bpass1,bpass4)))] -#[rustc_clean(cfg="bpass2", except="owner")] +#[rustc_clean(cfg="bpass2")] #[rustc_clean(cfg="bpass3")] #[rustc_clean(except="owner", cfg="bpass5")] #[rustc_clean(cfg="bpass6")] @@ -370,7 +370,7 @@ impl Foo { } #[cfg(not(any(bpass1,bpass4)))] -#[rustc_clean(cfg="bpass2", except="owner")] +#[rustc_clean(cfg="bpass2")] #[rustc_clean(cfg="bpass3")] #[rustc_clean(except="owner", cfg="bpass5")] #[rustc_clean(cfg="bpass6")] @@ -395,7 +395,7 @@ impl Foo { } #[cfg(not(any(bpass1,bpass4)))] -#[rustc_clean(cfg="bpass2", except="owner")] +#[rustc_clean(cfg="bpass2")] #[rustc_clean(cfg="bpass3")] #[rustc_clean(except="owner", cfg="bpass5")] #[rustc_clean(cfg="bpass6")] @@ -429,7 +429,7 @@ impl Foo { } #[cfg(not(any(bpass1,bpass4)))] -#[rustc_clean(cfg="bpass2", except="owner")] +#[rustc_clean(cfg="bpass2")] #[rustc_clean(cfg="bpass3")] #[rustc_clean(except="owner", cfg="bpass5")] #[rustc_clean(cfg="bpass6")] @@ -478,7 +478,7 @@ impl Foo { } #[cfg(not(any(bpass1,bpass4)))] -#[rustc_clean(cfg="bpass2", except="owner")] +#[rustc_clean(cfg="bpass2")] #[rustc_clean(cfg="bpass3")] #[rustc_clean(except="owner", cfg="bpass5")] #[rustc_clean(cfg="bpass6")] @@ -524,7 +524,7 @@ impl Foo { } #[cfg(not(any(bpass1,bpass4)))] -#[rustc_clean(cfg="bpass2", except="owner")] +#[rustc_clean(cfg="bpass2")] #[rustc_clean(cfg="bpass3")] #[rustc_clean(cfg="bpass5", except="owner")] #[rustc_clean(cfg="bpass6")] @@ -570,7 +570,7 @@ impl Foo { } #[cfg(not(any(bpass1,bpass4)))] -#[rustc_clean(cfg="bpass2", except="owner")] +#[rustc_clean(cfg="bpass2")] #[rustc_clean(cfg="bpass3")] #[rustc_clean(except="owner", cfg="bpass5")] #[rustc_clean(cfg="bpass6")] @@ -619,7 +619,7 @@ impl Foo { } #[cfg(not(any(bpass1,bpass4)))] -#[rustc_clean(cfg="bpass2", except="owner")] +#[rustc_clean(cfg="bpass2")] #[rustc_clean(cfg="bpass3")] #[rustc_clean(except="owner", cfg="bpass5")] #[rustc_clean(cfg="bpass6")] @@ -654,14 +654,14 @@ impl Foo { } #[cfg(not(any(bpass1,bpass4)))] -#[rustc_clean(cfg="bpass2", except="owner")] +#[rustc_clean(cfg="bpass2")] #[rustc_clean(cfg="bpass3")] -#[rustc_clean(cfg="bpass5", except="owner")] +#[rustc_clean(cfg="bpass5")] #[rustc_clean(cfg="bpass6")] impl Foo { - #[rustc_clean(cfg="bpass2", except="owner")] + #[rustc_clean(cfg="bpass2")] #[rustc_clean(cfg="bpass3")] - #[rustc_clean(cfg="bpass5", except="owner")] + #[rustc_clean(cfg="bpass5")] #[rustc_clean(cfg="bpass6")] #[unsafe(no_mangle)] pub fn add_no_mangle_to_method(&self) { } @@ -685,12 +685,12 @@ impl Bar { impl Bar { #[rustc_clean( cfg="bpass2", - except="generics_of,fn_sig,typeck_root,type_of,optimized_mir,owner" + except="generics_of,fn_sig,typeck_root,type_of,optimized_mir" )] #[rustc_clean(cfg="bpass3")] #[rustc_clean( cfg="bpass5", - except="generics_of,fn_sig,typeck_root,type_of,optimized_mir,owner" + except="generics_of,fn_sig,typeck_root,type_of,optimized_mir" )] #[rustc_clean(cfg="bpass6")] pub fn add_type_parameter_to_impl(&self) { } @@ -710,9 +710,9 @@ impl Bar { #[rustc_clean(cfg="bpass5", except="owner")] #[rustc_clean(cfg="bpass6")] impl Bar { - #[rustc_clean(cfg="bpass2", except="fn_sig,optimized_mir,typeck_root,owner")] + #[rustc_clean(cfg="bpass2", except="fn_sig,optimized_mir,typeck_root")] #[rustc_clean(cfg="bpass3")] - #[rustc_clean(cfg="bpass5", except="fn_sig,optimized_mir,typeck_root,owner")] + #[rustc_clean(cfg="bpass5", except="fn_sig,optimized_mir,typeck_root")] #[rustc_clean(cfg="bpass6")] pub fn change_impl_self_type(&self) { } } @@ -731,9 +731,9 @@ impl Bar { #[rustc_clean(cfg="bpass5", except="owner")] #[rustc_clean(cfg="bpass6")] impl Bar { - #[rustc_clean(cfg="bpass2", except="owner")] + #[rustc_clean(cfg="bpass2")] #[rustc_clean(cfg="bpass3")] - #[rustc_clean(cfg="bpass5", except="owner")] + #[rustc_clean(cfg="bpass5")] #[rustc_clean(cfg="bpass6")] pub fn add_lifetime_bound_to_impl_parameter(&self) { } } @@ -752,9 +752,9 @@ impl Bar { #[rustc_clean(cfg="bpass5", except="owner")] #[rustc_clean(cfg="bpass6")] impl Bar { - #[rustc_clean(cfg="bpass2", except="owner")] + #[rustc_clean(cfg="bpass2")] #[rustc_clean(cfg="bpass3")] - #[rustc_clean(cfg="bpass5", except="owner")] + #[rustc_clean(cfg="bpass5")] #[rustc_clean(cfg="bpass6")] pub fn add_trait_bound_to_impl_parameter(&self) { } } diff --git a/tests/incremental/hashes/statics.rs b/tests/incremental/hashes/statics.rs index 8767d9804e3ec..fa15c9cd994ff 100644 --- a/tests/incremental/hashes/statics.rs +++ b/tests/incremental/hashes/statics.rs @@ -25,7 +25,7 @@ static STATIC_VISIBILITY: u8 = 0; #[cfg(not(any(bpass1,bpass4)))] -#[rustc_clean(cfg="bpass2", except="owner")] +#[rustc_clean(cfg="bpass2")] #[rustc_clean(cfg="bpass3")] #[rustc_clean(cfg="bpass5", except="owner")] #[rustc_clean(cfg="bpass6")] @@ -49,9 +49,9 @@ static mut STATIC_MUTABILITY: u8 = 0; static STATIC_LINKAGE: u8 = 0; #[cfg(not(any(bpass1,bpass4)))] -#[rustc_clean(cfg="bpass2", except="owner")] +#[rustc_clean(cfg="bpass2")] #[rustc_clean(cfg="bpass3")] -#[rustc_clean(cfg="bpass5", except="owner")] +#[rustc_clean(cfg="bpass5")] #[rustc_clean(cfg="bpass6")] #[linkage="weak_odr"] static STATIC_LINKAGE: u8 = 0; @@ -62,9 +62,9 @@ static STATIC_LINKAGE: u8 = 0; static STATIC_NO_MANGLE: u8 = 0; #[cfg(not(any(bpass1,bpass4)))] -#[rustc_clean(cfg="bpass2", except="owner")] +#[rustc_clean(cfg="bpass2")] #[rustc_clean(cfg="bpass3")] -#[rustc_clean(cfg="bpass5", except="owner")] +#[rustc_clean(cfg="bpass5")] #[rustc_clean(cfg="bpass6")] #[unsafe(no_mangle)] static STATIC_NO_MANGLE: u8 = 0; @@ -75,9 +75,9 @@ static STATIC_NO_MANGLE: u8 = 0; static STATIC_THREAD_LOCAL: u8 = 0; #[cfg(not(any(bpass1,bpass4)))] -#[rustc_clean(cfg="bpass2", except="owner")] +#[rustc_clean(cfg="bpass2")] #[rustc_clean(cfg="bpass3")] -#[rustc_clean(cfg="bpass5", except="owner")] +#[rustc_clean(cfg="bpass5")] #[rustc_clean(cfg="bpass6")] #[thread_local] static STATIC_THREAD_LOCAL: u8 = 0; diff --git a/tests/incremental/hashes/struct_defs.rs b/tests/incremental/hashes/struct_defs.rs index e432aea049a60..78fd7973b8222 100644 --- a/tests/incremental/hashes/struct_defs.rs +++ b/tests/incremental/hashes/struct_defs.rs @@ -27,9 +27,9 @@ pub struct LayoutPacked; #[cfg(not(any(bpass1,bpass4)))] -#[rustc_clean(except="type_of,owner", cfg="bpass2")] +#[rustc_clean(except="type_of", cfg="bpass2")] #[rustc_clean(cfg="bpass3")] -#[rustc_clean(except="type_of,owner", cfg="bpass5")] +#[rustc_clean(except="type_of", cfg="bpass5")] #[rustc_clean(cfg="bpass6")] #[repr(packed)] pub struct LayoutPacked; @@ -38,9 +38,9 @@ pub struct LayoutPacked; struct LayoutC; #[cfg(not(any(bpass1,bpass4)))] -#[rustc_clean(except="type_of,owner", cfg="bpass2")] +#[rustc_clean(except="type_of", cfg="bpass2")] #[rustc_clean(cfg="bpass3")] -#[rustc_clean(except="type_of,owner", cfg="bpass5")] +#[rustc_clean(except="type_of", cfg="bpass5")] #[rustc_clean(cfg="bpass6")] #[repr(C)] struct LayoutC; @@ -85,7 +85,7 @@ struct TupleStructAddField( struct TupleStructFieldVisibility( char); #[cfg(not(any(bpass1,bpass4)))] -#[rustc_clean(cfg="bpass2,owner", except="type_of")] +#[rustc_clean(cfg="bpass2", except="type_of")] #[rustc_clean(cfg="bpass3")] #[rustc_clean(cfg="bpass5", except="owner,type_of")] #[rustc_clean(cfg="bpass6")] @@ -143,7 +143,7 @@ struct RecordStructAddField { struct RecordStructFieldVisibility { x: f32 } #[cfg(not(any(bpass1,bpass4)))] -#[rustc_clean(cfg="bpass2,owner", except="type_of")] +#[rustc_clean(cfg="bpass2", except="type_of")] #[rustc_clean(cfg="bpass3")] #[rustc_clean(cfg="bpass5", except="owner,type_of")] #[rustc_clean(cfg="bpass6")] @@ -256,7 +256,7 @@ pub struct EmptyStruct; struct Visibility; #[cfg(not(any(bpass1,bpass4)))] -#[rustc_clean(cfg="bpass2", except="owner")] +#[rustc_clean(cfg="bpass2")] #[rustc_clean(cfg="bpass3")] #[rustc_clean(cfg="bpass5", except="owner")] #[rustc_clean(cfg="bpass6")] diff --git a/tests/incremental/hashes/trait_defs.rs b/tests/incremental/hashes/trait_defs.rs index cda5cef1bd9b0..c5cb8fb5589cc 100644 --- a/tests/incremental/hashes/trait_defs.rs +++ b/tests/incremental/hashes/trait_defs.rs @@ -29,7 +29,7 @@ trait TraitVisibility { } #[cfg(not(any(bpass1,bpass4)))] -#[rustc_clean(cfg="bpass2", except="owner")] +#[rustc_clean(cfg="bpass2")] #[rustc_clean(cfg="bpass3")] #[rustc_clean(cfg="bpass5", except="owner,predicates_of")] #[rustc_clean(cfg="bpass6")] @@ -94,7 +94,7 @@ trait TraitAddReturnType { } #[cfg(not(any(bpass1,bpass4)))] -#[rustc_clean(cfg="bpass2", except="owner")] +#[rustc_clean(cfg="bpass2")] #[rustc_clean(cfg="bpass3")] #[rustc_clean(cfg="bpass5", except="owner,predicates_of")] #[rustc_clean(cfg="bpass6")] @@ -119,7 +119,7 @@ trait TraitChangeReturnType { } #[cfg(not(any(bpass1,bpass4)))] -#[rustc_clean(cfg="bpass2", except="owner")] +#[rustc_clean(cfg="bpass2")] #[rustc_clean(cfg="bpass3")] #[rustc_clean(cfg="bpass5", except="owner,predicates_of")] #[rustc_clean(cfg="bpass6")] @@ -144,7 +144,7 @@ trait TraitAddParameterToMethod { } #[cfg(not(any(bpass1,bpass4)))] -#[rustc_clean(cfg="bpass2", except="owner")] +#[rustc_clean(cfg="bpass2")] #[rustc_clean(cfg="bpass3")] #[rustc_clean(cfg="bpass5", except="owner,predicates_of")] #[rustc_clean(cfg="bpass6")] @@ -176,7 +176,7 @@ trait TraitChangeMethodParameterName { } #[cfg(not(any(bpass1,bpass4)))] -#[rustc_clean(cfg="bpass2", except="owner")] +#[rustc_clean(cfg="bpass2")] #[rustc_clean(cfg="bpass3")] #[rustc_clean(cfg="bpass5", except="owner,predicates_of")] #[rustc_clean(cfg="bpass6")] @@ -208,7 +208,7 @@ trait TraitChangeMethodParameterType { } #[cfg(not(any(bpass1,bpass4)))] -#[rustc_clean(cfg="bpass2", except="owner")] +#[rustc_clean(cfg="bpass2")] #[rustc_clean(cfg="bpass3")] #[rustc_clean(cfg="bpass5", except="owner,predicates_of")] #[rustc_clean(cfg="bpass6")] @@ -233,7 +233,7 @@ trait TraitChangeMethodParameterTypeRef { } #[cfg(not(any(bpass1,bpass4)))] -#[rustc_clean(cfg="bpass2", except="owner")] +#[rustc_clean(cfg="bpass2")] #[rustc_clean(cfg="bpass3")] #[rustc_clean(cfg="bpass5", except="owner,predicates_of")] #[rustc_clean(cfg="bpass6")] @@ -258,7 +258,7 @@ trait TraitChangeMethodParametersOrder { } #[cfg(not(any(bpass1,bpass4)))] -#[rustc_clean(cfg="bpass2", except="owner")] +#[rustc_clean(cfg="bpass2")] #[rustc_clean(cfg="bpass3")] #[rustc_clean(cfg="bpass5", except="owner,predicates_of")] #[rustc_clean(cfg="bpass6")] @@ -283,7 +283,7 @@ trait TraitAddMethodAutoImplementation { } #[cfg(not(any(bpass1,bpass4)))] -#[rustc_clean(cfg="bpass2", except="owner")] +#[rustc_clean(cfg="bpass2")] #[rustc_clean(cfg="bpass3")] #[rustc_clean(cfg="bpass5", except="owner,predicates_of")] #[rustc_clean(cfg="bpass6")] @@ -327,7 +327,7 @@ trait TraitChangeModeSelfRefToMut { } #[cfg(not(any(bpass1,bpass4)))] -#[rustc_clean(cfg="bpass2", except="owner")] +#[rustc_clean(cfg="bpass2")] #[rustc_clean(cfg="bpass3")] #[rustc_clean(cfg="bpass5", except="owner,predicates_of")] #[rustc_clean(cfg="bpass6")] @@ -351,7 +351,7 @@ trait TraitChangeModeSelfOwnToMut: Sized { } #[cfg(not(any(bpass1,bpass4)))] -#[rustc_clean(cfg="bpass2", except="owner")] +#[rustc_clean(cfg="bpass2")] #[rustc_clean(cfg="bpass3")] #[rustc_clean(except="owner", cfg="bpass5")] #[rustc_clean(cfg="bpass6")] @@ -375,7 +375,7 @@ trait TraitChangeModeSelfOwnToRef { } #[cfg(not(any(bpass1,bpass4)))] -#[rustc_clean(cfg="bpass2", except="owner")] +#[rustc_clean(cfg="bpass2")] #[rustc_clean(cfg="bpass3")] #[rustc_clean(cfg="bpass5", except="owner,predicates_of")] #[rustc_clean(cfg="bpass6")] @@ -400,7 +400,7 @@ trait TraitAddUnsafeModifier { } #[cfg(not(any(bpass1,bpass4)))] -#[rustc_clean(cfg="bpass2", except="owner")] +#[rustc_clean(cfg="bpass2")] #[rustc_clean(cfg="bpass3")] #[rustc_clean(cfg="bpass5", except="owner,predicates_of")] #[rustc_clean(cfg="bpass6")] @@ -425,7 +425,7 @@ trait TraitAddExternModifier { } #[cfg(not(any(bpass1,bpass4)))] -#[rustc_clean(cfg="bpass2", except="owner")] +#[rustc_clean(cfg="bpass2")] #[rustc_clean(cfg="bpass3")] #[rustc_clean(cfg="bpass5", except="owner,predicates_of")] #[rustc_clean(cfg="bpass6")] @@ -450,7 +450,7 @@ trait TraitChangeExternCToExternSystem { } #[cfg(not(any(bpass1,bpass4)))] -#[rustc_clean(cfg="bpass2", except="owner")] +#[rustc_clean(cfg="bpass2")] #[rustc_clean(cfg="bpass3")] #[rustc_clean(cfg="bpass5", except="owner,predicates_of")] #[rustc_clean(cfg="bpass6")] @@ -477,7 +477,7 @@ trait TraitAddTypeParameterToMethod { } #[cfg(not(any(bpass1,bpass4)))] -#[rustc_clean(cfg="bpass2", except="owner")] +#[rustc_clean(cfg="bpass2")] #[rustc_clean(cfg="bpass3")] #[rustc_clean(cfg="bpass5", except="owner,predicates_of")] #[rustc_clean(cfg="bpass6")] @@ -504,7 +504,7 @@ trait TraitAddLifetimeParameterToMethod { } #[cfg(not(any(bpass1,bpass4)))] -#[rustc_clean(cfg="bpass2", except="owner")] +#[rustc_clean(cfg="bpass2")] #[rustc_clean(cfg="bpass3")] #[rustc_clean(cfg="bpass5", except="owner,predicates_of")] #[rustc_clean(cfg="bpass6")] @@ -533,7 +533,7 @@ trait TraitAddTraitBoundToMethodTypeParameter { } #[cfg(not(any(bpass1,bpass4)))] -#[rustc_clean(cfg="bpass2", except="owner")] +#[rustc_clean(cfg="bpass2")] #[rustc_clean(cfg="bpass3")] #[rustc_clean(cfg="bpass5", except="owner,predicates_of")] #[rustc_clean(cfg="bpass6")] @@ -558,7 +558,7 @@ trait TraitAddBuiltinBoundToMethodTypeParameter { } #[cfg(not(any(bpass1,bpass4)))] -#[rustc_clean(cfg="bpass2", except="owner")] +#[rustc_clean(cfg="bpass2")] #[rustc_clean(cfg="bpass3")] #[rustc_clean(except="owner,predicates_of", cfg="bpass5")] #[rustc_clean(cfg="bpass6")] @@ -589,7 +589,7 @@ trait TraitAddLifetimeBoundToMethodLifetimeParameter { } #[cfg(not(any(bpass1,bpass4)))] -#[rustc_clean(cfg="bpass2", except="owner")] +#[rustc_clean(cfg="bpass2")] #[rustc_clean(cfg="bpass3")] #[rustc_clean(cfg="bpass5", except="owner,predicates_of")] #[rustc_clean(cfg="bpass6")] @@ -620,7 +620,7 @@ trait TraitAddSecondTraitBoundToMethodTypeParameter { } #[cfg(not(any(bpass1,bpass4)))] -#[rustc_clean(cfg="bpass2", except="owner")] +#[rustc_clean(cfg="bpass2")] #[rustc_clean(cfg="bpass3")] #[rustc_clean(cfg="bpass5", except="owner,predicates_of")] #[rustc_clean(cfg="bpass6")] @@ -645,7 +645,7 @@ trait TraitAddSecondBuiltinBoundToMethodTypeParameter { } #[cfg(not(any(bpass1,bpass4)))] -#[rustc_clean(cfg="bpass2", except="owner")] +#[rustc_clean(cfg="bpass2")] #[rustc_clean(cfg="bpass3")] #[rustc_clean(cfg="bpass5", except="owner,predicates_of")] #[rustc_clean(cfg="bpass6")] @@ -676,7 +676,7 @@ trait TraitAddSecondLifetimeBoundToMethodLifetimeParameter { } #[cfg(not(any(bpass1,bpass4)))] -#[rustc_clean(cfg="bpass2", except="owner")] +#[rustc_clean(cfg="bpass2")] #[rustc_clean(cfg="bpass3")] #[rustc_clean(cfg="bpass5", except="owner,predicates_of")] #[rustc_clean(cfg="bpass6")] @@ -713,16 +713,16 @@ trait TraitAddAssociatedType { #[cfg(not(any(bpass1,bpass4)))] #[rustc_clean(except="owner,associated_item_def_ids", cfg="bpass2")] #[rustc_clean(cfg="bpass3")] -#[rustc_clean(except="owner,associated_item_def_ids,predicates_of", cfg="bpass5")] +#[rustc_clean(except="associated_item_def_ids,owner", cfg="bpass5")] #[rustc_clean(cfg="bpass6")] trait TraitAddAssociatedType { #[rustc_clean(cfg="bpass3")] #[rustc_clean(cfg="bpass6")] type Associated; - #[rustc_clean(cfg="bpass2", except="owner")] + #[rustc_clean(cfg="bpass2")] #[rustc_clean(cfg="bpass3")] - #[rustc_clean(cfg="bpass5", except="owner")] + #[rustc_clean(cfg="bpass5")] #[rustc_clean(cfg="bpass6")] fn method(); } @@ -745,7 +745,7 @@ trait TraitAddTraitBoundToAssociatedType { // Apparently the type bound contributes to the predicates of the trait, but // does not change the associated item itself. #[cfg(not(any(bpass1,bpass4)))] -#[rustc_clean(cfg="bpass2", except="owner")] +#[rustc_clean(cfg="bpass2")] #[rustc_clean(cfg="bpass3")] #[rustc_clean(cfg="bpass5", except="owner,predicates_of")] #[rustc_clean(cfg="bpass6")] @@ -774,7 +774,7 @@ trait TraitAddLifetimeBoundToAssociatedType<'a> { } #[cfg(not(any(bpass1,bpass4)))] -#[rustc_clean(cfg="bpass2", except="owner")] +#[rustc_clean(cfg="bpass2")] #[rustc_clean(cfg="bpass3")] #[rustc_clean(cfg="bpass5", except="owner,predicates_of")] #[rustc_clean(cfg="bpass6")] @@ -803,7 +803,7 @@ trait TraitAddDefaultToAssociatedType { } #[cfg(not(any(bpass1,bpass4)))] -#[rustc_clean(cfg="bpass2", except="owner")] +#[rustc_clean(cfg="bpass2")] #[rustc_clean(cfg="bpass3")] #[rustc_clean(cfg="bpass5", except="owner,predicates_of")] #[rustc_clean(cfg="bpass6")] @@ -855,7 +855,7 @@ trait TraitAddInitializerToAssociatedConstant { } #[cfg(not(any(bpass1,bpass4)))] -#[rustc_clean(cfg="bpass2", except="owner")] +#[rustc_clean(cfg="bpass2")] #[rustc_clean(cfg="bpass3")] #[rustc_clean(cfg="bpass5", except="owner,predicates_of")] #[rustc_clean(cfg="bpass6")] @@ -866,9 +866,9 @@ trait TraitAddInitializerToAssociatedConstant { #[rustc_clean(cfg="bpass6")] const Value: u32 = 1; - #[rustc_clean(cfg="bpass2", except="owner")] + #[rustc_clean(cfg="bpass2")] #[rustc_clean(cfg="bpass3")] - #[rustc_clean(cfg="bpass5", except="owner")] + #[rustc_clean(cfg="bpass5")] #[rustc_clean(cfg="bpass6")] fn method(); } @@ -892,7 +892,7 @@ trait TraitChangeTypeOfAssociatedConstant { } #[cfg(not(any(bpass1,bpass4)))] -#[rustc_clean(cfg="bpass2", except="owner")] +#[rustc_clean(cfg="bpass2")] #[rustc_clean(cfg="bpass3")] #[rustc_clean(cfg="bpass5", except="owner,predicates_of")] #[rustc_clean(cfg="bpass6")] @@ -903,9 +903,9 @@ trait TraitChangeTypeOfAssociatedConstant { #[rustc_clean(cfg="bpass6")] const Value: f64; - #[rustc_clean(cfg="bpass2", except="owner")] + #[rustc_clean(cfg="bpass2")] #[rustc_clean(cfg="bpass3")] - #[rustc_clean(cfg="bpass5", except="owner")] + #[rustc_clean(cfg="bpass5")] #[rustc_clean(cfg="bpass6")] fn method(); } diff --git a/tests/incremental/hashes/trait_impls.rs b/tests/incremental/hashes/trait_impls.rs index 630b4fe8a08fc..6d948bcc0e625 100644 --- a/tests/incremental/hashes/trait_impls.rs +++ b/tests/incremental/hashes/trait_impls.rs @@ -74,7 +74,7 @@ impl ChangeMethodBodyTrait for Foo { } #[cfg(not(any(bpass1, bpass4)))] -#[rustc_clean(cfg = "bpass2", except = "owner")] +#[rustc_clean(cfg="bpass2")] #[rustc_clean(cfg = "bpass3")] #[rustc_clean(except = "owner", cfg = "bpass5")] #[rustc_clean(cfg = "bpass6")] @@ -109,7 +109,7 @@ impl ChangeMethodBodyTraitInlined for Foo { } #[cfg(not(any(bpass1, bpass4)))] -#[rustc_clean(cfg = "bpass2", except = "owner")] +#[rustc_clean(cfg="bpass2")] #[rustc_clean(cfg = "bpass3")] #[rustc_clean(except = "owner", cfg = "bpass5")] #[rustc_clean(cfg = "bpass6")] @@ -142,7 +142,7 @@ pub trait ChangeMethodSelfnessTrait { } #[cfg(not(any(bpass1, bpass4)))] -#[rustc_clean(cfg = "bpass2", except = "owner")] +#[rustc_clean(cfg="bpass2")] #[rustc_clean(cfg = "bpass3")] #[rustc_clean(except = "owner", cfg = "bpass5")] #[rustc_clean(cfg = "bpass6")] @@ -180,7 +180,7 @@ pub trait RemoveMethodSelfnessTrait { } #[cfg(not(any(bpass1, bpass4)))] -#[rustc_clean(cfg = "bpass2", except = "owner")] +#[rustc_clean(cfg="bpass2")] #[rustc_clean(cfg = "bpass3")] #[rustc_clean(except = "owner", cfg = "bpass5")] #[rustc_clean(cfg = "bpass6")] @@ -220,7 +220,7 @@ pub trait ChangeMethodSelfmutnessTrait { } #[cfg(not(any(bpass1, bpass4)))] -#[rustc_clean(cfg = "bpass2", except = "owner")] +#[rustc_clean(cfg="bpass2")] #[rustc_clean(cfg = "bpass3")] #[rustc_clean(except = "owner", cfg = "bpass5")] #[rustc_clean(cfg = "bpass6")] @@ -331,7 +331,7 @@ impl ChangeHasValueTrait for Foo { } #[cfg(not(any(bpass1, bpass4)))] -#[rustc_clean(cfg = "bpass2", except = "owner")] +#[rustc_clean(cfg="bpass2")] #[rustc_clean(cfg = "bpass3")] #[rustc_clean(cfg = "bpass5", except = "owner,predicates_of")] #[rustc_clean(cfg = "bpass6")] @@ -344,9 +344,9 @@ pub trait ChangeHasValueTrait { } #[cfg(not(any(bpass1, bpass4)))] -#[rustc_clean(cfg = "bpass2", except = "owner")] +#[rustc_clean(cfg="bpass2")] #[rustc_clean(cfg = "bpass3")] -#[rustc_clean(cfg = "bpass5", except = "owner")] +#[rustc_clean(cfg="bpass5")] #[rustc_clean(cfg = "bpass6")] impl ChangeHasValueTrait for Foo { fn method_name() {} @@ -368,7 +368,7 @@ impl AddDefaultTrait for Foo { } #[cfg(not(any(bpass1, bpass4)))] -#[rustc_clean(cfg = "bpass2", except = "owner")] +#[rustc_clean(cfg="bpass2")] #[rustc_clean(cfg = "bpass3")] #[rustc_clean(cfg = "bpass5", except = "owner")] #[rustc_clean(cfg = "bpass6")] @@ -402,7 +402,7 @@ pub trait AddArgumentTrait { } #[cfg(not(any(bpass1, bpass4)))] -#[rustc_clean(cfg = "bpass2", except = "owner")] +#[rustc_clean(cfg="bpass2")] #[rustc_clean(cfg = "bpass3")] #[rustc_clean(except = "owner", cfg = "bpass5")] #[rustc_clean(cfg = "bpass6")] @@ -436,7 +436,7 @@ pub trait ChangeArgumentTypeTrait { } #[cfg(not(any(bpass1, bpass4)))] -#[rustc_clean(cfg = "bpass2", except = "owner")] +#[rustc_clean(cfg="bpass2")] #[rustc_clean(cfg = "bpass3")] #[rustc_clean(except = "owner", cfg = "bpass5")] #[rustc_clean(cfg = "bpass6")] @@ -501,9 +501,9 @@ impl ChangeSelfTypeOfImpl for u32 { #[rustc_clean(except = "owner,impl_trait_header", cfg = "bpass5")] #[rustc_clean(cfg = "bpass6")] impl ChangeSelfTypeOfImpl for u64 { - #[rustc_clean(except = "fn_sig,typeck_root,optimized_mir,owner", cfg = "bpass2")] + #[rustc_clean(except = "fn_sig,typeck_root,optimized_mir", cfg = "bpass2")] #[rustc_clean(cfg = "bpass3")] - #[rustc_clean(except = "fn_sig,typeck_root,optimized_mir,owner", cfg = "bpass5")] + #[rustc_clean(except = "fn_sig,typeck_root,optimized_mir", cfg = "bpass5")] #[rustc_clean(cfg = "bpass6")] fn id(self) -> Self { self @@ -528,9 +528,9 @@ impl AddLifetimeBoundToImplParameter for T { #[rustc_clean(except = "owner", cfg = "bpass5")] #[rustc_clean(cfg = "bpass6")] impl AddLifetimeBoundToImplParameter for T { - #[rustc_clean(cfg = "bpass2", except = "owner")] + #[rustc_clean(cfg="bpass2")] #[rustc_clean(cfg = "bpass3")] - #[rustc_clean(cfg = "bpass5", except = "owner")] + #[rustc_clean(cfg="bpass5")] #[rustc_clean(cfg = "bpass6")] fn id(self) -> Self { self @@ -555,9 +555,9 @@ impl AddTraitBoundToImplParameter for T { #[rustc_clean(except = "owner", cfg = "bpass5")] #[rustc_clean(cfg = "bpass6")] impl AddTraitBoundToImplParameter for T { - #[rustc_clean(cfg = "bpass2", except = "owner")] + #[rustc_clean(cfg="bpass2")] #[rustc_clean(cfg = "bpass3")] - #[rustc_clean(cfg = "bpass5", except = "owner")] + #[rustc_clean(cfg="bpass5")] #[rustc_clean(cfg = "bpass6")] fn id(self) -> Self { self @@ -580,14 +580,14 @@ impl AddNoMangleToMethod for Foo { } #[cfg(not(any(bpass1, bpass4)))] -#[rustc_clean(cfg = "bpass2", except = "owner")] +#[rustc_clean(cfg="bpass2")] #[rustc_clean(cfg = "bpass3")] #[rustc_clean(cfg = "bpass5", except = "owner")] #[rustc_clean(cfg = "bpass6")] impl AddNoMangleToMethod for Foo { - #[rustc_clean(cfg = "bpass2", except = "owner")] + #[rustc_clean(cfg="bpass2")] #[rustc_clean(cfg = "bpass3")] - #[rustc_clean(cfg = "bpass5", except = "owner")] + #[rustc_clean(cfg="bpass5")] #[rustc_clean(cfg = "bpass6")] #[unsafe(no_mangle)] fn add_no_mangle_to_method(&self) {} @@ -613,14 +613,14 @@ impl MakeMethodInline for Foo { } #[cfg(not(any(bpass1, bpass4)))] -#[rustc_clean(cfg = "bpass2", except = "owner")] +#[rustc_clean(cfg="bpass2")] #[rustc_clean(cfg = "bpass3")] #[rustc_clean(cfg = "bpass5", except = "owner")] #[rustc_clean(cfg = "bpass6")] impl MakeMethodInline for Foo { - #[rustc_clean(cfg = "bpass2", except = "owner")] + #[rustc_clean(cfg="bpass2")] #[rustc_clean(cfg = "bpass3")] - #[rustc_clean(cfg = "bpass5", except = "owner")] + #[rustc_clean(cfg="bpass5")] #[rustc_clean(cfg = "bpass6")] #[inline] fn make_method_inline(&self) -> u8 { diff --git a/tests/incremental/spans_significant_w_debuginfo.rs b/tests/incremental/spans_significant_w_debuginfo.rs index 650af1bfa48ac..06baecd75e5b4 100644 --- a/tests/incremental/spans_significant_w_debuginfo.rs +++ b/tests/incremental/spans_significant_w_debuginfo.rs @@ -13,5 +13,5 @@ pub fn main() {} #[cfg(rpass2)] -#[rustc_clean(cfg = "rpass2", except = "owner")] +#[rustc_clean(cfg = "rpass2")] pub fn main() {} diff --git a/tests/incremental/spans_significant_w_panic.rs b/tests/incremental/spans_significant_w_panic.rs index 126e2656dac34..34363c359dca1 100644 --- a/tests/incremental/spans_significant_w_panic.rs +++ b/tests/incremental/spans_significant_w_panic.rs @@ -17,7 +17,7 @@ pub fn main() { } #[cfg(rpass2)] -#[rustc_clean(cfg = "rpass2",except = "owner")] +#[rustc_clean(cfg = "rpass2")] pub fn main() { if std::hint::black_box(false) { panic!() From ba05724d57f3a924975addaf0aa5dbd8fa8b0157 Mon Sep 17 00:00:00 2001 From: aerooneqq Date: Fri, 24 Apr 2026 14:29:29 +0300 Subject: [PATCH 5/5] Unignore parenting --- compiler/rustc_hir/src/hir.rs | 1 - compiler/rustc_middle/src/hir/mod.rs | 1 - 2 files changed, 2 deletions(-) diff --git a/compiler/rustc_hir/src/hir.rs b/compiler/rustc_hir/src/hir.rs index 649ab4ac66cff..5d5422ee93399 100644 --- a/compiler/rustc_hir/src/hir.rs +++ b/compiler/rustc_hir/src/hir.rs @@ -1622,7 +1622,6 @@ pub struct OwnerInfo<'hir> { /// Contents of the HIR. pub nodes: OwnerNodes<'hir>, /// Map from each nested owner to its parent's local id. - #[stable_hasher(ignore)] pub parenting: LocalDefIdMap, /// Collected attributes of the HIR nodes. pub attrs: AttributeMap<'hir>, diff --git a/compiler/rustc_middle/src/hir/mod.rs b/compiler/rustc_middle/src/hir/mod.rs index f305345cae705..537bd189212bc 100644 --- a/compiler/rustc_middle/src/hir/mod.rs +++ b/compiler/rustc_middle/src/hir/mod.rs @@ -467,7 +467,6 @@ pub struct ProjectedOwnerInfo<'tcx> { pub nodes: &'tcx OwnerNodes<'tcx>, /// Map from each nested owner to its parent's local id. - #[stable_hasher(ignore)] pub parenting: &'tcx LocalDefIdMap, /// Map indicating what traits are in scope for places where this