bjoernager/rust
bjoernager/rust
1
Fork 0
Code Activity

mir_built is a lie

Browse source
This commit is contained in:
Bastian Kauschke 2020-07-07 00:35:06 +02:00
parent aa02692570
commit d4cb820528
18 changed files with 154 additions and 155 deletions
Download patch file Download diff file Expand all files Collapse all files

5
src/librustc_incremental/persist/dirty_clean.rs
View file

@ -64,8 +64,7 @@ const BASE_IMPL: &[&str] =
/// DepNodes for mir_built/Optimized, which is relevant in "executable" /// DepNodes for mir_built/Optimized, which is relevant in "executable"
/// code, i.e., functions+methods /// code, i.e., functions+methods
const BASE_MIR: &[&str] = const BASE_MIR: &[&str] = &[label_strs::optimized_mir, label_strs::promoted_mir];
&[label_strs::optimized_mir, label_strs::promoted_mir, label_strs::mir_built];
/// Struct, Enum and Union DepNodes /// Struct, Enum and Union DepNodes
/// ///
@ -376,7 +375,7 @@ impl DirtyCleanVisitor<'tcx> {
let def_path_hash = self.tcx.def_path_hash(def_id); let def_path_hash = self.tcx.def_path_hash(def_id);
labels.iter().map(move |label| match DepNode::from_label_string(label, def_path_hash) { labels.iter().map(move |label| match DepNode::from_label_string(label, def_path_hash) {
Ok(dep_node) => dep_node, Ok(dep_node) => dep_node,
Err(()) => unreachable!(), Err(()) => unreachable!("label: {}", label),
}) })
} }

16
src/test/incremental/hashes/call_expressions.rs
View file

@ -25,7 +25,7 @@ pub fn change_callee_function() {
} }
#[cfg(not(cfail1))] #[cfg(not(cfail1))]
#[rustc_clean(cfg="cfail2", except="hir_owner_nodes,mir_built,optimized_mir,typeck_tables_of")] #[rustc_clean(cfg="cfail2", except="hir_owner_nodes,optimized_mir,typeck_tables_of")]
#[rustc_clean(cfg="cfail3")] #[rustc_clean(cfg="cfail3")]
pub fn change_callee_function() { pub fn change_callee_function() {
callee2(1, 2) callee2(1, 2)
@ -40,7 +40,7 @@ pub fn change_argument_function() {
} }
#[cfg(not(cfail1))] #[cfg(not(cfail1))]
#[rustc_clean(cfg="cfail2", except="hir_owner_nodes,mir_built,optimized_mir")] #[rustc_clean(cfg="cfail2", except="hir_owner_nodes,optimized_mir")]
#[rustc_clean(cfg="cfail3")] #[rustc_clean(cfg="cfail3")]
pub fn change_argument_function() { pub fn change_argument_function() {
callee1(1, 3) callee1(1, 3)
@ -81,7 +81,7 @@ pub fn change_callee_method() {
} }
#[cfg(not(cfail1))] #[cfg(not(cfail1))]
#[rustc_clean(cfg="cfail2", except="hir_owner_nodes,mir_built,optimized_mir,typeck_tables_of")] #[rustc_clean(cfg="cfail2", except="hir_owner_nodes,optimized_mir,typeck_tables_of")]
#[rustc_clean(cfg="cfail3")] #[rustc_clean(cfg="cfail3")]
pub fn change_callee_method() { pub fn change_callee_method() {
let s = Struct; let s = Struct;
@ -98,7 +98,7 @@ pub fn change_argument_method() {
} }
#[cfg(not(cfail1))] #[cfg(not(cfail1))]
#[rustc_clean(cfg="cfail2", except="hir_owner_nodes,mir_built,optimized_mir")] #[rustc_clean(cfg="cfail2", except="hir_owner_nodes,optimized_mir")]
#[rustc_clean(cfg="cfail3")] #[rustc_clean(cfg="cfail3")]
pub fn change_argument_method() { pub fn change_argument_method() {
let s = Struct; let s = Struct;
@ -115,7 +115,7 @@ pub fn change_ufcs_callee_method() {
} }
#[cfg(not(cfail1))] #[cfg(not(cfail1))]
#[rustc_clean(cfg="cfail2", except="hir_owner_nodes,mir_built,optimized_mir,typeck_tables_of")] #[rustc_clean(cfg="cfail2", except="hir_owner_nodes,optimized_mir,typeck_tables_of")]
#[rustc_clean(cfg="cfail3")] #[rustc_clean(cfg="cfail3")]
pub fn change_ufcs_callee_method() { pub fn change_ufcs_callee_method() {
let s = Struct; let s = Struct;
@ -132,7 +132,7 @@ pub fn change_argument_method_ufcs() {
} }
#[cfg(not(cfail1))] #[cfg(not(cfail1))]
#[rustc_clean(cfg="cfail2", except="hir_owner_nodes,mir_built,optimized_mir")] #[rustc_clean(cfg="cfail2", except="hir_owner_nodes,optimized_mir")]
#[rustc_clean(cfg="cfail3")] #[rustc_clean(cfg="cfail3")]
pub fn change_argument_method_ufcs() { pub fn change_argument_method_ufcs() {
let s = Struct; let s = Struct;
@ -149,7 +149,7 @@ pub fn change_to_ufcs() {
} }
#[cfg(not(cfail1))] #[cfg(not(cfail1))]
#[rustc_clean(cfg="cfail2", except="hir_owner_nodes,mir_built,optimized_mir,typeck_tables_of")] #[rustc_clean(cfg="cfail2", except="hir_owner_nodes,optimized_mir,typeck_tables_of")]
#[rustc_clean(cfg="cfail3")] #[rustc_clean(cfg="cfail3")]
// One might think this would be expanded in the hir_owner_nodes/Mir, but it actually // One might think this would be expanded in the hir_owner_nodes/Mir, but it actually
// results in slightly different hir_owner/Mir. // results in slightly different hir_owner/Mir.
@ -171,7 +171,7 @@ pub mod change_ufcs_callee_indirectly {
#[cfg(not(cfail1))] #[cfg(not(cfail1))]
use super::Struct2 as Struct; use super::Struct2 as Struct;
#[rustc_clean(cfg="cfail2", except="hir_owner_nodes,mir_built,optimized_mir,typeck_tables_of")] #[rustc_clean(cfg="cfail2", except="hir_owner_nodes,optimized_mir,typeck_tables_of")]
#[rustc_clean(cfg="cfail3")] #[rustc_clean(cfg="cfail3")]

6
src/test/incremental/hashes/closure_expressions.rs
View file

@ -37,7 +37,7 @@ pub fn add_parameter() {
} }
#[cfg(not(cfail1))] #[cfg(not(cfail1))]
#[rustc_clean(cfg="cfail2", except="hir_owner_nodes, mir_built, optimized_mir, typeck_tables_of")] #[rustc_clean(cfg="cfail2", except="hir_owner_nodes, optimized_mir, typeck_tables_of")]
#[rustc_clean(cfg="cfail3")] #[rustc_clean(cfg="cfail3")]
pub fn add_parameter() { pub fn add_parameter() {
let x = 0u32; let x = 0u32;
@ -53,7 +53,7 @@ pub fn change_parameter_pattern() {
} }
#[cfg(not(cfail1))] #[cfg(not(cfail1))]
#[rustc_clean(cfg="cfail2", except="hir_owner_nodes, mir_built, typeck_tables_of")] #[rustc_clean(cfg="cfail2", except="hir_owner_nodes, typeck_tables_of")]
#[rustc_clean(cfg="cfail3")] #[rustc_clean(cfg="cfail3")]
pub fn change_parameter_pattern() { pub fn change_parameter_pattern() {
let _ = |(x,): (u32,)| x; let _ = |(x,): (u32,)| x;
@ -101,7 +101,7 @@ pub fn change_parameter_type() {
} }
#[cfg(not(cfail1))] #[cfg(not(cfail1))]
#[rustc_clean(cfg="cfail2", except="hir_owner_nodes, mir_built, optimized_mir, typeck_tables_of")] #[rustc_clean(cfg="cfail2", except="hir_owner_nodes, optimized_mir, typeck_tables_of")]
#[rustc_clean(cfg="cfail3")] #[rustc_clean(cfg="cfail3")]
pub fn change_parameter_type() { pub fn change_parameter_type() {
let closure = |x: u16| (x as u64) + 1; let closure = |x: u16| (x as u64) + 1;

28
src/test/incremental/hashes/enum_constructors.rs
View file

@ -34,7 +34,7 @@ pub fn change_field_value_struct_like() -> Enum {
} }
#[cfg(not(cfail1))] #[cfg(not(cfail1))]
#[rustc_clean(cfg="cfail2", except="hir_owner_nodes,optimized_mir,mir_built")] #[rustc_clean(cfg="cfail2", except="hir_owner_nodes,optimized_mir")]
#[rustc_clean(cfg="cfail3")] #[rustc_clean(cfg="cfail3")]
pub fn change_field_value_struct_like() -> Enum { pub fn change_field_value_struct_like() -> Enum {
Enum::Struct { Enum::Struct {
@ -96,7 +96,7 @@ pub fn change_constructor_path_struct_like() {
} }
#[cfg(not(cfail1))] #[cfg(not(cfail1))]
#[rustc_clean(cfg="cfail2", except="hir_owner_nodes,optimized_mir,mir_built,typeck_tables_of")] #[rustc_clean(cfg="cfail2", except="hir_owner_nodes,optimized_mir,typeck_tables_of")]
#[rustc_clean(cfg="cfail3")] #[rustc_clean(cfg="cfail3")]
pub fn change_constructor_path_struct_like() { pub fn change_constructor_path_struct_like() {
let _ = Enum2::Struct { let _ = Enum2::Struct {
@ -119,7 +119,7 @@ pub fn change_constructor_variant_struct_like() {
} }
#[cfg(not(cfail1))] #[cfg(not(cfail1))]
#[rustc_clean(cfg="cfail2", except="hir_owner_nodes,optimized_mir,mir_built")] #[rustc_clean(cfg="cfail2", except="hir_owner_nodes,optimized_mir")]
#[rustc_clean(cfg="cfail3")] #[rustc_clean(cfg="cfail3")]
pub fn change_constructor_variant_struct_like() { pub fn change_constructor_variant_struct_like() {
let _ = Enum2::Struct2 { let _ = Enum2::Struct2 {
@ -139,7 +139,7 @@ pub mod change_constructor_path_indirectly_struct_like {
#[rustc_clean( #[rustc_clean(
cfg="cfail2", cfg="cfail2",
except="fn_sig,hir_owner,hir_owner_nodes,optimized_mir,mir_built,\ except="fn_sig,hir_owner,hir_owner_nodes,optimized_mir,\
typeck_tables_of" typeck_tables_of"
)] )]
#[rustc_clean(cfg="cfail3")] #[rustc_clean(cfg="cfail3")]
@ -161,7 +161,7 @@ pub mod change_constructor_variant_indirectly_struct_like {
#[cfg(not(cfail1))] #[cfg(not(cfail1))]
use super::Enum2::Struct2 as Variant; use super::Enum2::Struct2 as Variant;
#[rustc_clean(cfg="cfail2", except="hir_owner_nodes,optimized_mir,mir_built")] #[rustc_clean(cfg="cfail2", except="hir_owner_nodes,optimized_mir")]
#[rustc_clean(cfg="cfail3")] #[rustc_clean(cfg="cfail3")]
pub fn function() -> Enum2 { pub fn function() -> Enum2 {
Variant { Variant {
@ -180,7 +180,7 @@ pub fn change_field_value_tuple_like() -> Enum {
} }
#[cfg(not(cfail1))] #[cfg(not(cfail1))]
#[rustc_clean(cfg="cfail2", except="hir_owner_nodes,optimized_mir,mir_built")] #[rustc_clean(cfg="cfail2", except="hir_owner_nodes,optimized_mir")]
#[rustc_clean(cfg="cfail3")] #[rustc_clean(cfg="cfail3")]
pub fn change_field_value_tuple_like() -> Enum { pub fn change_field_value_tuple_like() -> Enum {
Enum::Tuple(0, 1, 3) Enum::Tuple(0, 1, 3)
@ -197,7 +197,7 @@ pub fn change_constructor_path_tuple_like() {
#[cfg(not(cfail1))] #[cfg(not(cfail1))]
#[rustc_clean( #[rustc_clean(
cfg="cfail2", cfg="cfail2",
except="hir_owner_nodes,optimized_mir,mir_built,typeck_tables_of" except="hir_owner_nodes,optimized_mir,typeck_tables_of"
)] )]
#[rustc_clean(cfg="cfail3")] #[rustc_clean(cfg="cfail3")]
pub fn change_constructor_path_tuple_like() { pub fn change_constructor_path_tuple_like() {
@ -215,7 +215,7 @@ pub fn change_constructor_variant_tuple_like() {
#[cfg(not(cfail1))] #[cfg(not(cfail1))]
#[rustc_clean( #[rustc_clean(
cfg="cfail2", cfg="cfail2",
except="hir_owner_nodes,optimized_mir,mir_built,typeck_tables_of" except="hir_owner_nodes,optimized_mir,typeck_tables_of"
)] )]
#[rustc_clean(cfg="cfail3")] #[rustc_clean(cfg="cfail3")]
pub fn change_constructor_variant_tuple_like() { pub fn change_constructor_variant_tuple_like() {
@ -232,7 +232,7 @@ pub mod change_constructor_path_indirectly_tuple_like {
#[rustc_clean( #[rustc_clean(
cfg="cfail2", cfg="cfail2",
except="fn_sig,hir_owner,hir_owner_nodes,optimized_mir,mir_built,\ except="fn_sig,hir_owner,hir_owner_nodes,optimized_mir,\
typeck_tables_of" typeck_tables_of"
)] )]
#[rustc_clean(cfg="cfail3")] #[rustc_clean(cfg="cfail3")]
@ -251,7 +251,7 @@ pub mod change_constructor_variant_indirectly_tuple_like {
#[cfg(not(cfail1))] #[cfg(not(cfail1))]
use super::Enum2::Tuple2 as Variant; use super::Enum2::Tuple2 as Variant;
#[rustc_clean(cfg="cfail2", except="hir_owner_nodes,optimized_mir,mir_built,typeck_tables_of")] #[rustc_clean(cfg="cfail2", except="hir_owner_nodes,optimized_mir,typeck_tables_of")]
#[rustc_clean(cfg="cfail3")] #[rustc_clean(cfg="cfail3")]
pub fn function() -> Enum2 { pub fn function() -> Enum2 {
Variant(0, 1, 2) Variant(0, 1, 2)
@ -278,7 +278,7 @@ pub fn change_constructor_path_c_like() {
} }
#[cfg(not(cfail1))] #[cfg(not(cfail1))]
#[rustc_clean(cfg="cfail2", except="hir_owner_nodes,optimized_mir,mir_built,typeck_tables_of")] #[rustc_clean(cfg="cfail2", except="hir_owner_nodes,optimized_mir,typeck_tables_of")]
#[rustc_clean(cfg="cfail3")] #[rustc_clean(cfg="cfail3")]
pub fn change_constructor_path_c_like() { pub fn change_constructor_path_c_like() {
let _x = Clike2::B; let _x = Clike2::B;
@ -293,7 +293,7 @@ pub fn change_constructor_variant_c_like() {
} }
#[cfg(not(cfail1))] #[cfg(not(cfail1))]
#[rustc_clean(cfg="cfail2", except="hir_owner_nodes,optimized_mir,mir_built")] #[rustc_clean(cfg="cfail2", except="hir_owner_nodes,optimized_mir")]
#[rustc_clean(cfg="cfail3")] #[rustc_clean(cfg="cfail3")]
pub fn change_constructor_variant_c_like() { pub fn change_constructor_variant_c_like() {
let _x = Clike::C; let _x = Clike::C;
@ -309,7 +309,7 @@ pub mod change_constructor_path_indirectly_c_like {
#[rustc_clean( #[rustc_clean(
cfg="cfail2", cfg="cfail2",
except="fn_sig,hir_owner,hir_owner_nodes,optimized_mir,mir_built,\ except="fn_sig,hir_owner,hir_owner_nodes,optimized_mir,\
typeck_tables_of" typeck_tables_of"
)] )]
#[rustc_clean(cfg="cfail3")] #[rustc_clean(cfg="cfail3")]
@ -328,7 +328,7 @@ pub mod change_constructor_variant_indirectly_c_like {
#[cfg(not(cfail1))] #[cfg(not(cfail1))]
use super::Clike::B as Variant; use super::Clike::B as Variant;
#[rustc_clean(cfg="cfail2", except="hir_owner_nodes,optimized_mir,mir_built")] #[rustc_clean(cfg="cfail2", except="hir_owner_nodes,optimized_mir")]
#[rustc_clean(cfg="cfail3")] #[rustc_clean(cfg="cfail3")]
pub fn function() -> Clike { pub fn function() -> Clike {
Variant Variant

6
src/test/incremental/hashes/exported_vs_not.rs
View file

@ -16,7 +16,7 @@ pub fn body_not_exported_to_metadata() -> u32 {
} }
#[cfg(not(cfail1))] #[cfg(not(cfail1))]
#[rustc_clean(cfg="cfail2", except="hir_owner_nodes,mir_built,optimized_mir")] #[rustc_clean(cfg="cfail2", except="hir_owner_nodes,optimized_mir")]
#[rustc_clean(cfg="cfail3")] #[rustc_clean(cfg="cfail3")]
pub fn body_not_exported_to_metadata() -> u32 { pub fn body_not_exported_to_metadata() -> u32 {
2 2
@ -35,7 +35,7 @@ pub fn body_exported_to_metadata_because_of_inline() -> u32 {
} }
#[cfg(not(cfail1))] #[cfg(not(cfail1))]
#[rustc_clean(cfg="cfail2", except="hir_owner_nodes,mir_built,optimized_mir")] #[rustc_clean(cfg="cfail2", except="hir_owner_nodes,optimized_mir")]
#[rustc_clean(cfg="cfail3")] #[rustc_clean(cfg="cfail3")]
#[inline] #[inline]
pub fn body_exported_to_metadata_because_of_inline() -> u32 { pub fn body_exported_to_metadata_because_of_inline() -> u32 {
@ -55,7 +55,7 @@ pub fn body_exported_to_metadata_because_of_generic() -> u32 {
} }
#[cfg(not(cfail1))] #[cfg(not(cfail1))]
#[rustc_clean(cfg="cfail2", except="hir_owner_nodes,mir_built,optimized_mir")] #[rustc_clean(cfg="cfail2", except="hir_owner_nodes,optimized_mir")]
#[rustc_clean(cfg="cfail3")] #[rustc_clean(cfg="cfail3")]
#[inline] #[inline]
pub fn body_exported_to_metadata_because_of_generic() -> u32 { pub fn body_exported_to_metadata_because_of_generic() -> u32 {

16
src/test/incremental/hashes/for_loops.rs
View file

@ -25,7 +25,7 @@ pub fn change_loop_body() {
} }
#[cfg(not(cfail1))] #[cfg(not(cfail1))]
#[rustc_clean(cfg="cfail2", except="hir_owner_nodes, mir_built, optimized_mir")] #[rustc_clean(cfg="cfail2", except="hir_owner_nodes, optimized_mir")]
#[rustc_clean(cfg="cfail3")] #[rustc_clean(cfg="cfail3")]
pub fn change_loop_body() { pub fn change_loop_body() {
let mut _x = 0; let mut _x = 0;
@ -48,7 +48,7 @@ pub fn change_iteration_variable_name() {
} }
#[cfg(not(cfail1))] #[cfg(not(cfail1))]
#[rustc_clean(cfg="cfail2", except="hir_owner_nodes, mir_built, optimized_mir")] #[rustc_clean(cfg="cfail2", except="hir_owner_nodes, optimized_mir")]
#[rustc_clean(cfg="cfail3")] #[rustc_clean(cfg="cfail3")]
pub fn change_iteration_variable_name() { pub fn change_iteration_variable_name() {
let mut _x = 0; let mut _x = 0;
@ -71,7 +71,7 @@ pub fn change_iteration_variable_pattern() {
} }
#[cfg(not(cfail1))] #[cfg(not(cfail1))]
#[rustc_clean(cfg="cfail2", except="hir_owner_nodes, mir_built, optimized_mir, typeck_tables_of")] #[rustc_clean(cfg="cfail2", except="hir_owner_nodes, optimized_mir, typeck_tables_of")]
#[rustc_clean(cfg="cfail3")] #[rustc_clean(cfg="cfail3")]
pub fn change_iteration_variable_pattern() { pub fn change_iteration_variable_pattern() {
let mut _x = 0; let mut _x = 0;
@ -94,7 +94,7 @@ pub fn change_iterable() {
} }
#[cfg(not(cfail1))] #[cfg(not(cfail1))]
#[rustc_clean(cfg="cfail2", except="hir_owner_nodes, mir_built, promoted_mir")] #[rustc_clean(cfg="cfail2", except="hir_owner_nodes, promoted_mir")]
#[rustc_clean(cfg="cfail3")] #[rustc_clean(cfg="cfail3")]
pub fn change_iterable() { pub fn change_iterable() {
let mut _x = 0; let mut _x = 0;
@ -116,7 +116,7 @@ pub fn add_break() {
} }
#[cfg(not(cfail1))] #[cfg(not(cfail1))]
#[rustc_clean(cfg="cfail2", except="hir_owner_nodes, mir_built, optimized_mir, typeck_tables_of")] #[rustc_clean(cfg="cfail2", except="hir_owner_nodes, optimized_mir, typeck_tables_of")]
#[rustc_clean(cfg="cfail3")] #[rustc_clean(cfg="cfail3")]
pub fn add_break() { pub fn add_break() {
let mut _x = 0; let mut _x = 0;
@ -187,7 +187,7 @@ pub fn change_break_label() {
} }
#[cfg(not(cfail1))] #[cfg(not(cfail1))]
#[rustc_clean(cfg="cfail2", except="hir_owner_nodes, mir_built, optimized_mir")] #[rustc_clean(cfg="cfail2", except="hir_owner_nodes, optimized_mir")]
#[rustc_clean(cfg="cfail3")] #[rustc_clean(cfg="cfail3")]
pub fn change_break_label() { pub fn change_break_label() {
let mut _x = 0; let mut _x = 0;
@ -237,7 +237,7 @@ pub fn change_continue_label() {
} }
#[cfg(not(cfail1))] #[cfg(not(cfail1))]
#[rustc_clean(cfg="cfail2", except="hir_owner_nodes, mir_built, optimized_mir")] #[rustc_clean(cfg="cfail2", except="hir_owner_nodes, optimized_mir")]
#[rustc_clean(cfg="cfail3")] #[rustc_clean(cfg="cfail3")]
pub fn change_continue_label() { pub fn change_continue_label() {
let mut _x = 0; let mut _x = 0;
@ -262,7 +262,7 @@ pub fn change_continue_to_break() {
} }
#[cfg(not(cfail1))] #[cfg(not(cfail1))]
#[rustc_clean(cfg="cfail2", except="hir_owner_nodes, mir_built, optimized_mir")] #[rustc_clean(cfg="cfail2", except="hir_owner_nodes, optimized_mir")]
#[rustc_clean(cfg="cfail3")] #[rustc_clean(cfg="cfail3")]
pub fn change_continue_to_break() { pub fn change_continue_to_break() {
let mut _x = 0; let mut _x = 0;

14
src/test/incremental/hashes/function_interfaces.rs
View file

@ -22,7 +22,7 @@ pub fn add_parameter() {}
#[cfg(not(cfail1))] #[cfg(not(cfail1))]
#[rustc_clean( #[rustc_clean(
cfg = "cfail2", cfg = "cfail2",
except = "hir_owner, hir_owner_nodes, mir_built, optimized_mir, typeck_tables_of, fn_sig" except = "hir_owner, hir_owner_nodes, optimized_mir, typeck_tables_of, fn_sig"
)] )]
#[rustc_clean(cfg = "cfail3")] #[rustc_clean(cfg = "cfail3")]
pub fn add_parameter(p: i32) {} pub fn add_parameter(p: i32) {}
@ -45,7 +45,7 @@ pub fn type_of_parameter(p: i32) {}
#[cfg(not(cfail1))] #[cfg(not(cfail1))]
#[rustc_clean( #[rustc_clean(
cfg = "cfail2", cfg = "cfail2",
except = "hir_owner, hir_owner_nodes, mir_built, optimized_mir, typeck_tables_of, fn_sig" except = "hir_owner, hir_owner_nodes, optimized_mir, typeck_tables_of, fn_sig"
)] )]
#[rustc_clean(cfg = "cfail3")] #[rustc_clean(cfg = "cfail3")]
pub fn type_of_parameter(p: i64) {} pub fn type_of_parameter(p: i64) {}
@ -58,7 +58,7 @@ pub fn type_of_parameter_ref(p: &i32) {}
#[cfg(not(cfail1))] #[cfg(not(cfail1))]
#[rustc_clean( #[rustc_clean(
cfg = "cfail2", cfg = "cfail2",
except = "hir_owner, hir_owner_nodes, mir_built, optimized_mir, typeck_tables_of, fn_sig" except = "hir_owner, hir_owner_nodes, optimized_mir, typeck_tables_of, fn_sig"
)] )]
#[rustc_clean(cfg = "cfail3")] #[rustc_clean(cfg = "cfail3")]
pub fn type_of_parameter_ref(p: &mut i32) {} pub fn type_of_parameter_ref(p: &mut i32) {}
@ -71,7 +71,7 @@ pub fn order_of_parameters(p1: i32, p2: i64) {}
#[cfg(not(cfail1))] #[cfg(not(cfail1))]
#[rustc_clean( #[rustc_clean(
cfg = "cfail2", cfg = "cfail2",
except = "hir_owner, hir_owner_nodes, mir_built, optimized_mir, typeck_tables_of, fn_sig" except = "hir_owner, hir_owner_nodes, optimized_mir, typeck_tables_of, fn_sig"
)] )]
#[rustc_clean(cfg = "cfail3")] #[rustc_clean(cfg = "cfail3")]
pub fn order_of_parameters(p2: i64, p1: i32) {} pub fn order_of_parameters(p2: i64, p1: i32) {}
@ -84,7 +84,7 @@ pub fn make_unsafe() {}
#[cfg(not(cfail1))] #[cfg(not(cfail1))]
#[rustc_clean( #[rustc_clean(
cfg = "cfail2", cfg = "cfail2",
except = "hir_owner, hir_owner_nodes, mir_built, optimized_mir, typeck_tables_of, fn_sig" except = "hir_owner, hir_owner_nodes, optimized_mir, typeck_tables_of, fn_sig"
)] )]
#[rustc_clean(cfg = "cfail3")] #[rustc_clean(cfg = "cfail3")]
pub unsafe fn make_unsafe() {} pub unsafe fn make_unsafe() {}
@ -274,7 +274,7 @@ pub mod change_return_type_indirectly {
#[rustc_clean( #[rustc_clean(
cfg = "cfail2", cfg = "cfail2",
except = "hir_owner, hir_owner_nodes, mir_built, optimized_mir, typeck_tables_of, fn_sig" except = "hir_owner, hir_owner_nodes, optimized_mir, typeck_tables_of, fn_sig"
)] )]
#[rustc_clean(cfg = "cfail3")] #[rustc_clean(cfg = "cfail3")]
pub fn indirect_return_type() -> ReturnType { pub fn indirect_return_type() -> ReturnType {
@ -292,7 +292,7 @@ pub mod change_parameter_type_indirectly {
#[rustc_clean( #[rustc_clean(
cfg = "cfail2", cfg = "cfail2",
except = "hir_owner, hir_owner_nodes, mir_built, optimized_mir, typeck_tables_of, fn_sig" except = "hir_owner, hir_owner_nodes, optimized_mir, typeck_tables_of, fn_sig"
)] )]
#[rustc_clean(cfg = "cfail3")] #[rustc_clean(cfg = "cfail3")]
pub fn indirect_parameter_type(p: ParameterType) {} pub fn indirect_parameter_type(p: ParameterType) {}

12
src/test/incremental/hashes/if_expressions.rs
View file

@ -25,7 +25,7 @@ pub fn change_condition(x: bool) -> u32 {
} }
#[cfg(not(cfail1))] #[cfg(not(cfail1))]
#[rustc_clean(cfg="cfail2", except="hir_owner_nodes,mir_built,optimized_mir,typeck_tables_of")] #[rustc_clean(cfg="cfail2", except="hir_owner_nodes,optimized_mir,typeck_tables_of")]
#[rustc_clean(cfg="cfail3")] #[rustc_clean(cfg="cfail3")]
pub fn change_condition(x: bool) -> u32 { pub fn change_condition(x: bool) -> u32 {
if !x { if !x {
@ -46,7 +46,7 @@ pub fn change_then_branch(x: bool) -> u32 {
} }
#[cfg(not(cfail1))] #[cfg(not(cfail1))]
#[rustc_clean(cfg="cfail2", except="hir_owner_nodes,mir_built,optimized_mir")] #[rustc_clean(cfg="cfail2", except="hir_owner_nodes,optimized_mir")]
#[rustc_clean(cfg="cfail3")] #[rustc_clean(cfg="cfail3")]
pub fn change_then_branch(x: bool) -> u32 { pub fn change_then_branch(x: bool) -> u32 {
if x { if x {
@ -69,7 +69,7 @@ pub fn change_else_branch(x: bool) -> u32 {
} }
#[cfg(not(cfail1))] #[cfg(not(cfail1))]
#[rustc_clean(cfg="cfail2", except="hir_owner_nodes,mir_built,optimized_mir")] #[rustc_clean(cfg="cfail2", except="hir_owner_nodes,optimized_mir")]
#[rustc_clean(cfg="cfail3")] #[rustc_clean(cfg="cfail3")]
pub fn change_else_branch(x: bool) -> u32 { pub fn change_else_branch(x: bool) -> u32 {
if x { if x {
@ -120,7 +120,7 @@ pub fn change_condition_if_let(x: Option<u32>) -> u32 {
} }
#[cfg(not(cfail1))] #[cfg(not(cfail1))]
#[rustc_clean(cfg="cfail2", except="hir_owner_nodes,mir_built,optimized_mir,typeck_tables_of")] #[rustc_clean(cfg="cfail2", except="hir_owner_nodes,optimized_mir,typeck_tables_of")]
#[rustc_clean(cfg="cfail3")] #[rustc_clean(cfg="cfail3")]
pub fn change_condition_if_let(x: Option<u32>) -> u32 { pub fn change_condition_if_let(x: Option<u32>) -> u32 {
if let Some(_) = x { if let Some(_) = x {
@ -143,7 +143,7 @@ pub fn change_then_branch_if_let(x: Option<u32>) -> u32 {
} }
#[cfg(not(cfail1))] #[cfg(not(cfail1))]
#[rustc_clean(cfg="cfail2", except="hir_owner_nodes,mir_built,optimized_mir,typeck_tables_of")] #[rustc_clean(cfg="cfail2", except="hir_owner_nodes,optimized_mir,typeck_tables_of")]
#[rustc_clean(cfg="cfail3")] #[rustc_clean(cfg="cfail3")]
pub fn change_then_branch_if_let(x: Option<u32>) -> u32 { pub fn change_then_branch_if_let(x: Option<u32>) -> u32 {
if let Some(x) = x { if let Some(x) = x {
@ -166,7 +166,7 @@ pub fn change_else_branch_if_let(x: Option<u32>) -> u32 {
} }
#[cfg(not(cfail1))] #[cfg(not(cfail1))]
#[rustc_clean(cfg="cfail2", except="hir_owner_nodes,mir_built,optimized_mir")] #[rustc_clean(cfg="cfail2", except="hir_owner_nodes,optimized_mir")]
#[rustc_clean(cfg="cfail3")] #[rustc_clean(cfg="cfail3")]
pub fn change_else_branch_if_let(x: Option<u32>) -> u32 { pub fn change_else_branch_if_let(x: Option<u32>) -> u32 {
if let Some(x) = x { if let Some(x) = x {

20
src/test/incremental/hashes/inherent_impls.rs
View file

@ -44,7 +44,7 @@ impl Foo {
impl Foo { impl Foo {
#[rustc_clean( #[rustc_clean(
cfg="cfail2", cfg="cfail2",
except="hir_owner_nodes,optimized_mir,promoted_mir,mir_built,typeck_tables_of" except="hir_owner_nodes,optimized_mir,promoted_mir,typeck_tables_of"
)] )]
#[rustc_clean(cfg="cfail3")] #[rustc_clean(cfg="cfail3")]
pub fn method_body() { pub fn method_body() {
@ -68,7 +68,7 @@ impl Foo {
impl Foo { impl Foo {
#[rustc_clean( #[rustc_clean(
cfg="cfail2", cfg="cfail2",
except="hir_owner_nodes,optimized_mir,promoted_mir,mir_built,typeck_tables_of" except="hir_owner_nodes,optimized_mir,promoted_mir,typeck_tables_of"
)] )]
#[rustc_clean(cfg="cfail3")] #[rustc_clean(cfg="cfail3")]
#[inline] #[inline]
@ -120,7 +120,7 @@ impl Foo {
impl Foo { impl Foo {
#[rustc_clean( #[rustc_clean(
cfg="cfail2", cfg="cfail2",
except="hir_owner,hir_owner_nodes,fn_sig,typeck_tables_of,optimized_mir,mir_built" except="hir_owner,hir_owner_nodes,fn_sig,typeck_tables_of,optimized_mir"
)] )]
#[rustc_clean(cfg="cfail3")] #[rustc_clean(cfg="cfail3")]
pub fn method_selfmutness(&mut self) { } pub fn method_selfmutness(&mut self) { }
@ -160,7 +160,7 @@ impl Foo {
impl Foo { impl Foo {
#[rustc_clean( #[rustc_clean(
cfg="cfail2", cfg="cfail2",
except="hir_owner,hir_owner_nodes,fn_sig,typeck_tables_of,optimized_mir,mir_built" except="hir_owner,hir_owner_nodes,fn_sig,typeck_tables_of,optimized_mir"
)] )]
#[rustc_clean(cfg="cfail3")] #[rustc_clean(cfg="cfail3")]
pub fn add_method_parameter(&self, _: i32) { } pub fn add_method_parameter(&self, _: i32) { }
@ -178,7 +178,7 @@ impl Foo {
#[rustc_clean(cfg="cfail2")] #[rustc_clean(cfg="cfail2")]
#[rustc_clean(cfg="cfail3")] #[rustc_clean(cfg="cfail3")]
impl Foo { impl Foo {
#[rustc_clean(cfg="cfail2", except="hir_owner_nodes,optimized_mir,mir_built")] #[rustc_clean(cfg="cfail2", except="hir_owner_nodes,optimized_mir")]
#[rustc_clean(cfg="cfail3")] #[rustc_clean(cfg="cfail3")]
pub fn change_method_parameter_name(&self, b: i64) { } pub fn change_method_parameter_name(&self, b: i64) { }
} }
@ -197,7 +197,7 @@ impl Foo {
impl Foo { impl Foo {
#[rustc_clean( #[rustc_clean(
cfg="cfail2", cfg="cfail2",
except="hir_owner,hir_owner_nodes,fn_sig,optimized_mir,mir_built,typeck_tables_of")] except="hir_owner,hir_owner_nodes,fn_sig,optimized_mir,typeck_tables_of")]
#[rustc_clean(cfg="cfail3")] #[rustc_clean(cfg="cfail3")]
pub fn change_method_return_type(&self) -> u8 { 0 } pub fn change_method_return_type(&self) -> u8 { 0 }
} }
@ -232,7 +232,7 @@ impl Foo {
#[rustc_clean(cfg="cfail2")] #[rustc_clean(cfg="cfail2")]
#[rustc_clean(cfg="cfail3")] #[rustc_clean(cfg="cfail3")]
impl Foo { impl Foo {
#[rustc_clean(cfg="cfail2", except="hir_owner_nodes,optimized_mir,mir_built")] #[rustc_clean(cfg="cfail2", except="hir_owner_nodes,optimized_mir")]
#[rustc_clean(cfg="cfail3")] #[rustc_clean(cfg="cfail3")]
pub fn change_method_parameter_order(&self, b: i64, a: i64) { } pub fn change_method_parameter_order(&self, b: i64, a: i64) { }
} }
@ -251,7 +251,7 @@ impl Foo {
impl Foo { impl Foo {
#[rustc_clean( #[rustc_clean(
cfg="cfail2", cfg="cfail2",
except="hir_owner,hir_owner_nodes,fn_sig,typeck_tables_of,optimized_mir,mir_built" except="hir_owner,hir_owner_nodes,fn_sig,typeck_tables_of,optimized_mir"
)] )]
#[rustc_clean(cfg="cfail3")] #[rustc_clean(cfg="cfail3")]
pub unsafe fn make_method_unsafe(&self) { } pub unsafe fn make_method_unsafe(&self) { }
@ -453,7 +453,7 @@ impl Bar<u32> {
impl<T> Bar<T> { impl<T> Bar<T> {
#[rustc_clean( #[rustc_clean(
cfg="cfail2", cfg="cfail2",
except="generics_of,fn_sig,typeck_tables_of,type_of,optimized_mir,mir_built" except="generics_of,fn_sig,typeck_tables_of,type_of,optimized_mir"
)] )]
#[rustc_clean(cfg="cfail3")] #[rustc_clean(cfg="cfail3")]
pub fn add_type_parameter_to_impl(&self) { } pub fn add_type_parameter_to_impl(&self) { }
@ -471,7 +471,7 @@ impl Bar<u32> {
#[rustc_clean(cfg="cfail2", except="hir_owner,hir_owner_nodes")] #[rustc_clean(cfg="cfail2", except="hir_owner,hir_owner_nodes")]
#[rustc_clean(cfg="cfail3")] #[rustc_clean(cfg="cfail3")]
impl Bar<u64> { impl Bar<u64> {
#[rustc_clean(cfg="cfail2", except="fn_sig,optimized_mir,mir_built,typeck_tables_of")] #[rustc_clean(cfg="cfail2", except="fn_sig,optimized_mir,typeck_tables_of")]
#[rustc_clean(cfg="cfail3")] #[rustc_clean(cfg="cfail3")]
pub fn change_impl_self_type(&self) { } pub fn change_impl_self_type(&self) { }
} }

12
src/test/incremental/hashes/inline_asm.rs
View file

@ -33,7 +33,7 @@ pub fn change_template(a: i32) -> i32 {
} }
#[cfg(not(cfail1))] #[cfg(not(cfail1))]
#[rustc_clean(cfg="cfail2", except="hir_owner_nodes, mir_built, optimized_mir")] #[rustc_clean(cfg="cfail2", except="hir_owner_nodes, optimized_mir")]
#[rustc_clean(cfg="cfail3")] #[rustc_clean(cfg="cfail3")]
#[cfg(any(target_arch = "x86", target_arch = "x86_64"))] #[cfg(any(target_arch = "x86", target_arch = "x86_64"))]
pub fn change_template(a: i32) -> i32 { pub fn change_template(a: i32) -> i32 {
@ -69,7 +69,7 @@ pub fn change_output(a: i32) -> i32 {
} }
#[cfg(not(cfail1))] #[cfg(not(cfail1))]
#[rustc_clean(cfg="cfail2", except="hir_owner_nodes, mir_built, optimized_mir")] #[rustc_clean(cfg="cfail2", except="hir_owner_nodes, optimized_mir")]
#[rustc_clean(cfg="cfail3")] #[rustc_clean(cfg="cfail3")]
#[cfg(any(target_arch = "x86", target_arch = "x86_64"))] #[cfg(any(target_arch = "x86", target_arch = "x86_64"))]
pub fn change_output(a: i32) -> i32 { pub fn change_output(a: i32) -> i32 {
@ -105,7 +105,7 @@ pub fn change_input(_a: i32, _b: i32) -> i32 {
} }
#[cfg(not(cfail1))] #[cfg(not(cfail1))]
#[rustc_clean(cfg="cfail2", except="hir_owner_nodes, mir_built, optimized_mir")] #[rustc_clean(cfg="cfail2", except="hir_owner_nodes, optimized_mir")]
#[rustc_clean(cfg="cfail3")] #[rustc_clean(cfg="cfail3")]
#[cfg(any(target_arch = "x86", target_arch = "x86_64"))] #[cfg(any(target_arch = "x86", target_arch = "x86_64"))]
pub fn change_input(_a: i32, _b: i32) -> i32 { pub fn change_input(_a: i32, _b: i32) -> i32 {
@ -140,7 +140,7 @@ pub fn change_input_constraint(_a: i32, _b: i32) -> i32 {
} }
#[cfg(not(cfail1))] #[cfg(not(cfail1))]
#[rustc_clean(cfg="cfail2", except="hir_owner_nodes, mir_built, optimized_mir")] #[rustc_clean(cfg="cfail2", except="hir_owner_nodes, optimized_mir")]
#[rustc_clean(cfg="cfail3")] #[rustc_clean(cfg="cfail3")]
#[cfg(any(target_arch = "x86", target_arch = "x86_64"))] #[cfg(any(target_arch = "x86", target_arch = "x86_64"))]
pub fn change_input_constraint(_a: i32, _b: i32) -> i32 { pub fn change_input_constraint(_a: i32, _b: i32) -> i32 {
@ -175,7 +175,7 @@ pub fn change_clobber(_a: i32) -> i32 {
} }
#[cfg(not(cfail1))] #[cfg(not(cfail1))]
#[rustc_clean(cfg="cfail2", except="hir_owner_nodes, mir_built, optimized_mir")] #[rustc_clean(cfg="cfail2", except="hir_owner_nodes, optimized_mir")]
#[rustc_clean(cfg="cfail3")] #[rustc_clean(cfg="cfail3")]
#[cfg(any(target_arch = "x86", target_arch = "x86_64"))] #[cfg(any(target_arch = "x86", target_arch = "x86_64"))]
pub fn change_clobber(_a: i32) -> i32 { pub fn change_clobber(_a: i32) -> i32 {
@ -210,7 +210,7 @@ pub fn change_options(_a: i32) -> i32 {
} }
#[cfg(not(cfail1))] #[cfg(not(cfail1))]
#[rustc_clean(cfg="cfail2", except="hir_owner_nodes, mir_built, optimized_mir")] #[rustc_clean(cfg="cfail2", except="hir_owner_nodes, optimized_mir")]
#[rustc_clean(cfg="cfail3")] #[rustc_clean(cfg="cfail3")]
#[cfg(any(target_arch = "x86", target_arch = "x86_64"))] #[cfg(any(target_arch = "x86", target_arch = "x86_64"))]
pub fn change_options(_a: i32) -> i32 { pub fn change_options(_a: i32) -> i32 {

24
src/test/incremental/hashes/let_expressions.rs
View file

@ -22,7 +22,7 @@ pub fn change_name() {
#[cfg(not(cfail1))] #[cfg(not(cfail1))]
#[rustc_clean(cfg="cfail2", #[rustc_clean(cfg="cfail2",
except="hir_owner_nodes,mir_built,optimized_mir")] except="hir_owner_nodes,optimized_mir")]
#[rustc_clean(cfg="cfail3")] #[rustc_clean(cfg="cfail3")]
pub fn change_name() { pub fn change_name() {
let _y = 2u64; let _y = 2u64;
@ -38,7 +38,7 @@ pub fn add_type() {
#[cfg(not(cfail1))] #[cfg(not(cfail1))]
#[rustc_clean(cfg="cfail2", #[rustc_clean(cfg="cfail2",
except="hir_owner_nodes,typeck_tables_of,mir_built")] except="hir_owner_nodes,typeck_tables_of")]
#[rustc_clean(cfg="cfail3")] #[rustc_clean(cfg="cfail3")]
pub fn add_type() { pub fn add_type() {
let _x: u32 = 2u32; let _x: u32 = 2u32;
@ -54,7 +54,7 @@ pub fn change_type() {
#[cfg(not(cfail1))] #[cfg(not(cfail1))]
#[rustc_clean(cfg="cfail2", #[rustc_clean(cfg="cfail2",
except="hir_owner_nodes,typeck_tables_of,mir_built,optimized_mir")] except="hir_owner_nodes,typeck_tables_of,optimized_mir")]
#[rustc_clean(cfg="cfail3")] #[rustc_clean(cfg="cfail3")]
pub fn change_type() { pub fn change_type() {
let _x: u8 = 2; let _x: u8 = 2;
@ -70,7 +70,7 @@ pub fn change_mutability_of_reference_type() {
#[cfg(not(cfail1))] #[cfg(not(cfail1))]
#[rustc_clean(cfg="cfail2", #[rustc_clean(cfg="cfail2",
except="hir_owner_nodes,typeck_tables_of,mir_built,optimized_mir")] except="hir_owner_nodes,typeck_tables_of,optimized_mir")]
#[rustc_clean(cfg="cfail3")] #[rustc_clean(cfg="cfail3")]
pub fn change_mutability_of_reference_type() { pub fn change_mutability_of_reference_type() {
let _x: &mut u64; let _x: &mut u64;
@ -86,7 +86,7 @@ pub fn change_mutability_of_slot() {
#[cfg(not(cfail1))] #[cfg(not(cfail1))]
#[rustc_clean(cfg="cfail2", #[rustc_clean(cfg="cfail2",
except="hir_owner_nodes,typeck_tables_of,mir_built,optimized_mir")] except="hir_owner_nodes,typeck_tables_of,optimized_mir")]
#[rustc_clean(cfg="cfail3")] #[rustc_clean(cfg="cfail3")]
pub fn change_mutability_of_slot() { pub fn change_mutability_of_slot() {
let _x: u64 = 0; let _x: u64 = 0;
@ -102,7 +102,7 @@ pub fn change_simple_binding_to_pattern() {
#[cfg(not(cfail1))] #[cfg(not(cfail1))]
#[rustc_clean(cfg="cfail2", #[rustc_clean(cfg="cfail2",
except="hir_owner_nodes,typeck_tables_of,mir_built,optimized_mir")] except="hir_owner_nodes,typeck_tables_of,optimized_mir")]
#[rustc_clean(cfg="cfail3")] #[rustc_clean(cfg="cfail3")]
pub fn change_simple_binding_to_pattern() { pub fn change_simple_binding_to_pattern() {
let (_a, _b) = (0u8, 'x'); let (_a, _b) = (0u8, 'x');
@ -118,7 +118,7 @@ pub fn change_name_in_pattern() {
#[cfg(not(cfail1))] #[cfg(not(cfail1))]
#[rustc_clean(cfg="cfail2", #[rustc_clean(cfg="cfail2",
except="hir_owner_nodes,mir_built,optimized_mir")] except="hir_owner_nodes,optimized_mir")]
#[rustc_clean(cfg="cfail3")] #[rustc_clean(cfg="cfail3")]
pub fn change_name_in_pattern() { pub fn change_name_in_pattern() {
let (_a, _c) = (1u8, 'y'); let (_a, _c) = (1u8, 'y');
@ -134,7 +134,7 @@ pub fn add_ref_in_pattern() {
#[cfg(not(cfail1))] #[cfg(not(cfail1))]
#[rustc_clean(cfg="cfail2", #[rustc_clean(cfg="cfail2",
except="hir_owner_nodes,typeck_tables_of,mir_built,optimized_mir")] except="hir_owner_nodes,typeck_tables_of,optimized_mir")]
#[rustc_clean(cfg="cfail3")] #[rustc_clean(cfg="cfail3")]
pub fn add_ref_in_pattern() { pub fn add_ref_in_pattern() {
let (ref _a, _b) = (1u8, 'y'); let (ref _a, _b) = (1u8, 'y');
@ -150,7 +150,7 @@ pub fn add_amp_in_pattern() {
#[cfg(not(cfail1))] #[cfg(not(cfail1))]
#[rustc_clean(cfg="cfail2", #[rustc_clean(cfg="cfail2",
except="hir_owner_nodes,typeck_tables_of,mir_built,optimized_mir")] except="hir_owner_nodes,typeck_tables_of,optimized_mir")]
#[rustc_clean(cfg="cfail3")] #[rustc_clean(cfg="cfail3")]
pub fn add_amp_in_pattern() { pub fn add_amp_in_pattern() {
let (&_a, _b) = (&1u8, 'y'); let (&_a, _b) = (&1u8, 'y');
@ -166,7 +166,7 @@ pub fn change_mutability_of_binding_in_pattern() {
#[cfg(not(cfail1))] #[cfg(not(cfail1))]
#[rustc_clean(cfg="cfail2", #[rustc_clean(cfg="cfail2",
except="hir_owner_nodes,typeck_tables_of,mir_built,optimized_mir")] except="hir_owner_nodes,typeck_tables_of,optimized_mir")]
#[rustc_clean(cfg="cfail3")] #[rustc_clean(cfg="cfail3")]
pub fn change_mutability_of_binding_in_pattern() { pub fn change_mutability_of_binding_in_pattern() {
let (mut _a, _b) = (99u8, 'q'); let (mut _a, _b) = (99u8, 'q');
@ -182,7 +182,7 @@ pub fn add_initializer() {
#[cfg(not(cfail1))] #[cfg(not(cfail1))]
#[rustc_clean(cfg="cfail2", #[rustc_clean(cfg="cfail2",
except="hir_owner_nodes,typeck_tables_of,mir_built,optimized_mir")] except="hir_owner_nodes,typeck_tables_of,optimized_mir")]
#[rustc_clean(cfg="cfail3")] #[rustc_clean(cfg="cfail3")]
pub fn add_initializer() { pub fn add_initializer() {
let _x: i16 = 3i16; let _x: i16 = 3i16;
@ -198,7 +198,7 @@ pub fn change_initializer() {
#[cfg(not(cfail1))] #[cfg(not(cfail1))]
#[rustc_clean(cfg="cfail2", #[rustc_clean(cfg="cfail2",
except="hir_owner_nodes,mir_built,optimized_mir")] except="hir_owner_nodes,optimized_mir")]
#[rustc_clean(cfg="cfail3")] #[rustc_clean(cfg="cfail3")]
pub fn change_initializer() { pub fn change_initializer() {
let _x = 5u16; let _x = 5u16;

10
src/test/incremental/hashes/loop_expressions.rs
View file

@ -25,7 +25,7 @@ pub fn change_loop_body() {
} }
#[cfg(not(cfail1))] #[cfg(not(cfail1))]
#[rustc_clean(cfg="cfail2", except="hir_owner_nodes, mir_built, optimized_mir")] #[rustc_clean(cfg="cfail2", except="hir_owner_nodes, optimized_mir")]
#[rustc_clean(cfg="cfail3")] #[rustc_clean(cfg="cfail3")]
pub fn change_loop_body() { pub fn change_loop_body() {
let mut _x = 0; let mut _x = 0;
@ -47,7 +47,7 @@ pub fn add_break() {
} }
#[cfg(not(cfail1))] #[cfg(not(cfail1))]
#[rustc_clean(cfg="cfail2", except="hir_owner_nodes, mir_built, optimized_mir, typeck_tables_of")] #[rustc_clean(cfg="cfail2", except="hir_owner_nodes, optimized_mir, typeck_tables_of")]
#[rustc_clean(cfg="cfail3")] #[rustc_clean(cfg="cfail3")]
pub fn add_break() { pub fn add_break() {
let mut _x = 0; let mut _x = 0;
@ -118,7 +118,7 @@ pub fn change_break_label() {
} }
#[cfg(not(cfail1))] #[cfg(not(cfail1))]
#[rustc_clean(cfg="cfail2", except="hir_owner_nodes, mir_built, optimized_mir, typeck_tables_of")] #[rustc_clean(cfg="cfail2", except="hir_owner_nodes, optimized_mir, typeck_tables_of")]
#[rustc_clean(cfg="cfail3")] #[rustc_clean(cfg="cfail3")]
pub fn change_break_label() { pub fn change_break_label() {
let mut _x = 0; let mut _x = 0;
@ -168,7 +168,7 @@ pub fn change_continue_label() {
} }
#[cfg(not(cfail1))] #[cfg(not(cfail1))]
#[rustc_clean(cfg="cfail2", except="hir_owner_nodes, mir_built, typeck_tables_of")] #[rustc_clean(cfg="cfail2", except="hir_owner_nodes, typeck_tables_of")]
#[rustc_clean(cfg="cfail3")] #[rustc_clean(cfg="cfail3")]
pub fn change_continue_label() { pub fn change_continue_label() {
let mut _x = 0; let mut _x = 0;
@ -193,7 +193,7 @@ pub fn change_continue_to_break() {
} }
#[cfg(not(cfail1))] #[cfg(not(cfail1))]
#[rustc_clean(cfg="cfail2", except="hir_owner_nodes, mir_built, optimized_mir, typeck_tables_of")] #[rustc_clean(cfg="cfail2", except="hir_owner_nodes, optimized_mir, typeck_tables_of")]
#[rustc_clean(cfg="cfail3")] #[rustc_clean(cfg="cfail3")]
pub fn change_continue_to_break() { pub fn change_continue_to_break() {
let mut _x = 0; let mut _x = 0;

26
src/test/incremental/hashes/match_expressions.rs
View file

@ -26,7 +26,7 @@ pub fn add_arm(x: u32) -> u32 {
#[cfg(not(cfail1))] #[cfg(not(cfail1))]
#[rustc_clean(cfg="cfail2", #[rustc_clean(cfg="cfail2",
except="hir_owner_nodes,mir_built,optimized_mir,typeck_tables_of")] except="hir_owner_nodes,optimized_mir,typeck_tables_of")]
#[rustc_clean(cfg="cfail3")] #[rustc_clean(cfg="cfail3")]
pub fn add_arm(x: u32) -> u32 { pub fn add_arm(x: u32) -> u32 {
match x { match x {
@ -51,7 +51,7 @@ pub fn change_order_of_arms(x: u32) -> u32 {
#[cfg(not(cfail1))] #[cfg(not(cfail1))]
#[rustc_clean(cfg="cfail2", #[rustc_clean(cfg="cfail2",
except="hir_owner_nodes,mir_built,optimized_mir")] except="hir_owner_nodes,optimized_mir")]
#[rustc_clean(cfg="cfail3")] #[rustc_clean(cfg="cfail3")]
pub fn change_order_of_arms(x: u32) -> u32 { pub fn change_order_of_arms(x: u32) -> u32 {
match x { match x {
@ -75,7 +75,7 @@ pub fn add_guard_clause(x: u32, y: bool) -> u32 {
#[cfg(not(cfail1))] #[cfg(not(cfail1))]
#[rustc_clean(cfg="cfail2", #[rustc_clean(cfg="cfail2",
except="hir_owner_nodes,mir_built,optimized_mir,typeck_tables_of")] except="hir_owner_nodes,optimized_mir,typeck_tables_of")]
#[rustc_clean(cfg="cfail3")] #[rustc_clean(cfg="cfail3")]
pub fn add_guard_clause(x: u32, y: bool) -> u32 { pub fn add_guard_clause(x: u32, y: bool) -> u32 {
match x { match x {
@ -99,7 +99,7 @@ pub fn change_guard_clause(x: u32, y: bool) -> u32 {
#[cfg(not(cfail1))] #[cfg(not(cfail1))]
#[rustc_clean(cfg="cfail2", #[rustc_clean(cfg="cfail2",
except="hir_owner_nodes,mir_built,optimized_mir,typeck_tables_of")] except="hir_owner_nodes,optimized_mir,typeck_tables_of")]
#[rustc_clean(cfg="cfail3")] #[rustc_clean(cfg="cfail3")]
pub fn change_guard_clause(x: u32, y: bool) -> u32 { pub fn change_guard_clause(x: u32, y: bool) -> u32 {
match x { match x {
@ -123,7 +123,7 @@ pub fn add_at_binding(x: u32) -> u32 {
#[cfg(not(cfail1))] #[cfg(not(cfail1))]
#[rustc_clean(cfg="cfail2", #[rustc_clean(cfg="cfail2",
except="hir_owner_nodes,mir_built,optimized_mir,typeck_tables_of")] except="hir_owner_nodes,optimized_mir,typeck_tables_of")]
#[rustc_clean(cfg="cfail3")] #[rustc_clean(cfg="cfail3")]
pub fn add_at_binding(x: u32) -> u32 { pub fn add_at_binding(x: u32) -> u32 {
match x { match x {
@ -147,7 +147,7 @@ pub fn change_name_of_at_binding(x: u32) -> u32 {
#[cfg(not(cfail1))] #[cfg(not(cfail1))]
#[rustc_clean(cfg="cfail2", #[rustc_clean(cfg="cfail2",
except="hir_owner_nodes,mir_built,optimized_mir")] except="hir_owner_nodes,optimized_mir")]
#[rustc_clean(cfg="cfail3")] #[rustc_clean(cfg="cfail3")]
pub fn change_name_of_at_binding(x: u32) -> u32 { pub fn change_name_of_at_binding(x: u32) -> u32 {
match x { match x {
@ -170,7 +170,7 @@ pub fn change_simple_name_to_pattern(x: u32) -> u32 {
#[cfg(not(cfail1))] #[cfg(not(cfail1))]
#[rustc_clean(cfg="cfail2", #[rustc_clean(cfg="cfail2",
except="hir_owner_nodes,mir_built,optimized_mir,typeck_tables_of")] except="hir_owner_nodes,optimized_mir,typeck_tables_of")]
#[rustc_clean(cfg="cfail3")] #[rustc_clean(cfg="cfail3")]
pub fn change_simple_name_to_pattern(x: u32) -> u32 { pub fn change_simple_name_to_pattern(x: u32) -> u32 {
match (x, x & 1) { match (x, x & 1) {
@ -193,7 +193,7 @@ pub fn change_name_in_pattern(x: u32) -> u32 {
#[cfg(not(cfail1))] #[cfg(not(cfail1))]
#[rustc_clean(cfg="cfail2", #[rustc_clean(cfg="cfail2",
except="hir_owner_nodes,mir_built,optimized_mir")] except="hir_owner_nodes,optimized_mir")]
#[rustc_clean(cfg="cfail3")] #[rustc_clean(cfg="cfail3")]
pub fn change_name_in_pattern(x: u32) -> u32 { pub fn change_name_in_pattern(x: u32) -> u32 {
match (x, x & 1) { match (x, x & 1) {
@ -216,7 +216,7 @@ pub fn change_mutability_of_binding_in_pattern(x: u32) -> u32 {
#[cfg(not(cfail1))] #[cfg(not(cfail1))]
#[rustc_clean(cfg="cfail2", #[rustc_clean(cfg="cfail2",
except="hir_owner_nodes,mir_built,optimized_mir,typeck_tables_of")] except="hir_owner_nodes,optimized_mir,typeck_tables_of")]
#[rustc_clean(cfg="cfail3")] #[rustc_clean(cfg="cfail3")]
pub fn change_mutability_of_binding_in_pattern(x: u32) -> u32 { pub fn change_mutability_of_binding_in_pattern(x: u32) -> u32 {
match (x, x & 1) { match (x, x & 1) {
@ -238,7 +238,7 @@ pub fn add_ref_to_binding_in_pattern(x: u32) -> u32 {
#[cfg(not(cfail1))] #[cfg(not(cfail1))]
#[rustc_clean(cfg="cfail2", #[rustc_clean(cfg="cfail2",
except="hir_owner_nodes,mir_built,optimized_mir,typeck_tables_of")] except="hir_owner_nodes,optimized_mir,typeck_tables_of")]
#[rustc_clean(cfg="cfail3")] #[rustc_clean(cfg="cfail3")]
pub fn add_ref_to_binding_in_pattern(x: u32) -> u32 { pub fn add_ref_to_binding_in_pattern(x: u32) -> u32 {
match (x, x & 1) { match (x, x & 1) {
@ -260,7 +260,7 @@ pub fn add_amp_to_binding_in_pattern(x: u32) -> u32 {
#[cfg(not(cfail1))] #[cfg(not(cfail1))]
#[rustc_clean(cfg="cfail2", #[rustc_clean(cfg="cfail2",
except="hir_owner_nodes,mir_built,optimized_mir,typeck_tables_of")] except="hir_owner_nodes,optimized_mir,typeck_tables_of")]
#[rustc_clean(cfg="cfail3")] #[rustc_clean(cfg="cfail3")]
pub fn add_amp_to_binding_in_pattern(x: u32) -> u32 { pub fn add_amp_to_binding_in_pattern(x: u32) -> u32 {
match (&x, x & 1) { match (&x, x & 1) {
@ -283,7 +283,7 @@ pub fn change_rhs_of_arm(x: u32) -> u32 {
#[cfg(not(cfail1))] #[cfg(not(cfail1))]
#[rustc_clean(cfg="cfail2", #[rustc_clean(cfg="cfail2",
except="hir_owner_nodes,mir_built,optimized_mir")] except="hir_owner_nodes,optimized_mir")]
#[rustc_clean(cfg="cfail3")] #[rustc_clean(cfg="cfail3")]
pub fn change_rhs_of_arm(x: u32) -> u32 { pub fn change_rhs_of_arm(x: u32) -> u32 {
match x { match x {
@ -307,7 +307,7 @@ pub fn add_alternative_to_arm(x: u32) -> u32 {
#[cfg(not(cfail1))] #[cfg(not(cfail1))]
#[rustc_clean(cfg="cfail2", #[rustc_clean(cfg="cfail2",
except="hir_owner_nodes,mir_built,optimized_mir,typeck_tables_of")] except="hir_owner_nodes,optimized_mir,typeck_tables_of")]
#[rustc_clean(cfg="cfail3")] #[rustc_clean(cfg="cfail3")]
pub fn add_alternative_to_arm(x: u32) -> u32 { pub fn add_alternative_to_arm(x: u32) -> u32 {
match x { match x {

18
src/test/incremental/hashes/panic_exprs.rs
View file

@ -18,7 +18,7 @@
// Indexing expression // Indexing expression
#[rustc_clean(cfg="cfail2", except="hir_owner_nodes,mir_built,optimized_mir")] #[rustc_clean(cfg="cfail2", except="hir_owner_nodes,optimized_mir")]
#[rustc_clean(cfg="cfail3")] #[rustc_clean(cfg="cfail3")]
pub fn indexing(slice: &[u8]) -> u8 { pub fn indexing(slice: &[u8]) -> u8 {
#[cfg(cfail1)] #[cfg(cfail1)]
@ -33,7 +33,7 @@ pub fn indexing(slice: &[u8]) -> u8 {
// Arithmetic overflow plus // Arithmetic overflow plus
#[rustc_clean(cfg="cfail2", except="hir_owner_nodes,mir_built,optimized_mir")] #[rustc_clean(cfg="cfail2", except="hir_owner_nodes,optimized_mir")]
#[rustc_clean(cfg="cfail3")] #[rustc_clean(cfg="cfail3")]
pub fn arithmetic_overflow_plus(val: i32) -> i32 { pub fn arithmetic_overflow_plus(val: i32) -> i32 {
#[cfg(cfail1)] #[cfg(cfail1)]
@ -48,7 +48,7 @@ pub fn arithmetic_overflow_plus(val: i32) -> i32 {
// Arithmetic overflow minus // Arithmetic overflow minus
#[rustc_clean(cfg="cfail2", except="hir_owner_nodes,mir_built,optimized_mir")] #[rustc_clean(cfg="cfail2", except="hir_owner_nodes,optimized_mir")]
#[rustc_clean(cfg="cfail3")] #[rustc_clean(cfg="cfail3")]
pub fn arithmetic_overflow_minus(val: i32) -> i32 { pub fn arithmetic_overflow_minus(val: i32) -> i32 {
#[cfg(cfail1)] #[cfg(cfail1)]
@ -63,7 +63,7 @@ pub fn arithmetic_overflow_minus(val: i32) -> i32 {
// Arithmetic overflow mult // Arithmetic overflow mult
#[rustc_clean(cfg="cfail2", except="hir_owner_nodes,mir_built,optimized_mir")] #[rustc_clean(cfg="cfail2", except="hir_owner_nodes,optimized_mir")]
#[rustc_clean(cfg="cfail3")] #[rustc_clean(cfg="cfail3")]
pub fn arithmetic_overflow_mult(val: i32) -> i32 { pub fn arithmetic_overflow_mult(val: i32) -> i32 {
#[cfg(cfail1)] #[cfg(cfail1)]
@ -78,7 +78,7 @@ pub fn arithmetic_overflow_mult(val: i32) -> i32 {
// Arithmetic overflow negation // Arithmetic overflow negation
#[rustc_clean(cfg="cfail2", except="hir_owner_nodes,mir_built,optimized_mir")] #[rustc_clean(cfg="cfail2", except="hir_owner_nodes,optimized_mir")]
#[rustc_clean(cfg="cfail3")] #[rustc_clean(cfg="cfail3")]
pub fn arithmetic_overflow_negation(val: i32) -> i32 { pub fn arithmetic_overflow_negation(val: i32) -> i32 {
#[cfg(cfail1)] #[cfg(cfail1)]
@ -93,7 +93,7 @@ pub fn arithmetic_overflow_negation(val: i32) -> i32 {
// Division by zero // Division by zero
#[rustc_clean(cfg="cfail2", except="hir_owner_nodes,mir_built,optimized_mir")] #[rustc_clean(cfg="cfail2", except="hir_owner_nodes,optimized_mir")]
#[rustc_clean(cfg="cfail3")] #[rustc_clean(cfg="cfail3")]
pub fn division_by_zero(val: i32) -> i32 { pub fn division_by_zero(val: i32) -> i32 {
#[cfg(cfail1)] #[cfg(cfail1)]
@ -107,7 +107,7 @@ pub fn division_by_zero(val: i32) -> i32 {
} }
// Division by zero // Division by zero
#[rustc_clean(cfg="cfail2", except="hir_owner_nodes,mir_built,optimized_mir")] #[rustc_clean(cfg="cfail2", except="hir_owner_nodes,optimized_mir")]
#[rustc_clean(cfg="cfail3")] #[rustc_clean(cfg="cfail3")]
pub fn mod_by_zero(val: i32) -> i32 { pub fn mod_by_zero(val: i32) -> i32 {
#[cfg(cfail1)] #[cfg(cfail1)]
@ -122,7 +122,7 @@ pub fn mod_by_zero(val: i32) -> i32 {
// shift left // shift left
#[rustc_clean(cfg="cfail2", except="hir_owner_nodes,mir_built,optimized_mir")] #[rustc_clean(cfg="cfail2", except="hir_owner_nodes,optimized_mir")]
#[rustc_clean(cfg="cfail3")] #[rustc_clean(cfg="cfail3")]
pub fn shift_left(val: i32, shift: usize) -> i32 { pub fn shift_left(val: i32, shift: usize) -> i32 {
#[cfg(cfail1)] #[cfg(cfail1)]
@ -137,7 +137,7 @@ pub fn shift_left(val: i32, shift: usize) -> i32 {
// shift right // shift right
#[rustc_clean(cfg="cfail2", except="hir_owner_nodes,mir_built,optimized_mir")] #[rustc_clean(cfg="cfail2", except="hir_owner_nodes,optimized_mir")]
#[rustc_clean(cfg="cfail3")] #[rustc_clean(cfg="cfail3")]
pub fn shift_right(val: i32, shift: usize) -> i32 { pub fn shift_right(val: i32, shift: usize) -> i32 {
#[cfg(cfail1)] #[cfg(cfail1)]

16
src/test/incremental/hashes/struct_constructors.rs
View file

@ -31,7 +31,7 @@ pub fn change_field_value_regular_struct() -> RegularStruct {
} }
#[cfg(not(cfail1))] #[cfg(not(cfail1))]
#[rustc_clean(cfg="cfail2", except="hir_owner_nodes,optimized_mir,mir_built")] #[rustc_clean(cfg="cfail2", except="hir_owner_nodes,optimized_mir")]
#[rustc_clean(cfg="cfail3")] #[rustc_clean(cfg="cfail3")]
pub fn change_field_value_regular_struct() -> RegularStruct { pub fn change_field_value_regular_struct() -> RegularStruct {
RegularStruct { RegularStruct {
@ -82,7 +82,7 @@ pub fn add_field_regular_struct() -> RegularStruct {
} }
#[cfg(not(cfail1))] #[cfg(not(cfail1))]
#[rustc_clean(cfg="cfail2", except="hir_owner_nodes,optimized_mir,mir_built,typeck_tables_of")] #[rustc_clean(cfg="cfail2", except="hir_owner_nodes,optimized_mir,typeck_tables_of")]
#[rustc_clean(cfg="cfail3")] #[rustc_clean(cfg="cfail3")]
pub fn add_field_regular_struct() -> RegularStruct { pub fn add_field_regular_struct() -> RegularStruct {
let struct1 = RegularStruct { let struct1 = RegularStruct {
@ -117,7 +117,7 @@ pub fn change_field_label_regular_struct() -> RegularStruct {
} }
#[cfg(not(cfail1))] #[cfg(not(cfail1))]
#[rustc_clean(cfg="cfail2", except="hir_owner_nodes,optimized_mir,mir_built,typeck_tables_of")] #[rustc_clean(cfg="cfail2", except="hir_owner_nodes,optimized_mir,typeck_tables_of")]
#[rustc_clean(cfg="cfail3")] #[rustc_clean(cfg="cfail3")]
pub fn change_field_label_regular_struct() -> RegularStruct { pub fn change_field_label_regular_struct() -> RegularStruct {
let struct1 = RegularStruct { let struct1 = RegularStruct {
@ -152,7 +152,7 @@ pub fn change_constructor_path_regular_struct() {
} }
#[cfg(not(cfail1))] #[cfg(not(cfail1))]
#[rustc_clean(cfg="cfail2", except="hir_owner_nodes,mir_built,typeck_tables_of")] #[rustc_clean(cfg="cfail2", except="hir_owner_nodes,typeck_tables_of")]
#[rustc_clean(cfg="cfail3")] #[rustc_clean(cfg="cfail3")]
pub fn change_constructor_path_regular_struct() { pub fn change_constructor_path_regular_struct() {
let _ = RegularStruct2 { let _ = RegularStruct2 {
@ -173,7 +173,7 @@ pub mod change_constructor_path_indirectly_regular_struct {
#[rustc_clean( #[rustc_clean(
cfg="cfail2", cfg="cfail2",
except="fn_sig,hir_owner,hir_owner_nodes,optimized_mir,mir_built,typeck_tables_of" except="fn_sig,hir_owner,hir_owner_nodes,optimized_mir,typeck_tables_of"
)] )]
#[rustc_clean(cfg="cfail3")] #[rustc_clean(cfg="cfail3")]
pub fn function() -> Struct { pub fn function() -> Struct {
@ -196,7 +196,7 @@ pub fn change_field_value_tuple_struct() -> TupleStruct {
} }
#[cfg(not(cfail1))] #[cfg(not(cfail1))]
#[rustc_clean(cfg="cfail2", except="hir_owner_nodes,optimized_mir,mir_built")] #[rustc_clean(cfg="cfail2", except="hir_owner_nodes,optimized_mir")]
#[rustc_clean(cfg="cfail3")] #[rustc_clean(cfg="cfail3")]
pub fn change_field_value_tuple_struct() -> TupleStruct { pub fn change_field_value_tuple_struct() -> TupleStruct {
TupleStruct(0, 1, 3) TupleStruct(0, 1, 3)
@ -213,7 +213,7 @@ pub fn change_constructor_path_tuple_struct() {
} }
#[cfg(not(cfail1))] #[cfg(not(cfail1))]
#[rustc_clean(cfg="cfail2", except="hir_owner_nodes,mir_built,typeck_tables_of")] #[rustc_clean(cfg="cfail2", except="hir_owner_nodes,typeck_tables_of")]
#[rustc_clean(cfg="cfail3")] #[rustc_clean(cfg="cfail3")]
pub fn change_constructor_path_tuple_struct() { pub fn change_constructor_path_tuple_struct() {
let _ = TupleStruct2(0, 1, 2); let _ = TupleStruct2(0, 1, 2);
@ -230,7 +230,7 @@ pub mod change_constructor_path_indirectly_tuple_struct {
#[rustc_clean( #[rustc_clean(
cfg="cfail2", cfg="cfail2",
except="fn_sig,hir_owner,hir_owner_nodes,optimized_mir,mir_built,typeck_tables_of" except="fn_sig,hir_owner,hir_owner_nodes,optimized_mir,typeck_tables_of"
)] )]
#[rustc_clean(cfg="cfail3")] #[rustc_clean(cfg="cfail3")]
pub fn function() -> Struct { pub fn function() -> Struct {

56
src/test/incremental/hashes/unary_and_binary_exprs.rs
View file

@ -21,7 +21,7 @@ pub fn const_negation() -> i32 {
} }
#[cfg(not(cfail1))] #[cfg(not(cfail1))]
#[rustc_clean(except="hir_owner_nodes,optimized_mir,mir_built", cfg="cfail2")] #[rustc_clean(except="hir_owner_nodes,optimized_mir", cfg="cfail2")]
#[rustc_clean(cfg="cfail3")] #[rustc_clean(cfg="cfail3")]
pub fn const_negation() -> i32 { pub fn const_negation() -> i32 {
-1 -1
@ -36,7 +36,7 @@ pub fn const_bitwise_not() -> i32 {
} }
#[cfg(not(cfail1))] #[cfg(not(cfail1))]
#[rustc_clean(except="hir_owner_nodes,optimized_mir,mir_built", cfg="cfail2")] #[rustc_clean(except="hir_owner_nodes,optimized_mir", cfg="cfail2")]
#[rustc_clean(cfg="cfail3")] #[rustc_clean(cfg="cfail3")]
pub fn const_bitwise_not() -> i32 { pub fn const_bitwise_not() -> i32 {
!99 !99
@ -51,7 +51,7 @@ pub fn var_negation(x: i32, y: i32) -> i32 {
} }
#[cfg(not(cfail1))] #[cfg(not(cfail1))]
#[rustc_clean(except="hir_owner_nodes,optimized_mir,mir_built", cfg="cfail2")] #[rustc_clean(except="hir_owner_nodes,optimized_mir", cfg="cfail2")]
#[rustc_clean(cfg="cfail3")] #[rustc_clean(cfg="cfail3")]
pub fn var_negation(x: i32, y: i32) -> i32 { pub fn var_negation(x: i32, y: i32) -> i32 {
-y -y
@ -66,7 +66,7 @@ pub fn var_bitwise_not(x: i32, y: i32) -> i32 {
} }
#[cfg(not(cfail1))] #[cfg(not(cfail1))]
#[rustc_clean(except="hir_owner_nodes,optimized_mir,mir_built", cfg="cfail2")] #[rustc_clean(except="hir_owner_nodes,optimized_mir", cfg="cfail2")]
#[rustc_clean(cfg="cfail3")] #[rustc_clean(cfg="cfail3")]
pub fn var_bitwise_not(x: i32, y: i32) -> i32 { pub fn var_bitwise_not(x: i32, y: i32) -> i32 {
!y !y
@ -81,7 +81,7 @@ pub fn var_deref(x: &i32, y: &i32) -> i32 {
} }
#[cfg(not(cfail1))] #[cfg(not(cfail1))]
#[rustc_clean(except="hir_owner_nodes,optimized_mir,mir_built", cfg="cfail2")] #[rustc_clean(except="hir_owner_nodes,optimized_mir", cfg="cfail2")]
#[rustc_clean(cfg="cfail3")] #[rustc_clean(cfg="cfail3")]
pub fn var_deref(x: &i32, y: &i32) -> i32 { pub fn var_deref(x: &i32, y: &i32) -> i32 {
*y *y
@ -96,7 +96,7 @@ pub fn first_const_add() -> i32 {
} }
#[cfg(not(cfail1))] #[cfg(not(cfail1))]
#[rustc_clean(except="hir_owner_nodes,optimized_mir,mir_built", cfg="cfail2")] #[rustc_clean(except="hir_owner_nodes,optimized_mir", cfg="cfail2")]
#[rustc_clean(cfg="cfail3")] #[rustc_clean(cfg="cfail3")]
pub fn first_const_add() -> i32 { pub fn first_const_add() -> i32 {
2 + 3 2 + 3
@ -111,7 +111,7 @@ pub fn second_const_add() -> i32 {
} }
#[cfg(not(cfail1))] #[cfg(not(cfail1))]
#[rustc_clean(except="hir_owner_nodes,optimized_mir,mir_built", cfg="cfail2")] #[rustc_clean(except="hir_owner_nodes,optimized_mir", cfg="cfail2")]
#[rustc_clean(cfg="cfail3")] #[rustc_clean(cfg="cfail3")]
pub fn second_const_add() -> i32 { pub fn second_const_add() -> i32 {
1 + 3 1 + 3
@ -126,7 +126,7 @@ pub fn first_var_add(a: i32, b: i32) -> i32 {
} }
#[cfg(not(cfail1))] #[cfg(not(cfail1))]
#[rustc_clean(except="hir_owner_nodes,optimized_mir,mir_built", cfg="cfail2")] #[rustc_clean(except="hir_owner_nodes,optimized_mir", cfg="cfail2")]
#[rustc_clean(cfg="cfail3")] #[rustc_clean(cfg="cfail3")]
pub fn first_var_add(a: i32, b: i32) -> i32 { pub fn first_var_add(a: i32, b: i32) -> i32 {
b + 2 b + 2
@ -141,7 +141,7 @@ pub fn second_var_add(a: i32, b: i32) -> i32 {
} }
#[cfg(not(cfail1))] #[cfg(not(cfail1))]
#[rustc_clean(except="hir_owner_nodes,optimized_mir,mir_built", cfg="cfail2")] #[rustc_clean(except="hir_owner_nodes,optimized_mir", cfg="cfail2")]
#[rustc_clean(cfg="cfail3")] #[rustc_clean(cfg="cfail3")]
pub fn second_var_add(a: i32, b: i32) -> i32 { pub fn second_var_add(a: i32, b: i32) -> i32 {
1 + b 1 + b
@ -156,7 +156,7 @@ pub fn plus_to_minus(a: i32) -> i32 {
} }
#[cfg(not(cfail1))] #[cfg(not(cfail1))]
#[rustc_clean(except="hir_owner_nodes,optimized_mir,mir_built", cfg="cfail2")] #[rustc_clean(except="hir_owner_nodes,optimized_mir", cfg="cfail2")]
#[rustc_clean(cfg="cfail3")] #[rustc_clean(cfg="cfail3")]
pub fn plus_to_minus(a: i32) -> i32 { pub fn plus_to_minus(a: i32) -> i32 {
1 - a 1 - a
@ -171,7 +171,7 @@ pub fn plus_to_mult(a: i32) -> i32 {
} }
#[cfg(not(cfail1))] #[cfg(not(cfail1))]
#[rustc_clean(except="hir_owner_nodes,optimized_mir,mir_built", cfg="cfail2")] #[rustc_clean(except="hir_owner_nodes,optimized_mir", cfg="cfail2")]
#[rustc_clean(cfg="cfail3")] #[rustc_clean(cfg="cfail3")]
pub fn plus_to_mult(a: i32) -> i32 { pub fn plus_to_mult(a: i32) -> i32 {
1 * a 1 * a
@ -186,7 +186,7 @@ pub fn plus_to_div(a: i32) -> i32 {
} }
#[cfg(not(cfail1))] #[cfg(not(cfail1))]
#[rustc_clean(except="hir_owner_nodes,optimized_mir,mir_built", cfg="cfail2")] #[rustc_clean(except="hir_owner_nodes,optimized_mir", cfg="cfail2")]
#[rustc_clean(cfg="cfail3")] #[rustc_clean(cfg="cfail3")]
pub fn plus_to_div(a: i32) -> i32 { pub fn plus_to_div(a: i32) -> i32 {
1 / a 1 / a
@ -201,7 +201,7 @@ pub fn plus_to_mod(a: i32) -> i32 {
} }
#[cfg(not(cfail1))] #[cfg(not(cfail1))]
#[rustc_clean(except="hir_owner_nodes,optimized_mir,mir_built", cfg="cfail2")] #[rustc_clean(except="hir_owner_nodes,optimized_mir", cfg="cfail2")]
#[rustc_clean(cfg="cfail3")] #[rustc_clean(cfg="cfail3")]
pub fn plus_to_mod(a: i32) -> i32 { pub fn plus_to_mod(a: i32) -> i32 {
1 % a 1 % a
@ -216,7 +216,7 @@ pub fn and_to_or(a: bool, b: bool) -> bool {
} }
#[cfg(not(cfail1))] #[cfg(not(cfail1))]
#[rustc_clean(except="hir_owner_nodes,optimized_mir,mir_built", cfg="cfail2")] #[rustc_clean(except="hir_owner_nodes,optimized_mir", cfg="cfail2")]
#[rustc_clean(cfg="cfail3")] #[rustc_clean(cfg="cfail3")]
pub fn and_to_or(a: bool, b: bool) -> bool { pub fn and_to_or(a: bool, b: bool) -> bool {
a || b a || b
@ -231,7 +231,7 @@ pub fn bitwise_and_to_bitwise_or(a: i32) -> i32 {
} }
#[cfg(not(cfail1))] #[cfg(not(cfail1))]
#[rustc_clean(except="hir_owner_nodes,optimized_mir,mir_built", cfg="cfail2")] #[rustc_clean(except="hir_owner_nodes,optimized_mir", cfg="cfail2")]
#[rustc_clean(cfg="cfail3")] #[rustc_clean(cfg="cfail3")]
pub fn bitwise_and_to_bitwise_or(a: i32) -> i32 { pub fn bitwise_and_to_bitwise_or(a: i32) -> i32 {
1 | a 1 | a
@ -246,7 +246,7 @@ pub fn bitwise_and_to_bitwise_xor(a: i32) -> i32 {
} }
#[cfg(not(cfail1))] #[cfg(not(cfail1))]
#[rustc_clean(except="hir_owner_nodes,optimized_mir,mir_built", cfg="cfail2")] #[rustc_clean(except="hir_owner_nodes,optimized_mir", cfg="cfail2")]
#[rustc_clean(cfg="cfail3")] #[rustc_clean(cfg="cfail3")]
pub fn bitwise_and_to_bitwise_xor(a: i32) -> i32 { pub fn bitwise_and_to_bitwise_xor(a: i32) -> i32 {
1 ^ a 1 ^ a
@ -261,7 +261,7 @@ pub fn bitwise_and_to_lshift(a: i32) -> i32 {
} }
#[cfg(not(cfail1))] #[cfg(not(cfail1))]
#[rustc_clean(except="hir_owner_nodes,optimized_mir,mir_built", cfg="cfail2")] #[rustc_clean(except="hir_owner_nodes,optimized_mir", cfg="cfail2")]
#[rustc_clean(cfg="cfail3")] #[rustc_clean(cfg="cfail3")]
pub fn bitwise_and_to_lshift(a: i32) -> i32 { pub fn bitwise_and_to_lshift(a: i32) -> i32 {
a << 1 a << 1
@ -276,7 +276,7 @@ pub fn bitwise_and_to_rshift(a: i32) -> i32 {
} }
#[cfg(not(cfail1))] #[cfg(not(cfail1))]
#[rustc_clean(except="hir_owner_nodes,optimized_mir,mir_built", cfg="cfail2")] #[rustc_clean(except="hir_owner_nodes,optimized_mir", cfg="cfail2")]
#[rustc_clean(cfg="cfail3")] #[rustc_clean(cfg="cfail3")]
pub fn bitwise_and_to_rshift(a: i32) -> i32 { pub fn bitwise_and_to_rshift(a: i32) -> i32 {
a >> 1 a >> 1
@ -291,7 +291,7 @@ pub fn eq_to_uneq(a: i32) -> bool {
} }
#[cfg(not(cfail1))] #[cfg(not(cfail1))]
#[rustc_clean(except="hir_owner_nodes,optimized_mir,mir_built", cfg="cfail2")] #[rustc_clean(except="hir_owner_nodes,optimized_mir", cfg="cfail2")]
#[rustc_clean(cfg="cfail3")] #[rustc_clean(cfg="cfail3")]
pub fn eq_to_uneq(a: i32) -> bool { pub fn eq_to_uneq(a: i32) -> bool {
a != 1 a != 1
@ -306,7 +306,7 @@ pub fn eq_to_lt(a: i32) -> bool {
} }
#[cfg(not(cfail1))] #[cfg(not(cfail1))]
#[rustc_clean(except="hir_owner_nodes,optimized_mir,mir_built", cfg="cfail2")] #[rustc_clean(except="hir_owner_nodes,optimized_mir", cfg="cfail2")]
#[rustc_clean(cfg="cfail3")] #[rustc_clean(cfg="cfail3")]
pub fn eq_to_lt(a: i32) -> bool { pub fn eq_to_lt(a: i32) -> bool {
a < 1 a < 1
@ -321,7 +321,7 @@ pub fn eq_to_gt(a: i32) -> bool {
} }
#[cfg(not(cfail1))] #[cfg(not(cfail1))]
#[rustc_clean(except="hir_owner_nodes,optimized_mir,mir_built", cfg="cfail2")] #[rustc_clean(except="hir_owner_nodes,optimized_mir", cfg="cfail2")]
#[rustc_clean(cfg="cfail3")] #[rustc_clean(cfg="cfail3")]
pub fn eq_to_gt(a: i32) -> bool { pub fn eq_to_gt(a: i32) -> bool {
a > 1 a > 1
@ -336,7 +336,7 @@ pub fn eq_to_le(a: i32) -> bool {
} }
#[cfg(not(cfail1))] #[cfg(not(cfail1))]
#[rustc_clean(except="hir_owner_nodes,optimized_mir,mir_built", cfg="cfail2")] #[rustc_clean(except="hir_owner_nodes,optimized_mir", cfg="cfail2")]
#[rustc_clean(cfg="cfail3")] #[rustc_clean(cfg="cfail3")]
pub fn eq_to_le(a: i32) -> bool { pub fn eq_to_le(a: i32) -> bool {
a <= 1 a <= 1
@ -351,7 +351,7 @@ pub fn eq_to_ge(a: i32) -> bool {
} }
#[cfg(not(cfail1))] #[cfg(not(cfail1))]
#[rustc_clean(except="hir_owner_nodes,optimized_mir,mir_built", cfg="cfail2")] #[rustc_clean(except="hir_owner_nodes,optimized_mir", cfg="cfail2")]
#[rustc_clean(cfg="cfail3")] #[rustc_clean(cfg="cfail3")]
pub fn eq_to_ge(a: i32) -> bool { pub fn eq_to_ge(a: i32) -> bool {
a >= 1 a >= 1
@ -368,7 +368,7 @@ pub fn type_cast(a: u8) -> u64 {
} }
#[cfg(not(cfail1))] #[cfg(not(cfail1))]
#[rustc_clean(except="hir_owner_nodes,optimized_mir,mir_built,typeck_tables_of", cfg="cfail2")] #[rustc_clean(except="hir_owner_nodes,optimized_mir,typeck_tables_of", cfg="cfail2")]
#[rustc_clean(cfg="cfail3")] #[rustc_clean(cfg="cfail3")]
pub fn type_cast(a: u8) -> u64 { pub fn type_cast(a: u8) -> u64 {
let b = a as u32; let b = a as u32;
@ -385,7 +385,7 @@ pub fn value_cast(a: u32) -> i32 {
} }
#[cfg(not(cfail1))] #[cfg(not(cfail1))]
#[rustc_clean(except="hir_owner_nodes,optimized_mir,mir_built", cfg="cfail2")] #[rustc_clean(except="hir_owner_nodes,optimized_mir", cfg="cfail2")]
#[rustc_clean(cfg="cfail3")] #[rustc_clean(cfg="cfail3")]
pub fn value_cast(a: u32) -> i32 { pub fn value_cast(a: u32) -> i32 {
2 as i32 2 as i32
@ -403,7 +403,7 @@ pub fn place() -> i32 {
} }
#[cfg(not(cfail1))] #[cfg(not(cfail1))]
#[rustc_clean(except="hir_owner_nodes,optimized_mir,mir_built", cfg="cfail2")] #[rustc_clean(except="hir_owner_nodes,optimized_mir", cfg="cfail2")]
#[rustc_clean(cfg="cfail3")] #[rustc_clean(cfg="cfail3")]
pub fn place() -> i32 { pub fn place() -> i32 {
let mut x = 10; let mut x = 10;
@ -423,7 +423,7 @@ pub fn rvalue() -> i32 {
} }
#[cfg(not(cfail1))] #[cfg(not(cfail1))]
#[rustc_clean(except="hir_owner_nodes,optimized_mir,mir_built", cfg="cfail2")] #[rustc_clean(except="hir_owner_nodes,optimized_mir", cfg="cfail2")]
#[rustc_clean(cfg="cfail3")] #[rustc_clean(cfg="cfail3")]
pub fn rvalue() -> i32 { pub fn rvalue() -> i32 {
let mut x = 10; let mut x = 10;
@ -440,7 +440,7 @@ pub fn index_to_slice(s: &[u8], i: usize, j: usize) -> u8 {
} }
#[cfg(not(cfail1))] #[cfg(not(cfail1))]
#[rustc_clean(except="hir_owner_nodes,optimized_mir,mir_built", cfg="cfail2")] #[rustc_clean(except="hir_owner_nodes,optimized_mir", cfg="cfail2")]
#[rustc_clean(cfg="cfail3")] #[rustc_clean(cfg="cfail3")]
pub fn index_to_slice(s: &[u8], i: usize, j: usize) -> u8 { pub fn index_to_slice(s: &[u8], i: usize, j: usize) -> u8 {
s[j] s[j]

12
src/test/incremental/hashes/while_let_loops.rs
View file

@ -25,7 +25,7 @@ pub fn change_loop_body() {
} }
#[cfg(not(cfail1))] #[cfg(not(cfail1))]
#[rustc_clean(cfg="cfail2", except="hir_owner_nodes, mir_built")] #[rustc_clean(cfg="cfail2", except="hir_owner_nodes")]
#[rustc_clean(cfg="cfail3")] #[rustc_clean(cfg="cfail3")]
pub fn change_loop_body() { pub fn change_loop_body() {
let mut _x = 0; let mut _x = 0;
@ -48,7 +48,7 @@ pub fn change_loop_condition() {
} }
#[cfg(not(cfail1))] #[cfg(not(cfail1))]
#[rustc_clean(cfg="cfail2", except="hir_owner_nodes, mir_built")] #[rustc_clean(cfg="cfail2", except="hir_owner_nodes")]
#[rustc_clean(cfg="cfail3")] #[rustc_clean(cfg="cfail3")]
pub fn change_loop_condition() { pub fn change_loop_condition() {
let mut _x = 0; let mut _x = 0;
@ -70,7 +70,7 @@ pub fn add_break() {
} }
#[cfg(not(cfail1))] #[cfg(not(cfail1))]
#[rustc_clean(cfg="cfail2", except="hir_owner_nodes, mir_built, typeck_tables_of")] #[rustc_clean(cfg="cfail2", except="hir_owner_nodes, typeck_tables_of")]
#[rustc_clean(cfg="cfail3")] #[rustc_clean(cfg="cfail3")]
pub fn add_break() { pub fn add_break() {
let mut _x = 0; let mut _x = 0;
@ -141,7 +141,7 @@ pub fn change_break_label() {
} }
#[cfg(not(cfail1))] #[cfg(not(cfail1))]
#[rustc_clean(cfg="cfail2", except="hir_owner_nodes, mir_built")] #[rustc_clean(cfg="cfail2", except="hir_owner_nodes")]
#[rustc_clean(cfg="cfail3")] #[rustc_clean(cfg="cfail3")]
pub fn change_break_label() { pub fn change_break_label() {
let mut _x = 0; let mut _x = 0;
@ -191,7 +191,7 @@ pub fn change_continue_label() {
} }
#[cfg(not(cfail1))] #[cfg(not(cfail1))]
#[rustc_clean(cfg="cfail2", except="hir_owner_nodes, mir_built")] #[rustc_clean(cfg="cfail2", except="hir_owner_nodes")]
#[rustc_clean(cfg="cfail3")] #[rustc_clean(cfg="cfail3")]
pub fn change_continue_label() { pub fn change_continue_label() {
let mut _x = 0; let mut _x = 0;
@ -216,7 +216,7 @@ pub fn change_continue_to_break() {
} }
#[cfg(not(cfail1))] #[cfg(not(cfail1))]
#[rustc_clean(cfg="cfail2", except="hir_owner_nodes, mir_built")] #[rustc_clean(cfg="cfail2", except="hir_owner_nodes")]
#[rustc_clean(cfg="cfail3")] #[rustc_clean(cfg="cfail3")]
pub fn change_continue_to_break() { pub fn change_continue_to_break() {
let mut _x = 0; let mut _x = 0;

12
src/test/incremental/hashes/while_loops.rs
View file

@ -25,7 +25,7 @@ pub fn change_loop_body() {
} }
#[cfg(not(cfail1))] #[cfg(not(cfail1))]
#[rustc_clean(cfg="cfail2", except="hir_owner_nodes, mir_built, optimized_mir")] #[rustc_clean(cfg="cfail2", except="hir_owner_nodes, optimized_mir")]
#[rustc_clean(cfg="cfail3")] #[rustc_clean(cfg="cfail3")]
pub fn change_loop_body() { pub fn change_loop_body() {
let mut _x = 0; let mut _x = 0;
@ -48,7 +48,7 @@ pub fn change_loop_condition() {
} }
#[cfg(not(cfail1))] #[cfg(not(cfail1))]
#[rustc_clean(cfg="cfail2", except="hir_owner_nodes, mir_built, optimized_mir")] #[rustc_clean(cfg="cfail2", except="hir_owner_nodes, optimized_mir")]
#[rustc_clean(cfg="cfail3")] #[rustc_clean(cfg="cfail3")]
pub fn change_loop_condition() { pub fn change_loop_condition() {
let mut _x = 0; let mut _x = 0;
@ -70,7 +70,7 @@ pub fn add_break() {
} }
#[cfg(not(cfail1))] #[cfg(not(cfail1))]
#[rustc_clean(cfg="cfail2", except="hir_owner_nodes, mir_built, optimized_mir, typeck_tables_of")] #[rustc_clean(cfg="cfail2", except="hir_owner_nodes, optimized_mir, typeck_tables_of")]
#[rustc_clean(cfg="cfail3")] #[rustc_clean(cfg="cfail3")]
pub fn add_break() { pub fn add_break() {
let mut _x = 0; let mut _x = 0;
@ -141,7 +141,7 @@ pub fn change_break_label() {
} }
#[cfg(not(cfail1))] #[cfg(not(cfail1))]
#[rustc_clean(cfg="cfail2", except="hir_owner_nodes, mir_built, optimized_mir")] #[rustc_clean(cfg="cfail2", except="hir_owner_nodes, optimized_mir")]
#[rustc_clean(cfg="cfail3")] #[rustc_clean(cfg="cfail3")]
pub fn change_break_label() { pub fn change_break_label() {
let mut _x = 0; let mut _x = 0;
@ -191,7 +191,7 @@ pub fn change_continue_label() {
} }
#[cfg(not(cfail1))] #[cfg(not(cfail1))]
#[rustc_clean(cfg="cfail2", except="hir_owner_nodes, mir_built")] #[rustc_clean(cfg="cfail2", except="hir_owner_nodes")]
#[rustc_clean(cfg="cfail3")] #[rustc_clean(cfg="cfail3")]
pub fn change_continue_label() { pub fn change_continue_label() {
let mut _x = 0; let mut _x = 0;
@ -216,7 +216,7 @@ pub fn change_continue_to_break() {
} }
#[cfg(not(cfail1))] #[cfg(not(cfail1))]
#[rustc_clean(cfg="cfail2", except="hir_owner_nodes, mir_built, optimized_mir")] #[rustc_clean(cfg="cfail2", except="hir_owner_nodes, optimized_mir")]
#[rustc_clean(cfg="cfail3")] #[rustc_clean(cfg="cfail3")]
pub fn change_continue_to_break() { pub fn change_continue_to_break() {
let mut _x = 0; let mut _x = 0;