Skip to content

Commit ba9001a

Browse files
committed
Fix incremental tests.
The new println!() expansion doesn't result in any promotions, so `promoted_mir` is removed from these tests.
1 parent afeb43a commit ba9001a

File tree

2 files changed

+9
-9
lines changed

2 files changed

+9
-9
lines changed

src/test/incremental/hashes/inherent_impls.rs

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -44,9 +44,9 @@ impl Foo {
4444
// This should affect the method itself, but not the impl.
4545
#[cfg(any(cfail1,cfail4))]
4646
impl Foo {
47-
//--------------------------------------------------------------------------------------
47+
//-------------------------------------------------------------------------
4848
//--------------------------
49-
//--------------------------------------------------------------------------------------
49+
//-------------------------------------------------------------------------
5050
//--------------------------
5151
pub fn method_body() {
5252
// -----------------------
@@ -59,9 +59,9 @@ impl Foo {
5959
#[rustc_clean(cfg="cfail5")]
6060
#[rustc_clean(cfg="cfail6")]
6161
impl Foo {
62-
#[rustc_clean(cfg="cfail2", except="hir_owner_nodes,optimized_mir,promoted_mir,typeck")]
62+
#[rustc_clean(cfg="cfail2", except="hir_owner_nodes,optimized_mir,typeck")]
6363
#[rustc_clean(cfg="cfail3")]
64-
#[rustc_clean(cfg="cfail5", except="hir_owner_nodes,optimized_mir,promoted_mir,typeck")]
64+
#[rustc_clean(cfg="cfail5", except="hir_owner_nodes,optimized_mir,typeck")]
6565
#[rustc_clean(cfg="cfail6")]
6666
pub fn method_body() {
6767
println!("Hello, world!");
@@ -76,12 +76,12 @@ impl Foo {
7676
impl Foo {
7777
//------------
7878
//---------------
79-
//------------------------------------------------------------
79+
//-----------------------------------------------
8080
//
8181
//--------------------------
8282
//------------
8383
//---------------
84-
//------------------------------------------------------------
84+
//-----------------------------------------------
8585
//
8686
//--------------------------
8787
#[inline]
@@ -98,12 +98,12 @@ impl Foo {
9898
impl Foo {
9999
#[rustc_clean(
100100
cfg="cfail2",
101-
except="hir_owner_nodes,optimized_mir,promoted_mir,typeck"
101+
except="hir_owner_nodes,optimized_mir,typeck"
102102
)]
103103
#[rustc_clean(cfg="cfail3")]
104104
#[rustc_clean(
105105
cfg="cfail5",
106-
except="hir_owner_nodes,optimized_mir,promoted_mir,typeck"
106+
except="hir_owner_nodes,optimized_mir,typeck"
107107
)]
108108
#[rustc_clean(cfg="cfail6")]
109109
#[inline]

src/test/incremental/hygiene/auxiliary/cached_hygiene.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ macro_rules! first_macro {
1313
}
1414
}
1515

16-
#[rustc_clean(except="hir_owner_nodes,typeck,optimized_mir,promoted_mir", cfg="rpass2")]
16+
#[rustc_clean(except="hir_owner_nodes,typeck,optimized_mir", cfg="rpass2")]
1717
#[inline(always)]
1818
pub fn changed_fn() {
1919
// This will cause additional hygiene to be generate,

0 commit comments

Comments
 (0)