adjust incremental tests

RalfJung · RalfJung · commit a84f508e2b22 · 2024-03-24T09:55:41.000+01:00
diff --git a/tests/incremental/callee_caller_cross_crate/b.rs b/tests/incremental/callee_caller_cross_crate/b.rs
@@ -6,7 +6,7 @@
 
 extern crate a;
 
-#[rustc_clean(except="typeck", cfg="rpass2")]
+#[rustc_clean(except="typeck,optimized_mir", cfg="rpass2")]
 pub fn call_function0() {
     a::function0(77);
 }
diff --git a/tests/incremental/dirty_clean.rs b/tests/incremental/dirty_clean.rs
@@ -36,6 +36,7 @@ mod y {
         //[cfail2]~| ERROR `type_of(y)` should be dirty but is not
         //[cfail2]~| ERROR `fn_sig(y)` should be dirty but is not
         //[cfail2]~| ERROR `typeck(y)` should be clean but is not
+        //[cfail2]~| ERROR `optimized_mir(y)` should be clean but is not
         x::x();
     }
 }
diff --git a/tests/incremental/hashes/call_expressions.rs b/tests/incremental/hashes/call_expressions.rs
@@ -62,9 +62,9 @@ mod change_callee_indirectly_function {
     #[cfg(not(any(cfail1,cfail4)))]
     use super::callee2 as callee;
 
-    #[rustc_clean(except="opt_hir_owner_nodes,typeck", cfg="cfail2")]
+    #[rustc_clean(except="opt_hir_owner_nodes,typeck,optimized_mir", cfg="cfail2")]
     #[rustc_clean(cfg="cfail3")]
-    #[rustc_clean(except="opt_hir_owner_nodes,typeck", cfg="cfail5")]
+    #[rustc_clean(except="opt_hir_owner_nodes,typeck,optimized_mir", cfg="cfail5")]
     #[rustc_clean(cfg="cfail6")]
     pub fn change_callee_indirectly_function() {
         callee(1, 2)
diff --git a/tests/incremental/hashes/indexing_expressions.rs b/tests/incremental/hashes/indexing_expressions.rs
@@ -23,9 +23,9 @@ fn change_simple_index(slice: &[u32]) -> u32 {
 }
 
 #[cfg(not(any(cfail1,cfail4)))]
-#[rustc_clean(except="opt_hir_owner_nodes", cfg="cfail2")]
+#[rustc_clean(except="opt_hir_owner_nodes,optimized_mir", cfg="cfail2")]
 #[rustc_clean(cfg="cfail3")]
-#[rustc_clean(except="opt_hir_owner_nodes", cfg="cfail5")]
+#[rustc_clean(except="opt_hir_owner_nodes,optimized_mir", cfg="cfail5")]
 #[rustc_clean(cfg="cfail6")]
 fn change_simple_index(slice: &[u32]) -> u32 {
     slice[4]
@@ -40,9 +40,9 @@ fn change_lower_bound(slice: &[u32]) -> &[u32] {
 }
 
 #[cfg(not(any(cfail1,cfail4)))]
-#[rustc_clean(except="opt_hir_owner_nodes", cfg="cfail2")]
+#[rustc_clean(except="opt_hir_owner_nodes,optimized_mir", cfg="cfail2")]
 #[rustc_clean(cfg="cfail3")]
-#[rustc_clean(except="opt_hir_owner_nodes", cfg="cfail5")]
+#[rustc_clean(except="opt_hir_owner_nodes,optimized_mir", cfg="cfail5")]
 #[rustc_clean(cfg="cfail6")]
 fn change_lower_bound(slice: &[u32]) -> &[u32] {
     &slice[2..5]
@@ -57,9 +57,9 @@ fn change_upper_bound(slice: &[u32]) -> &[u32] {
 }
 
 #[cfg(not(any(cfail1,cfail4)))]
-#[rustc_clean(except="opt_hir_owner_nodes", cfg="cfail2")]
+#[rustc_clean(except="opt_hir_owner_nodes,optimized_mir", cfg="cfail2")]
 #[rustc_clean(cfg="cfail3")]
-#[rustc_clean(except="opt_hir_owner_nodes", cfg="cfail5")]
+#[rustc_clean(except="opt_hir_owner_nodes,optimized_mir", cfg="cfail5")]
 #[rustc_clean(cfg="cfail6")]
 fn change_upper_bound(slice: &[u32]) -> &[u32] {
     &slice[3..7]
@@ -74,9 +74,9 @@ fn add_lower_bound(slice: &[u32]) -> &[u32] {
 }
 
 #[cfg(not(any(cfail1,cfail4)))]
-#[rustc_clean(except="opt_hir_owner_nodes,typeck", cfg="cfail2")]
+#[rustc_clean(except="opt_hir_owner_nodes,typeck,optimized_mir", cfg="cfail2")]
 #[rustc_clean(cfg="cfail3")]
-#[rustc_clean(except="opt_hir_owner_nodes,typeck", cfg="cfail5")]
+#[rustc_clean(except="opt_hir_owner_nodes,typeck,optimized_mir", cfg="cfail5")]
 #[rustc_clean(cfg="cfail6")]
 fn add_lower_bound(slice: &[u32]) -> &[u32] {
     &slice[3..4]
@@ -91,9 +91,9 @@ fn add_upper_bound(slice: &[u32]) -> &[u32] {
 }
 
 #[cfg(not(any(cfail1,cfail4)))]
-#[rustc_clean(except="opt_hir_owner_nodes,typeck", cfg="cfail2")]
+#[rustc_clean(except="opt_hir_owner_nodes,typeck,optimized_mir", cfg="cfail2")]
 #[rustc_clean(cfg="cfail3")]
-#[rustc_clean(except="opt_hir_owner_nodes,typeck", cfg="cfail5")]
+#[rustc_clean(except="opt_hir_owner_nodes,typeck,optimized_mir", cfg="cfail5")]
 #[rustc_clean(cfg="cfail6")]
 fn add_upper_bound(slice: &[u32]) -> &[u32] {
     &slice[3..7]
@@ -108,9 +108,9 @@ fn change_mutability(slice: &mut [u32]) -> u32 {
 }
 
 #[cfg(not(any(cfail1,cfail4)))]
-#[rustc_clean(except="opt_hir_owner_nodes,typeck", cfg="cfail2")]
+#[rustc_clean(except="opt_hir_owner_nodes,typeck,optimized_mir", cfg="cfail2")]
 #[rustc_clean(cfg="cfail3")]
-#[rustc_clean(except="opt_hir_owner_nodes,typeck", cfg="cfail5")]
+#[rustc_clean(except="opt_hir_owner_nodes,typeck,optimized_mir", cfg="cfail5")]
 #[rustc_clean(cfg="cfail6")]
 fn change_mutability(slice: &mut [u32]) -> u32 {
     (&    slice[3..5])[0]
@@ -125,9 +125,9 @@ fn exclusive_to_inclusive_range(slice: &[u32]) -> &[u32] {
 }
 
 #[cfg(not(any(cfail1,cfail4)))]
-#[rustc_clean(except="opt_hir_owner_nodes,typeck", cfg="cfail2")]
+#[rustc_clean(except="opt_hir_owner_nodes,typeck,optimized_mir", cfg="cfail2")]
 #[rustc_clean(cfg="cfail3")]
-#[rustc_clean(except="opt_hir_owner_nodes,typeck", cfg="cfail5")]
+#[rustc_clean(except="opt_hir_owner_nodes,typeck,optimized_mir", cfg="cfail5")]
 #[rustc_clean(cfg="cfail6")]
 fn exclusive_to_inclusive_range(slice: &[u32]) -> &[u32] {
     &slice[3..=7]
diff --git a/tests/incremental/ich_method_call_trait_scope.rs b/tests/incremental/ich_method_call_trait_scope.rs
@@ -26,7 +26,7 @@ mod mod3 {
     #[cfg(rpass2)]
     use Trait2;
 
-    #[rustc_clean(except="typeck", cfg="rpass2")]
+    #[rustc_clean(except="typeck,optimized_mir", cfg="rpass2")]
     fn bar() {
         ().method();
     }
diff --git a/tests/incremental/ich_resolve_results.rs b/tests/incremental/ich_resolve_results.rs
@@ -36,7 +36,7 @@ mod mod3 {
     }
 
     #[rustc_clean(cfg="rpass2")]
-    #[rustc_clean(except="opt_hir_owner_nodes,typeck", cfg="rpass3")]
+    #[rustc_clean(except="opt_hir_owner_nodes,typeck,optimized_mir", cfg="rpass3")]
     fn in_type() {
         test::<Foo>();
     }
diff --git a/tests/incremental/struct_add_field.rs b/tests/incremental/struct_add_field.rs
@@ -21,12 +21,12 @@ pub struct Y {
     pub y: char
 }
 
-#[rustc_clean(except="fn_sig,typeck", cfg="rpass2")]
+#[rustc_clean(except="fn_sig,typeck,optimized_mir", cfg="rpass2")]
 pub fn use_X(x: X) -> u32 {
     x.x as u32
 }
 
-#[rustc_clean(except="typeck", cfg="rpass2")]
+#[rustc_clean(except="typeck,optimized_mir", cfg="rpass2")]
 pub fn use_EmbedX(embed: EmbedX) -> u32 {
     embed.x.x as u32
 }
diff --git a/tests/incremental/struct_change_field_type.rs b/tests/incremental/struct_change_field_type.rs
@@ -24,13 +24,13 @@ pub struct Y {
     pub y: char
 }
 
-#[rustc_clean(except="typeck", cfg="rpass2")]
+#[rustc_clean(except="typeck,optimized_mir", cfg="rpass2")]
 pub fn use_X() -> u32 {
     let x: X = X { x: 22 };
     x.x as u32
 }
 
-#[rustc_clean(except="typeck", cfg="rpass2")]
+#[rustc_clean(except="typeck,optimized_mir", cfg="rpass2")]
 pub fn use_EmbedX(x: EmbedX) -> u32 {
     let x: X = X { x: 22 };
     x.x as u32
diff --git a/tests/incremental/struct_change_field_type_cross_crate/b.rs b/tests/incremental/struct_change_field_type_cross_crate/b.rs
@@ -8,13 +8,13 @@ extern crate a;
 
 use a::*;
 
-#[rustc_clean(except="typeck", cfg="rpass2")]
+#[rustc_clean(except="typeck,optimized_mir", cfg="rpass2")]
 pub fn use_X() -> u32 {
     let x: X = X { x: 22 };
     x.x as u32
 }
 
-#[rustc_clean(except="typeck", cfg="rpass2")]
+#[rustc_clean(except="typeck,optimized_mir", cfg="rpass2")]
 pub fn use_EmbedX(embed: EmbedX) -> u32 {
     embed.x.x as u32
 }
diff --git a/tests/incremental/struct_remove_field.rs b/tests/incremental/struct_remove_field.rs
@@ -25,12 +25,12 @@ pub struct Y {
     pub y: char
 }
 
-#[rustc_clean(except="typeck,fn_sig", cfg="rpass2")]
+#[rustc_clean(except="typeck,fn_sig,optimized_mir", cfg="rpass2")]
 pub fn use_X(x: X) -> u32 {
     x.x as u32
 }
 
-#[rustc_clean(except="typeck", cfg="rpass2")]
+#[rustc_clean(except="typeck,optimized_mir", cfg="rpass2")]
 pub fn use_EmbedX(embed: EmbedX) -> u32 {
     embed.x.x as u32
 }
diff --git a/tests/incremental/type_alias_cross_crate/b.rs b/tests/incremental/type_alias_cross_crate/b.rs
@@ -6,7 +6,7 @@
 
 extern crate a;
 
-#[rustc_clean(except="typeck", cfg="rpass2")]
+#[rustc_clean(except="typeck,optimized_mir", cfg="rpass2")]
 #[rustc_clean(cfg="rpass3")]
 pub fn use_X() -> u32 {
     let x: a::X = 22;

Original file line number	Diff line number	Diff line change
`@@ -6,7 +6,7 @@`
`6`	`6`
`7`	`7`	`extern crate a;`
`8`	`8`
`9`		`-#[rustc_clean(except="typeck", cfg="rpass2")]`
	`9`	`+#[rustc_clean(except="typeck,optimized_mir", cfg="rpass2")]`
`10`	`10`	`pub fn call_function0() {`
`11`	`11`	`a::function0(77);`
`12`	`12`	`}`
Original file line number	Diff line number	Diff line change
`@@ -36,6 +36,7 @@ mod y {`
`36`	`36`	//[cfail2]~\| ERROR `type_of(y)` should be dirty but is not
`37`	`37`	//[cfail2]~\| ERROR `fn_sig(y)` should be dirty but is not
`38`	`38`	//[cfail2]~\| ERROR `typeck(y)` should be clean but is not
	`39`	+ //[cfail2]~\| ERROR `optimized_mir(y)` should be clean but is not
`39`	`40`	`x::x();`
`40`	`41`	`}`
`41`	`42`	`}`
Original file line number	Diff line number	Diff line change
`@@ -26,7 +26,7 @@ mod mod3 {`
`26`	`26`	`#[cfg(rpass2)]`
`27`	`27`	`use Trait2;`
`28`	`28`
`29`		`- #[rustc_clean(except="typeck", cfg="rpass2")]`
	`29`	`+ #[rustc_clean(except="typeck,optimized_mir", cfg="rpass2")]`
`30`	`30`	`fn bar() {`
`31`	`31`	`().method();`
`32`	`32`	`}`
Original file line number	Diff line number	Diff line change
`@@ -36,7 +36,7 @@ mod mod3 {`
`36`	`36`	`}`
`37`	`37`
`38`	`38`	`#[rustc_clean(cfg="rpass2")]`
`39`		`- #[rustc_clean(except="opt_hir_owner_nodes,typeck", cfg="rpass3")]`
	`39`	`+ #[rustc_clean(except="opt_hir_owner_nodes,typeck,optimized_mir", cfg="rpass3")]`
`40`	`40`	`fn in_type() {`
`41`	`41`	`test::<Foo>();`
`42`	`42`	`}`
Original file line number	Diff line number	Diff line change
`@@ -21,12 +21,12 @@ pub struct Y {`
`21`	`21`	`pub y: char`
`22`	`22`	`}`
`23`	`23`
`24`		`-#[rustc_clean(except="fn_sig,typeck", cfg="rpass2")]`
	`24`	`+#[rustc_clean(except="fn_sig,typeck,optimized_mir", cfg="rpass2")]`
`25`	`25`	`pub fn use_X(x: X) -> u32 {`
`26`	`26`	`x.x as u32`
`27`	`27`	`}`
`28`	`28`
`29`		`-#[rustc_clean(except="typeck", cfg="rpass2")]`
	`29`	`+#[rustc_clean(except="typeck,optimized_mir", cfg="rpass2")]`
`30`	`30`	`pub fn use_EmbedX(embed: EmbedX) -> u32 {`
`31`	`31`	`embed.x.x as u32`
`32`	`32`	`}`
Original file line number	Diff line number	Diff line change
`@@ -24,13 +24,13 @@ pub struct Y {`
`24`	`24`	`pub y: char`
`25`	`25`	`}`
`26`	`26`
`27`		`-#[rustc_clean(except="typeck", cfg="rpass2")]`
	`27`	`+#[rustc_clean(except="typeck,optimized_mir", cfg="rpass2")]`
`28`	`28`	`pub fn use_X() -> u32 {`
`29`	`29`	`let x: X = X { x: 22 };`
`30`	`30`	`x.x as u32`
`31`	`31`	`}`
`32`	`32`
`33`		`-#[rustc_clean(except="typeck", cfg="rpass2")]`
	`33`	`+#[rustc_clean(except="typeck,optimized_mir", cfg="rpass2")]`
`34`	`34`	`pub fn use_EmbedX(x: EmbedX) -> u32 {`
`35`	`35`	`let x: X = X { x: 22 };`
`36`	`36`	`x.x as u32`
Original file line number	Diff line number	Diff line change
`@@ -8,13 +8,13 @@ extern crate a;`
`8`	`8`
`9`	`9`	`use a::*;`
`10`	`10`
`11`		`-#[rustc_clean(except="typeck", cfg="rpass2")]`
	`11`	`+#[rustc_clean(except="typeck,optimized_mir", cfg="rpass2")]`
`12`	`12`	`pub fn use_X() -> u32 {`
`13`	`13`	`let x: X = X { x: 22 };`
`14`	`14`	`x.x as u32`
`15`	`15`	`}`
`16`	`16`
`17`		`-#[rustc_clean(except="typeck", cfg="rpass2")]`
	`17`	`+#[rustc_clean(except="typeck,optimized_mir", cfg="rpass2")]`
`18`	`18`	`pub fn use_EmbedX(embed: EmbedX) -> u32 {`
`19`	`19`	`embed.x.x as u32`
`20`	`20`	`}`
Original file line number	Diff line number	Diff line change
`@@ -25,12 +25,12 @@ pub struct Y {`
`25`	`25`	`pub y: char`
`26`	`26`	`}`
`27`	`27`
`28`		`-#[rustc_clean(except="typeck,fn_sig", cfg="rpass2")]`
	`28`	`+#[rustc_clean(except="typeck,fn_sig,optimized_mir", cfg="rpass2")]`
`29`	`29`	`pub fn use_X(x: X) -> u32 {`
`30`	`30`	`x.x as u32`
`31`	`31`	`}`
`32`	`32`
`33`		`-#[rustc_clean(except="typeck", cfg="rpass2")]`
	`33`	`+#[rustc_clean(except="typeck,optimized_mir", cfg="rpass2")]`
`34`	`34`	`pub fn use_EmbedX(embed: EmbedX) -> u32 {`
`35`	`35`	`embed.x.x as u32`
`36`	`36`	`}`