---

yaml
---
r: 274027
b: refs/heads/beta
c: 54d78a4
h: refs/heads/master
i:
  274025: 6f2939c
  274023: 3d69047

Author: nikomatsakis

[refs]

@@ -23,7 +23,7 @@ refs/tags/0.9: 36870b185fc5f5486636d4515f0e22677493f225
 refs/tags/0.10: ac33f2b15782272ae348dbd7b14b8257b2148b5a
 refs/tags/0.11.0: e1247cb1d0d681be034adb4b558b5a0c0d5720f9
 refs/tags/0.12.0: f0c419429ef30723ceaf6b42f9b5a2aeb5d2e2d1
-refs/heads/beta: 22b4bb051a25ac68a43f092b6fd1ade804c82680
+refs/heads/beta: 54d78a46c506343be3e355447ecd45886b3c444a
 refs/tags/1.0.0-alpha: e42bd6d93a1d3433c486200587f8f9e12590a4d7
 refs/heads/tmp: e06d2ad9fcd5027bcaac5b08fc9aa39a49d0ecd3
 refs/tags/1.0.0-alpha.2: 4c705f6bc559886632d3871b04f58aab093bfa2f

branches/beta/src/test/incremental/dirty_clean.rs

@@ -48,7 +48,6 @@ mod z {
     #[rustc_dirty(label="TransCrateItem", cfg="cfail2")]
     pub fn z() {
         //[cfail2]~^ ERROR `TypeckItemBody("z::z")` found in dep graph, but should be dirty
-        // FIXME(#32014) -- TransCrateItem ought to be clean, but it is in fact
-        // dirty, hence we don't see an error here.
+        //[cfail2]~| ERROR `TransCrateItem("z::z")` found in dep graph, but should be dirty
     }
 }

branches/beta/src/test/incremental/string_constant.rs

@@ -41,7 +41,7 @@ mod y {
     use x;
 
     #[rustc_clean(label="TypeckItemBody", cfg="rpass2")]
-    #[rustc_dirty(label="TransCrateItem", cfg="rpass2")]
+    #[rustc_clean(label="TransCrateItem", cfg="rpass2")]
     pub fn y() {
         x::x();
     }
@@ -51,7 +51,7 @@ mod z {
     use y;
 
     #[rustc_clean(label="TypeckItemBody", cfg="rpass2")]
-    #[rustc_dirty(label="TransCrateItem", cfg="rpass2")]
+    #[rustc_clean(label="TransCrateItem", cfg="rpass2")]
     pub fn z() {
         y::y();
     }