Skip to content

Commit 765efb0

Browse files
committed
---
yaml --- r: 276946 b: refs/heads/try c: 54d78a4 h: refs/heads/master
1 parent 71e28e6 commit 765efb0

File tree

3 files changed

+4
-5
lines changed

3 files changed

+4
-5
lines changed

[refs]

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
---
22
refs/heads/master: 6dbb0e86aec11050480beb76eade6fb805010ba7
33
refs/heads/snap-stage3: 235d77457d80b549dad3ac36d94f235208a1eafb
4-
refs/heads/try: 22b4bb051a25ac68a43f092b6fd1ade804c82680
4+
refs/heads/try: 54d78a46c506343be3e355447ecd45886b3c444a
55
refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
66
refs/tags/release-0.2: c870d2dffb391e14efb05aa27898f1f6333a9596
77
refs/tags/release-0.3: b5f0d0f648d9a6153664837026ba1be43d3e2503

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

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,6 @@ mod z {
4848
#[rustc_dirty(label="TransCrateItem", cfg="cfail2")]
4949
pub fn z() {
5050
//[cfail2]~^ ERROR `TypeckItemBody("z::z")` found in dep graph, but should be dirty
51-
// FIXME(#32014) -- TransCrateItem ought to be clean, but it is in fact
52-
// dirty, hence we don't see an error here.
51+
//[cfail2]~| ERROR `TransCrateItem("z::z")` found in dep graph, but should be dirty
5352
}
5453
}

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ mod y {
4141
use x;
4242

4343
#[rustc_clean(label="TypeckItemBody", cfg="rpass2")]
44-
#[rustc_dirty(label="TransCrateItem", cfg="rpass2")]
44+
#[rustc_clean(label="TransCrateItem", cfg="rpass2")]
4545
pub fn y() {
4646
x::x();
4747
}
@@ -51,7 +51,7 @@ mod z {
5151
use y;
5252

5353
#[rustc_clean(label="TypeckItemBody", cfg="rpass2")]
54-
#[rustc_dirty(label="TransCrateItem", cfg="rpass2")]
54+
#[rustc_clean(label="TransCrateItem", cfg="rpass2")]
5555
pub fn z() {
5656
y::y();
5757
}

0 commit comments

Comments
 (0)