diff options
| author | bors <bors@rust-lang.org> | 2014-04-03 13:52:03 -0700 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2014-04-03 13:52:03 -0700 |
| commit | bb31cb8d2e4e415cbb71d368918d72902e655e01 (patch) | |
| tree | bf44811a29eb5f1dba840f22d1d8b59df27fc9e8 /src/test | |
| parent | 6f1c06d6a1b97fcd80d85c38bb33f8350c750401 (diff) | |
| parent | 46867cc3e4ddcbb1d359a315805de00094dacaf9 (diff) | |
| download | rust-bb31cb8d2e4e415cbb71d368918d72902e655e01.tar.gz rust-bb31cb8d2e4e415cbb71d368918d72902e655e01.zip | |
auto merge of #13286 : alexcrichton/rust/release, r=brson
Merging the 0.10 release into the master branch.
Diffstat (limited to 'src/test')
| -rw-r--r-- | src/test/auxiliary/issue-11908-1.rs | 2 | ||||
| -rw-r--r-- | src/test/auxiliary/issue-11908-2.rs | 2 | ||||
| -rw-r--r-- | src/test/run-make/crate-data-smoke/Makefile | 2 | ||||
| -rw-r--r-- | src/test/run-make/crate-data-smoke/crate.rs | 2 | ||||
| -rw-r--r-- | src/test/run-pass/use.rs | 2 |
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 f06929a5dee..1fc06f4f682 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-pre"]; +#[crate_id = "collections#0.10"]; #[crate_type = "dylib"]; diff --git a/src/test/auxiliary/issue-11908-2.rs b/src/test/auxiliary/issue-11908-2.rs index 345be34f377..45a5bc2c496 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-pre"]; +#[crate_id = "collections#0.10"]; #[crate_type = "rlib"]; diff --git a/src/test/run-make/crate-data-smoke/Makefile b/src/test/run-make/crate-data-smoke/Makefile index 5009ed15ee6..b849b71d207 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-pre" ] + [ `$(RUSTC) --crate-id crate.rs` = "foo#0.10" ] [ `$(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 71b54f6c341..e2b69ec53e4 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-pre"]; +#[crate_id = "foo#0.10"]; // 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 1d65a0a5e9e..468baaa079c 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-pre"; +extern crate bar = "std#0.10"; use std::str; |