auto merge of #12674 : alexcrichton/rust/snapshots, r=Aatch

This should fix the travis builds.

Author: bors

src/librustc/front/test.rs

@@ -313,12 +313,6 @@ fn mk_std(cx: &TestCtxt) -> ast::ViewItem {
     }
 }
 
-#[cfg(stage0)]
-fn mk_test_module(_: &TestCtxt) -> @ast::Item {
-    fail!("test disabled in this stage due to quasiquoter")
-}
-
-#[cfg(not(stage0))]
 fn mk_test_module(cx: &TestCtxt) -> @ast::Item {
     // Link to test crate
     let view_items = vec!(mk_std(cx));
@@ -388,12 +382,6 @@ fn path_node_global(ids: ~[ast::Ident]) -> ast::Path {
     }
 }
 
-#[cfg(stage0)]
-fn mk_tests(_: &TestCtxt) -> @ast::Item {
-    fail!("tests disabled in this stage due to quasiquoter")
-}
-
-#[cfg(not(stage0))]
 fn mk_tests(cx: &TestCtxt) -> @ast::Item {
     // The vector of test_descs for this crate
     let test_descs = mk_test_descs(cx);
@@ -435,12 +423,6 @@ fn mk_test_descs(cx: &TestCtxt) -> @ast::Expr {
     }
 }
 
-#[cfg(stage0)]
-fn mk_test_desc_and_fn_rec(_: &TestCtxt, _: &Test) -> @ast::Expr {
-    fail!("tests disabled in this stage due to quasiquoter")
-}
-
-#[cfg(not(stage0))]
 fn mk_test_desc_and_fn_rec(cx: &TestCtxt, test: &Test) -> @ast::Expr {
     let span = test.span;
     let path = test.path.clone();

src/snapshots.txt

@@ -1,3 +1,11 @@
+S 2014-03-03 6e7f170
+  freebsd-x86_64 1afdfbb838af95cea5d5037018f220356da954f6
+  linux-i386 edd73d291614907ad502a9f726cd9facb1f2f49f
+  linux-x86_64 6b4d38bde52db482e5d41cc3fe06f777646930dd
+  macos-i386 ac4e833996a92f94bff8955035ff4cea92bb11de
+  macos-x86_64 2ba2903243c7dc31c80305af0b9f9a30b159797a
+  winnt-i386 e64d3d670f11f48b487024bd3a6838c1d23a7483
+
 S 2014-02-22 4995a85
   freebsd-x86_64 0d8e2577d4b626cd8a5d9c29f0f91a4452bc1621
   linux-i386 afadce8cba1098b1b9ae1e53a649c1515cd26e3c