auto merge of #9718 : alexcrichton/rust/snapshots, r=sanxiyn

Now that #9662 is merged, we should be much more easily bootstrappable on windows now.
rust-lang · Oct 5, 2013 · 1a3141b · 1a3141b
2 parents 8cb3426 + 4cc925a
commit 1a3141b
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 12 deletions.
diff --git a/src/libstd/reflect.rs b/src/libstd/reflect.rs
@@ -166,14 +166,6 @@ impl<V:TyVisitor + MovePtr> TyVisitor for MovePtrAdaptor<V> {
         true
     }
 
-    #[cfg(stage0)]
-    fn visit_float(&mut self) -> bool {
-        self.align_to::<float>();
-        if ! self.inner.visit_float() { return false; }
-        self.bump_past::<float>();
-        true
-    }
-
     fn visit_f32(&mut self) -> bool {
         self.align_to::<f32>();
         if ! self.inner.visit_f32() { return false; }

diff --git a/src/libstd/repr.rs b/src/libstd/repr.rs
@@ -271,8 +271,6 @@ impl<'self> TyVisitor for ReprVisitor<'self> {
     fn visit_u32(&mut self) -> bool { self.write::<u32>() }
     fn visit_u64(&mut self) -> bool { self.write::<u64>() }
 
-    #[cfg(stage0)]
-    fn visit_float(&mut self) -> bool { self.write::<f64>() }
     fn visit_f32(&mut self) -> bool { self.write::<f32>() }
     fn visit_f64(&mut self) -> bool { self.write::<f64>() }
 

diff --git a/src/libstd/unstable/intrinsics.rs b/src/libstd/unstable/intrinsics.rs
@@ -94,8 +94,6 @@ pub trait TyVisitor {
     fn visit_u32(&mut self) -> bool;
     fn visit_u64(&mut self) -> bool;
 
-    #[cfg(stage0)]
-    fn visit_float(&mut self) -> bool;
     fn visit_f32(&mut self) -> bool;
     fn visit_f64(&mut self) -> bool;
 

diff --git a/src/snapshots.txt b/src/snapshots.txt
@@ -1,3 +1,11 @@
+S 2013-10-04 8bb55db
+  freebsd-x86_64 8b68b99033e68f5d98e3e3d077de9d2e085be1ba
+  linux-i386 10bc0069efdca378155640963d70d3a08a7248dc
+  linux-x86_64 b69a32998c798c0e6d3b628aa9c2aa5b56e01e5b
+  macos-i386 e7deef6e0252322086697b40caf45d7614795b5a
+  macos-x86_64 3664ef781d302e115d8d90bdbb58759b94247542
+  winnt-i386 443fa28f8168e25413dcf23bfd35578829e73360
+
 S 2013-10-01 320af9b
   freebsd-x86_64 a228e126beacd282bf64dfea972775e4bbf0f2cb
   linux-i386 5ea6415f07001dfe628009059fe84621ded9569e