Skip to content

Commit 3c0d098

Browse files
committed
auto merge of #12674 : alexcrichton/rust/snapshots, r=Aatch
This should fix the travis builds.
2 parents c951696 + b0e0cb5 commit 3c0d098

File tree

2 files changed

+8
-18
lines changed

2 files changed

+8
-18
lines changed

src/librustc/front/test.rs

-18
Original file line numberDiff line numberDiff line change
@@ -313,12 +313,6 @@ fn mk_std(cx: &TestCtxt) -> ast::ViewItem {
313313
}
314314
}
315315

316-
#[cfg(stage0)]
317-
fn mk_test_module(_: &TestCtxt) -> @ast::Item {
318-
fail!("test disabled in this stage due to quasiquoter")
319-
}
320-
321-
#[cfg(not(stage0))]
322316
fn mk_test_module(cx: &TestCtxt) -> @ast::Item {
323317
// Link to test crate
324318
let view_items = vec!(mk_std(cx));
@@ -388,12 +382,6 @@ fn path_node_global(ids: ~[ast::Ident]) -> ast::Path {
388382
}
389383
}
390384

391-
#[cfg(stage0)]
392-
fn mk_tests(_: &TestCtxt) -> @ast::Item {
393-
fail!("tests disabled in this stage due to quasiquoter")
394-
}
395-
396-
#[cfg(not(stage0))]
397385
fn mk_tests(cx: &TestCtxt) -> @ast::Item {
398386
// The vector of test_descs for this crate
399387
let test_descs = mk_test_descs(cx);
@@ -435,12 +423,6 @@ fn mk_test_descs(cx: &TestCtxt) -> @ast::Expr {
435423
}
436424
}
437425

438-
#[cfg(stage0)]
439-
fn mk_test_desc_and_fn_rec(_: &TestCtxt, _: &Test) -> @ast::Expr {
440-
fail!("tests disabled in this stage due to quasiquoter")
441-
}
442-
443-
#[cfg(not(stage0))]
444426
fn mk_test_desc_and_fn_rec(cx: &TestCtxt, test: &Test) -> @ast::Expr {
445427
let span = test.span;
446428
let path = test.path.clone();

src/snapshots.txt

+8
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,11 @@
1+
S 2014-03-03 6e7f170
2+
freebsd-x86_64 1afdfbb838af95cea5d5037018f220356da954f6
3+
linux-i386 edd73d291614907ad502a9f726cd9facb1f2f49f
4+
linux-x86_64 6b4d38bde52db482e5d41cc3fe06f777646930dd
5+
macos-i386 ac4e833996a92f94bff8955035ff4cea92bb11de
6+
macos-x86_64 2ba2903243c7dc31c80305af0b9f9a30b159797a
7+
winnt-i386 e64d3d670f11f48b487024bd3a6838c1d23a7483
8+
19
S 2014-02-22 4995a85
210
freebsd-x86_64 0d8e2577d4b626cd8a5d9c29f0f91a4452bc1621
311
linux-i386 afadce8cba1098b1b9ae1e53a649c1515cd26e3c

0 commit comments

Comments
 (0)