auto merge of #10230 : alexcrichton/rust/snapshots, r=brson

Closes #2240
rust-lang · Nov 2, 2013 · 95b1833 · 95b1833
2 parents 9ec4c18 + 9df164c
commit 95b1833
Show file tree

Hide file tree

Showing 5 changed files with 8 additions and 41 deletions.
diff --git a/src/libextra/extra.rs b/src/libextra/extra.rs
@@ -118,9 +118,6 @@ pub mod extra {
     pub use std::clone;
     pub use std::condition;
     pub use std::cmp;
-    // NOTE: Remove import after next snapshot
-    #[cfg(stage0)]
-    pub use std::sys;
     pub use std::unstable;
     pub use std::str;
     pub use std::os;

diff --git a/src/libstd/std.rs b/src/libstd/std.rs
@@ -181,9 +181,6 @@ pub mod os;
 pub mod path;
 pub mod rand;
 pub mod run;
-// NOTE: Remove module after next snapshot
-#[cfg(stage0)]
-pub mod sys;
 pub mod cast;
 pub mod fmt;
 pub mod repr;
@@ -229,9 +226,6 @@ mod std {
     pub use os;
     pub use rt;
     pub use str;
-    // NOTE: Remove import after next snapshot
-    #[cfg(stage0)]
-    pub use sys;
     pub use to_bytes;
     pub use to_str;
     pub use unstable;

diff --git a/src/libstd/sys.rs b/src/libstd/sys.rs
diff --git a/src/libstd/unstable/intrinsics.rs b/src/libstd/unstable/intrinsics.rs
@@ -75,9 +75,6 @@ pub struct TyDesc {
 #[cfg(not(test))]
 pub enum Opaque { }
 
-#[cfg(stage0)]
-pub type Disr = int;
-#[cfg(not(stage0))]
 pub type Disr = u64;
 
 #[lang="ty_visitor"]

diff --git a/src/snapshots.txt b/src/snapshots.txt
@@ -1,3 +1,11 @@
+S 2013-11-01 8ea2123
+  freebsd-x86_64 bc7dea1ca297cfb4bd6d8a32185c6a4fddca3e6b
+  linux-i386 4b33599d160d757f6021ff05d0213fba3097dde2
+  linux-x86_64 e7bfa823fedbee5071b8f50b9ffe0cefef844d7c
+  macos-i386 60a03fed4662abc02b2e836fb0b72b834c9f99d4
+  macos-x86_64 bfe8351d3dc4e60cc9ab033202e75dcaa10ed12d
+  winnt-i386 047a1e1a2b7cb0f91c0a634d816d0d44f9f15aa6
+
 S 2013-10-29 fed48cc
   freebsd-x86_64 4a43216b432511a5fd6b727753aedb749f6a68dc
   linux-i386 53f65d4b1377c17fc12d05d7c4a0fbd92eea071f