Skip to content

Commit 40df5a2

Browse files
committed
auto merge of #11699 : alexcrichton/rust/snapshot, r=huonw
Upgrade the version to 0.10-pre
2 parents 6f3326f + cb12de1 commit 40df5a2

File tree

7 files changed

+14
-11
lines changed

7 files changed

+14
-11
lines changed

src/libextra/lib.rs

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,8 +20,7 @@ Rust extras are part of the standard Rust distribution.
2020
2121
*/
2222

23-
// NOTE: upgrade to 0.10-pre after the next snapshot
24-
#[crate_id = "extra#0.9"];
23+
#[crate_id = "extra#0.10-pre"];
2524
#[comment = "Rust extras"];
2625
#[license = "MIT/ASL2"];
2726
#[crate_type = "rlib"];

src/libgreen/lib.rs

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,8 +17,7 @@
1717
//! This can be optionally linked in to rust programs in order to provide M:N
1818
//! functionality inside of 1:1 programs.
1919
20-
// NOTE: Change to 0.10-pre after snapshot
21-
#[crate_id = "green#0.9"];
20+
#[crate_id = "green#0.10-pre"];
2221
#[license = "MIT/ASL2"];
2322
#[crate_type = "rlib"];
2423
#[crate_type = "dylib"];

src/librustc/front/std_inject.rs

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,8 +21,7 @@ use syntax::fold;
2121
use syntax::opt_vec;
2222
use syntax::util::small_vector::SmallVector;
2323

24-
// NOTE: upgrade to 0.10-pre after the next snapshot
25-
pub static VERSION: &'static str = "0.9";
24+
pub static VERSION: &'static str = "0.10-pre";
2625

2726
pub fn maybe_inject_libstd_ref(sess: Session, crate: ast::Crate)
2827
-> ast::Crate {

src/librustuv/lib.rs

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -34,8 +34,7 @@ via `close` and `delete` methods.
3434
3535
*/
3636

37-
// NOTE: Change to 0.10-pre after snapshot
38-
#[crate_id = "rustuv#0.9"];
37+
#[crate_id = "rustuv#0.10-pre"];
3938
#[license = "MIT/ASL2"];
4039
#[crate_type = "rlib"];
4140
#[crate_type = "dylib"];

src/libstd/lib.rs

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -43,8 +43,7 @@
4343
//!
4444
//! use std::prelude::*;
4545
46-
// NOTE: Upgrade to 0.10-pre after snapshot
47-
#[crate_id = "std#0.9"];
46+
#[crate_id = "std#0.10-pre"];
4847
#[comment = "The Rust standard library"];
4948
#[license = "MIT/ASL2"];
5049
#[crate_type = "rlib"];

src/snapshots.txt

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,11 @@
1+
S 2014-01-20 b6400f9
2+
freebsd-x86_64 22b1774700781d190061e66666fdc5f9e9c414ee
3+
linux-i386 ca6d66dcbe90806e50a46037c3102cffecce14ed
4+
linux-x86_64 ad8b455804ff46aa721db9453438591da4c35b48
5+
macos-i386 3e38ca0328422469ba5f25544ca2a9770cff438d
6+
macos-x86_64 6458d3b46a951da62c20dd5b587d44333402e30b
7+
winnt-i386 2bb2a2d7d834fd98ac23f0afe29f0fc3d6098703
8+
19
S 2014-01-14 29070c3
210
freebsd-x86_64 c2fb6e6313a9f1d41df810fcf1ae354858a8bf76
311
linux-i386 6437656b81cf9f3d1377523c1e36d5cf06b2d645

src/test/run-pass/use.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
#[no_std];
1818
extern mod std;
1919
extern mod zed = "std";
20-
extern mod bar = "std#0.9";
20+
extern mod bar = "std#0.10-pre";
2121

2222

2323
use std::str;

0 commit comments

Comments
 (0)