about summary refs log tree commit diff
path: root/src/test
diff options
context:
space:
mode:
authorbors <bors@rust-lang.org>2014-04-03 19:56:45 -0700
committerbors <bors@rust-lang.org>2014-04-03 19:56:45 -0700
commit2a2d0dce87d8d2d77a1266a3b255b04651f36fe2 (patch)
tree4c0b0f3762f8412c78ea96df5726cb1e312268cf /src/test
parentc2e457686b77a7eec906549b73feba314667235b (diff)
parent0875ffcbfff1b8b432ae09dd435466f34e2c61fa (diff)
downloadrust-2a2d0dce87d8d2d77a1266a3b255b04651f36fe2.tar.gz
rust-2a2d0dce87d8d2d77a1266a3b255b04651f36fe2.zip
auto merge of #13296 : brson/rust/0.11-pre, r=alexcrichton
This also changes some of the download links in the documentation
to 'nightly'.
Diffstat (limited to 'src/test')
-rw-r--r--src/test/auxiliary/issue-11908-1.rs2
-rw-r--r--src/test/auxiliary/issue-11908-2.rs2
-rw-r--r--src/test/run-make/crate-data-smoke/Makefile2
-rw-r--r--src/test/run-make/crate-data-smoke/crate.rs2
-rw-r--r--src/test/run-pass/use.rs2
5 files changed, 5 insertions, 5 deletions
diff --git a/src/test/auxiliary/issue-11908-1.rs b/src/test/auxiliary/issue-11908-1.rs
index 1fc06f4f682..b0abde795a8 100644
--- a/src/test/auxiliary/issue-11908-1.rs
+++ b/src/test/auxiliary/issue-11908-1.rs
@@ -10,5 +10,5 @@
 
 // no-prefer-dynamic
 
-#[crate_id = "collections#0.10"];
+#[crate_id = "collections#0.11-pre"];
 #[crate_type = "dylib"];
diff --git a/src/test/auxiliary/issue-11908-2.rs b/src/test/auxiliary/issue-11908-2.rs
index 45a5bc2c496..612ee3608e9 100644
--- a/src/test/auxiliary/issue-11908-2.rs
+++ b/src/test/auxiliary/issue-11908-2.rs
@@ -10,5 +10,5 @@
 
 // no-prefer-dynamic
 
-#[crate_id = "collections#0.10"];
+#[crate_id = "collections#0.11-pre"];
 #[crate_type = "rlib"];
diff --git a/src/test/run-make/crate-data-smoke/Makefile b/src/test/run-make/crate-data-smoke/Makefile
index b849b71d207..f2b246b6437 100644
--- a/src/test/run-make/crate-data-smoke/Makefile
+++ b/src/test/run-make/crate-data-smoke/Makefile
@@ -1,7 +1,7 @@
 -include ../tools.mk
 
 all:
-	[ `$(RUSTC) --crate-id crate.rs` = "foo#0.10" ]
+	[ `$(RUSTC) --crate-id crate.rs` = "foo#0.11-pre" ]
 	[ `$(RUSTC) --crate-name crate.rs` = "foo" ]
 	[ `$(RUSTC) --crate-file-name crate.rs` = "foo" ]
 	[ `$(RUSTC) --crate-file-name --crate-type=lib --test crate.rs` = "foo" ]
diff --git a/src/test/run-make/crate-data-smoke/crate.rs b/src/test/run-make/crate-data-smoke/crate.rs
index e2b69ec53e4..b6587aec0ad 100644
--- a/src/test/run-make/crate-data-smoke/crate.rs
+++ b/src/test/run-make/crate-data-smoke/crate.rs
@@ -8,7 +8,7 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-#[crate_id = "foo#0.10"];
+#[crate_id = "foo#0.11-pre"];
 
 // Querying about the crate metadata should *not* parse the entire crate, it
 // only needs the crate attributes (which are guaranteed to be at the top) be
diff --git a/src/test/run-pass/use.rs b/src/test/run-pass/use.rs
index 468baaa079c..fb021411508 100644
--- a/src/test/run-pass/use.rs
+++ b/src/test/run-pass/use.rs
@@ -17,7 +17,7 @@
 #[no_std];
 extern crate std;
 extern crate zed = "std";
-extern crate bar = "std#0.10";
+extern crate bar = "std#0.11-pre";
 
 
 use std::str;