auto merge of #11699 : alexcrichton/rust/snapshot, r=huonw

Upgrade the version to 0.10-pre
rust-lang · Jan 21, 2014 · 40df5a2 · 40df5a2
2 parents 6f3326f + cb12de1
commit 40df5a2
Show file tree

Hide file tree

Showing 7 changed files with 14 additions and 11 deletions.
diff --git a/src/libextra/lib.rs b/src/libextra/lib.rs
@@ -20,8 +20,7 @@ Rust extras are part of the standard Rust distribution.
 
 */
 
-// NOTE: upgrade to 0.10-pre after the next snapshot
-#[crate_id = "extra#0.9"];
+#[crate_id = "extra#0.10-pre"];
 #[comment = "Rust extras"];
 #[license = "MIT/ASL2"];
 #[crate_type = "rlib"];

diff --git a/src/libgreen/lib.rs b/src/libgreen/lib.rs
@@ -17,8 +17,7 @@
 //! This can be optionally linked in to rust programs in order to provide M:N
 //! functionality inside of 1:1 programs.
 
-// NOTE: Change to 0.10-pre after snapshot
-#[crate_id = "green#0.9"];
+#[crate_id = "green#0.10-pre"];
 #[license = "MIT/ASL2"];
 #[crate_type = "rlib"];
 #[crate_type = "dylib"];

diff --git a/src/librustc/front/std_inject.rs b/src/librustc/front/std_inject.rs
@@ -21,8 +21,7 @@ use syntax::fold;
 use syntax::opt_vec;
 use syntax::util::small_vector::SmallVector;
 
-// NOTE: upgrade to 0.10-pre after the next snapshot
-pub static VERSION: &'static str = "0.9";
+pub static VERSION: &'static str = "0.10-pre";
 
 pub fn maybe_inject_libstd_ref(sess: Session, crate: ast::Crate)
                                -> ast::Crate {

diff --git a/src/librustuv/lib.rs b/src/librustuv/lib.rs
@@ -34,8 +34,7 @@ via `close` and `delete` methods.
 
 */
 
-// NOTE: Change to 0.10-pre after snapshot
-#[crate_id = "rustuv#0.9"];
+#[crate_id = "rustuv#0.10-pre"];
 #[license = "MIT/ASL2"];
 #[crate_type = "rlib"];
 #[crate_type = "dylib"];

diff --git a/src/libstd/lib.rs b/src/libstd/lib.rs
@@ -43,8 +43,7 @@
 //!
 //!     use std::prelude::*;
 
-// NOTE: Upgrade to 0.10-pre after snapshot
-#[crate_id = "std#0.9"];
+#[crate_id = "std#0.10-pre"];
 #[comment = "The Rust standard library"];
 #[license = "MIT/ASL2"];
 #[crate_type = "rlib"];

diff --git a/src/snapshots.txt b/src/snapshots.txt
@@ -1,3 +1,11 @@
+S 2014-01-20 b6400f9
+  freebsd-x86_64 22b1774700781d190061e66666fdc5f9e9c414ee
+  linux-i386 ca6d66dcbe90806e50a46037c3102cffecce14ed
+  linux-x86_64 ad8b455804ff46aa721db9453438591da4c35b48
+  macos-i386 3e38ca0328422469ba5f25544ca2a9770cff438d
+  macos-x86_64 6458d3b46a951da62c20dd5b587d44333402e30b
+  winnt-i386 2bb2a2d7d834fd98ac23f0afe29f0fc3d6098703
+
 S 2014-01-14 29070c3
   freebsd-x86_64 c2fb6e6313a9f1d41df810fcf1ae354858a8bf76
   linux-i386 6437656b81cf9f3d1377523c1e36d5cf06b2d645

diff --git a/src/test/run-pass/use.rs b/src/test/run-pass/use.rs
@@ -17,7 +17,7 @@
 #[no_std];
 extern mod std;
 extern mod zed = "std";
-extern mod bar = "std#0.9";
+extern mod bar = "std#0.10-pre";
 
 
 use std::str;