Update 'while loop' fingerprint hash tests

1 files changed, 36 insertions, 54 deletions

diff --git a/src/test/incremental/hashes/while_loops.rs b/src/test/incremental/hashes/while_loops.rs
index 6b1898e401b..30989f33b4b 100644
--- a/src/test/incremental/hashes/while_loops.rs
+++ b/src/test/incremental/hashes/while_loops.rs
@@ -27,7 +27,7 @@
 
 // Change loop body ------------------------------------------------------------
 #[cfg(cfail1)]
-fn change_loop_body() {
+pub fn change_loop_body() {
     let mut _x = 0;
     while true {
         _x = 1;
@@ -36,11 +36,9 @@ fn change_loop_body() {
 }
 
 #[cfg(not(cfail1))]
-#[rustc_clean(label="Hir", cfg="cfail2")]
-#[rustc_clean(label="Hir", cfg="cfail3")]
-#[rustc_dirty(label="HirBody", cfg="cfail2")]
-#[rustc_clean(label="HirBody", cfg="cfail3")]
-fn change_loop_body() {
+#[rustc_clean(cfg="cfail2", except="HirBody, MirValidated, MirOptimized")]
+#[rustc_clean(cfg="cfail3")]
+pub fn change_loop_body() {
     let mut _x = 0;
     while true {
         _x = 2;
@@ -52,7 +50,7 @@ fn change_loop_body() {
 
 // Change loop body ------------------------------------------------------------
 #[cfg(cfail1)]
-fn change_loop_condition() {
+pub fn change_loop_condition() {
     let mut _x = 0;
     while true {
         _x = 1;
@@ -61,11 +59,9 @@ fn change_loop_condition() {
 }
 
 #[cfg(not(cfail1))]
-#[rustc_clean(label="Hir", cfg="cfail2")]
-#[rustc_clean(label="Hir", cfg="cfail3")]
-#[rustc_dirty(label="HirBody", cfg="cfail2")]
-#[rustc_clean(label="HirBody", cfg="cfail3")]
-fn change_loop_condition() {
+#[rustc_clean(cfg="cfail2", except="HirBody, MirValidated, MirOptimized")]
+#[rustc_clean(cfg="cfail3")]
+pub fn change_loop_condition() {
     let mut _x = 0;
     while false {
         _x = 1;
@@ -77,7 +73,7 @@ fn change_loop_condition() {
 
 // Add break -------------------------------------------------------------------
 #[cfg(cfail1)]
-fn add_break() {
+pub fn add_break() {
     let mut _x = 0;
     while true {
         _x = 1;
@@ -85,11 +81,9 @@ fn add_break() {
 }
 
 #[cfg(not(cfail1))]
-#[rustc_clean(label="Hir", cfg="cfail2")]
-#[rustc_clean(label="Hir", cfg="cfail3")]
-#[rustc_dirty(label="HirBody", cfg="cfail2")]
-#[rustc_clean(label="HirBody", cfg="cfail3")]
-fn add_break() {
+#[rustc_clean(cfg="cfail2", except="HirBody, MirValidated, MirOptimized, TypeckTables")]
+#[rustc_clean(cfg="cfail3")]
+pub fn add_break() {
     let mut _x = 0;
     while true {
         _x = 1;
@@ -101,7 +95,7 @@ fn add_break() {
 
 // Add loop label --------------------------------------------------------------
 #[cfg(cfail1)]
-fn add_loop_label() {
+pub fn add_loop_label() {
     let mut _x = 0;
     while true {
         _x = 1;
@@ -110,11 +104,9 @@ fn add_loop_label() {
 }
 
 #[cfg(not(cfail1))]
-#[rustc_clean(label="Hir", cfg="cfail2")]
-#[rustc_clean(label="Hir", cfg="cfail3")]
-#[rustc_dirty(label="HirBody", cfg="cfail2")]
-#[rustc_clean(label="HirBody", cfg="cfail3")]
-fn add_loop_label() {
+#[rustc_clean(cfg="cfail2", except="HirBody")]
+#[rustc_clean(cfg="cfail3")]
+pub fn add_loop_label() {
     let mut _x = 0;
     'label: while true {
         _x = 1;
@@ -126,7 +118,7 @@ fn add_loop_label() {
 
 // Add loop label to break -----------------------------------------------------
 #[cfg(cfail1)]
-fn add_loop_label_to_break() {
+pub fn add_loop_label_to_break() {
     let mut _x = 0;
     'label: while true {
         _x = 1;
@@ -135,11 +127,9 @@ fn add_loop_label_to_break() {
 }
 
 #[cfg(not(cfail1))]
-#[rustc_clean(label="Hir", cfg="cfail2")]
-#[rustc_clean(label="Hir", cfg="cfail3")]
-#[rustc_dirty(label="HirBody", cfg="cfail2")]
-#[rustc_clean(label="HirBody", cfg="cfail3")]
-fn add_loop_label_to_break() {
+#[rustc_clean(cfg="cfail2", except="HirBody")]
+#[rustc_clean(cfg="cfail3")]
+pub fn add_loop_label_to_break() {
     let mut _x = 0;
     'label: while true {
         _x = 1;
@@ -151,7 +141,7 @@ fn add_loop_label_to_break() {
 
 // Change break label ----------------------------------------------------------
 #[cfg(cfail1)]
-fn change_break_label() {
+pub fn change_break_label() {
     let mut _x = 0;
     'outer: while true {
         'inner: while true {
@@ -162,11 +152,9 @@ fn change_break_label() {
 }
 
 #[cfg(not(cfail1))]
-#[rustc_clean(label="Hir", cfg="cfail2")]
-#[rustc_clean(label="Hir", cfg="cfail3")]
-#[rustc_dirty(label="HirBody", cfg="cfail2")]
-#[rustc_clean(label="HirBody", cfg="cfail3")]
-fn change_break_label() {
+#[rustc_clean(cfg="cfail2", except="HirBody, MirValidated, MirOptimized")]
+#[rustc_clean(cfg="cfail3")]
+pub fn change_break_label() {
     let mut _x = 0;
     'outer: while true {
         'inner: while true {
@@ -180,7 +168,7 @@ fn change_break_label() {
 
 // Add loop label to continue --------------------------------------------------
 #[cfg(cfail1)]
-fn add_loop_label_to_continue() {
+pub fn add_loop_label_to_continue() {
     let mut _x = 0;
     'label: while true {
         _x = 1;
@@ -189,11 +177,9 @@ fn add_loop_label_to_continue() {
 }
 
 #[cfg(not(cfail1))]
-#[rustc_clean(label="Hir", cfg="cfail2")]
-#[rustc_clean(label="Hir", cfg="cfail3")]
-#[rustc_dirty(label="HirBody", cfg="cfail2")]
-#[rustc_clean(label="HirBody", cfg="cfail3")]
-fn add_loop_label_to_continue() {
+#[rustc_clean(cfg="cfail2", except="HirBody")]
+#[rustc_clean(cfg="cfail3")]
+pub fn add_loop_label_to_continue() {
     let mut _x = 0;
     'label: while true {
         _x = 1;
@@ -205,7 +191,7 @@ fn add_loop_label_to_continue() {
 
 // Change continue label ----------------------------------------------------------
 #[cfg(cfail1)]
-fn change_continue_label() {
+pub fn change_continue_label() {
     let mut _x = 0;
     'outer: while true {
         'inner: while true {
@@ -216,11 +202,9 @@ fn change_continue_label() {
 }
 
 #[cfg(not(cfail1))]
-#[rustc_clean(label="Hir", cfg="cfail2")]
-#[rustc_clean(label="Hir", cfg="cfail3")]
-#[rustc_dirty(label="HirBody", cfg="cfail2")]
-#[rustc_clean(label="HirBody", cfg="cfail3")]
-fn change_continue_label() {
+#[rustc_clean(cfg="cfail2", except="HirBody, MirValidated")]
+#[rustc_clean(cfg="cfail3")]
+pub fn change_continue_label() {
     let mut _x = 0;
     'outer: while true {
         'inner: while true {
@@ -234,7 +218,7 @@ fn change_continue_label() {
 
 // Change continue to break ----------------------------------------------------
 #[cfg(cfail1)]
-fn change_continue_to_break() {
+pub fn change_continue_to_break() {
     let mut _x = 0;
     while true {
         _x = 1;
@@ -243,11 +227,9 @@ fn change_continue_to_break() {
 }
 
 #[cfg(not(cfail1))]
-#[rustc_clean(label="Hir", cfg="cfail2")]
-#[rustc_clean(label="Hir", cfg="cfail3")]
-#[rustc_dirty(label="HirBody", cfg="cfail2")]
-#[rustc_clean(label="HirBody", cfg="cfail3")]
-fn change_continue_to_break() {
+#[rustc_clean(cfg="cfail2", except="HirBody, MirValidated, MirOptimized")]
+#[rustc_clean(cfg="cfail3")]
+pub fn change_continue_to_break() {
     let mut _x = 0;
     while true {
         _x = 1;