auto merge of #14073 : alexcrichton/rust/snapshots, r=huonw

5 files changed, 5 insertions, 42 deletions

diff --git a/src/libstd/fmt/mod.rs b/src/libstd/fmt/mod.rs
index 8846fa3f6f3..7363593bacf 100644
--- a/src/libstd/fmt/mod.rs
+++ b/src/libstd/fmt/mod.rs
@@ -512,32 +512,6 @@ pub use self::num::RadixFmt;
 mod num;
 pub mod rt;
 
-#[cfg(stage0)]
-#[allow(missing_doc)]
-pub mod parse {
-    #[deriving(Eq)]
-    pub enum Alignment {
-        AlignLeft,
-        AlignRight,
-        AlignUnknown,
-    }
-
-    pub enum PluralKeyword {
-        Zero,
-        One,
-        Two,
-        Few,
-        Many,
-    }
-
-    pub enum Flag {
-        FlagSignPlus,
-        FlagSignMinus,
-        FlagAlternate,
-        FlagSignAwareZeroPad,
-    }
-}
-
 pub type Result = io::IoResult<()>;
 
 /// A struct to represent both where to emit formatting strings to and how they
diff --git a/src/libstd/fmt/rt.rs b/src/libstd/fmt/rt.rs
index 33e86a4485b..00c8661c8e3 100644
--- a/src/libstd/fmt/rt.rs
+++ b/src/libstd/fmt/rt.rs
@@ -19,15 +19,6 @@
 
 use option::Option;
 
-#[cfg(stage0)]
-pub use fmt::parse::{Alignment, AlignLeft, AlignRight, AlignUnknown};
-#[cfg(stage0)]
-pub use fmt::parse::{PluralKeyword, Zero, One, Two, Few, Many};
-#[cfg(stage0)]
-pub use fmt::parse::{Flag, FlagSignPlus, FlagSignMinus, FlagSignAwareZeroPad};
-#[cfg(stage0)]
-pub use fmt::parse::{FlagAlternate};
-
 pub enum Piece<'a> {
     String(&'a str),
     // FIXME(#8259): this shouldn't require the unit-value here
@@ -49,7 +40,6 @@ pub struct FormatSpec {
     pub width: Count,
 }
 
-#[cfg(not(stage0))]
 #[deriving(Eq)]
 pub enum Alignment {
     AlignLeft,
@@ -65,7 +55,6 @@ pub enum Position {
     ArgumentNext, ArgumentIs(uint)
 }
 
-#[cfg(not(stage0))]
 pub enum Flag {
     FlagSignPlus,
     FlagSignMinus,
diff --git a/src/libstd/reflect.rs b/src/libstd/reflect.rs
index ec7b6cfa355..02535ccee51 100644
--- a/src/libstd/reflect.rs
+++ b/src/libstd/reflect.rs
@@ -367,7 +367,7 @@ impl<V:TyVisitor + MovePtr> TyVisitor for MovePtrAdaptor<V> {
     }
 
     fn visit_enter_enum(&mut self, n_variants: uint,
-                        get_disr: extern unsafe fn(ptr: *Opaque) -> Disr,
+                        get_disr: unsafe extern fn(ptr: *Opaque) -> Disr,
                         sz: uint, align: uint)
                      -> bool {
         self.align(align);
@@ -408,7 +408,7 @@ impl<V:TyVisitor + MovePtr> TyVisitor for MovePtrAdaptor<V> {
     }
 
     fn visit_leave_enum(&mut self, n_variants: uint,
-                        get_disr: extern unsafe fn(ptr: *Opaque) -> Disr,
+                        get_disr: unsafe extern fn(ptr: *Opaque) -> Disr,
                         sz: uint, align: uint) -> bool {
         if ! self.inner.visit_leave_enum(n_variants, get_disr, sz, align) {
             return false;
diff --git a/src/libstd/repr.rs b/src/libstd/repr.rs
index 35c5cbc85c3..6e47203b56c 100644
--- a/src/libstd/repr.rs
+++ b/src/libstd/repr.rs
@@ -464,7 +464,7 @@ impl<'a> TyVisitor for ReprVisitor<'a> {
 
     fn visit_enter_enum(&mut self,
                         _n_variants: uint,
-                        get_disr: extern unsafe fn(ptr: *Opaque) -> Disr,
+                        get_disr: unsafe extern fn(ptr: *Opaque) -> Disr,
                         _sz: uint,
                         _align: uint) -> bool {
         let disr = unsafe {
@@ -538,7 +538,7 @@ impl<'a> TyVisitor for ReprVisitor<'a> {
 
     fn visit_leave_enum(&mut self,
                         _n_variants: uint,
-                        _get_disr: extern unsafe fn(ptr: *Opaque) -> Disr,
+                        _get_disr: unsafe extern fn(ptr: *Opaque) -> Disr,
                         _sz: uint,
                         _align: uint)
                         -> bool {
diff --git a/src/libstd/rt/thread.rs b/src/libstd/rt/thread.rs
index bc9a0b3460a..89d44473a94 100644
--- a/src/libstd/rt/thread.rs
+++ b/src/libstd/rt/thread.rs
@@ -294,7 +294,7 @@ mod imp {
     #[cfg(target_os = "linux")]
     fn min_stack_size(attr: *libc::pthread_attr_t) -> libc::size_t {
         use ptr::RawPtr;
-        type F = extern "C" unsafe fn(*libc::pthread_attr_t) -> libc::size_t;
+        type F = unsafe extern "C" fn(*libc::pthread_attr_t) -> libc::size_t;
         extern {
             #[linkage = "extern_weak"]
             static __pthread_get_minstack: *();