diff options
| author | bors <bors@rust-lang.org> | 2014-03-03 05:51:38 -0800 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2014-03-03 05:51:38 -0800 |
| commit | 6e7f170fedd3c526a643c0b2d13863acd982be02 (patch) | |
| tree | 64481e0e910fba5c7aaf57aa4d03fe46b8680039 | |
| parent | 3f3425a5550e7d8b58d782425b09eab20b91c1c0 (diff) | |
| parent | 58802d6ad46d5070ae070813f429bd5afb98db17 (diff) | |
| download | rust-6e7f170fedd3c526a643c0b2d13863acd982be02.tar.gz rust-6e7f170fedd3c526a643c0b2d13863acd982be02.zip | |
auto merge of #12665 : alexcrichton/rust/fix-snap-again, r=huonw
This should get us a passing snapshot again.
| -rw-r--r-- | src/test/run-pass-fulldeps/macro-crate-outlive-expansion-phase.rs | 1 | ||||
| -rw-r--r-- | src/test/run-pass-fulldeps/macro-crate.rs | 1 |
2 files changed, 2 insertions, 0 deletions
diff --git a/src/test/run-pass-fulldeps/macro-crate-outlive-expansion-phase.rs b/src/test/run-pass-fulldeps/macro-crate-outlive-expansion-phase.rs index 80ebf54559f..eb705b8d8a0 100644 --- a/src/test/run-pass-fulldeps/macro-crate-outlive-expansion-phase.rs +++ b/src/test/run-pass-fulldeps/macro-crate-outlive-expansion-phase.rs @@ -12,6 +12,7 @@ // ignore-stage1 // ignore-fast // ignore-android +// ignore-cross-compile #12102 #[feature(phase)]; diff --git a/src/test/run-pass-fulldeps/macro-crate.rs b/src/test/run-pass-fulldeps/macro-crate.rs index 6738bd245e3..69c6e7b0585 100644 --- a/src/test/run-pass-fulldeps/macro-crate.rs +++ b/src/test/run-pass-fulldeps/macro-crate.rs @@ -12,6 +12,7 @@ // ignore-stage1 // ignore-fast // ignore-android +// ignore-cross-compile #12102 #[feature(phase)]; |