diff --git a/src/libstd/fmt/mod.rs b/src/libstd/fmt/mod.rs index 4032515f985e3..383130cda376c 100644 --- a/src/libstd/fmt/mod.rs +++ b/src/libstd/fmt/mod.rs @@ -673,24 +673,6 @@ impl<'self> Formatter<'self> { } } - #[cfg(stage0)] - fn getcount(&mut self, cnt: &parse::Count) -> Option { - match *cnt { - parse::CountIs(n) => { Some(n) } - parse::CountImplied => { None } - parse::CountIsParam(i) => { - let v = self.args[i].value; - unsafe { Some(*(v as *util::Void as *uint)) } - } - parse::CountIsNextParam => { - let v = self.curarg.next().unwrap().value; - unsafe { Some(*(v as *util::Void as *uint)) } - } - parse::CountIsName(*) => unreachable!() - } - } - - #[cfg(not(stage0))] fn getcount(&mut self, cnt: &rt::Count) -> Option { match *cnt { rt::CountIs(n) => { Some(n) } diff --git a/src/libstd/fmt/parse.rs b/src/libstd/fmt/parse.rs index 11b869c930ef4..8903d817c3fca 100644 --- a/src/libstd/fmt/parse.rs +++ b/src/libstd/fmt/parse.rs @@ -48,27 +48,6 @@ pub struct Argument<'self> { /// Specification for the formatting of an argument in the format string. #[deriving(Eq)] -#[cfg(stage0)] -pub struct FormatSpec<'self> { - /// Optionally specified character to fill alignment with - fill: Option, - /// Optionally specified alignment - align: Alignment, - /// Packed version of various flags provided - flags: uint, - /// The integer precision to use - precision: Count, - /// The string width requested for the resulting format - width: Count, - /// The descriptor string representing the name of the format desired for - /// this argument, this can be empty or any number of characters, although - /// it is required to be one word. - ty: &'self str -} - -/// Specification for the formatting of an argument in the format string. -#[deriving(Eq)] -#[cfg(not(stage0))] pub struct FormatSpec<'self> { /// Optionally specified character to fill alignment with fill: Option, @@ -113,18 +92,6 @@ pub enum Flag { /// can reference either an argument or a literal integer. #[deriving(Eq)] #[allow(missing_doc)] -#[cfg(stage0)] -pub enum Count { - CountIs(uint), - CountIsParam(uint), - CountIsName(&'static str), // not actually used, see stage1 - CountIsNextParam, - CountImplied, -} - -#[deriving(Eq)] -#[allow(missing_doc)] -#[cfg(not(stage0))] pub enum Count<'self> { CountIs(uint), CountIsName(&'self str), @@ -594,20 +561,6 @@ impl<'self> Parser<'self> { /// Parses a Count parameter at the current position. This does not check /// for 'CountIsNextParam' because that is only used in precision, not /// width. - #[cfg(stage0)] - fn count(&mut self) -> Count { - match self.integer() { - Some(i) => { - if self.consume('$') { - CountIsParam(i) - } else { - CountIs(i) - } - } - None => { CountImplied } - } - } - #[cfg(not(stage0))] fn count(&mut self) -> Count<'self> { match self.integer() { Some(i) => { diff --git a/src/libstd/fmt/rt.rs b/src/libstd/fmt/rt.rs index 063d712dfa9fe..b20af1a35b8c7 100644 --- a/src/libstd/fmt/rt.rs +++ b/src/libstd/fmt/rt.rs @@ -34,16 +34,6 @@ pub struct Argument<'self> { method: Option<&'self Method<'self>> } -#[cfg(stage0)] -pub struct FormatSpec { - fill: char, - align: parse::Alignment, - flags: uint, - precision: parse::Count, - width: parse::Count, -} - -#[cfg(not(stage0))] pub struct FormatSpec { fill: char, align: parse::Alignment, @@ -52,7 +42,6 @@ pub struct FormatSpec { width: Count, } -#[cfg(not(stage0))] pub enum Count { CountIs(uint), CountIsParam(uint), CountIsNextParam, CountImplied, } diff --git a/src/libstd/repr.rs b/src/libstd/repr.rs index 49d5bb3918b8d..031fd7993eb9a 100644 --- a/src/libstd/repr.rs +++ b/src/libstd/repr.rs @@ -367,16 +367,6 @@ impl<'self> TyVisitor for ReprVisitor<'self> { } } - #[cfg(stage0)] - fn visit_evec_slice(&mut self, mtbl: uint, inner: *TyDesc) -> bool { - do self.get::> |this, s| { - this.writer.write(['&' as u8]); - this.write_mut_qualifier(mtbl); - this.write_vec_range(s.data, s.len, inner); - } - } - - #[cfg(not(stage0))] fn visit_evec_slice(&mut self, mtbl: uint, inner: *TyDesc) -> bool { do self.get::> |this, s| { this.writer.write(['&' as u8]); diff --git a/src/libstd/unstable/intrinsics.rs b/src/libstd/unstable/intrinsics.rs index dee21762a309b..3a3c6e6538c60 100644 --- a/src/libstd/unstable/intrinsics.rs +++ b/src/libstd/unstable/intrinsics.rs @@ -172,7 +172,6 @@ pub trait TyVisitor { extern "rust-intrinsic" { /// Abort the execution of the process. - #[cfg(not(stage0))] pub fn abort() -> !; /// Atomic compare and exchange, sequentially consistent. diff --git a/src/libstd/vec.rs b/src/libstd/vec.rs index 3962df8e3bd8d..77a1f16ef6a81 100644 --- a/src/libstd/vec.rs +++ b/src/libstd/vec.rs @@ -975,22 +975,6 @@ pub trait ImmutableVector<'self, T> { impl<'self,T> ImmutableVector<'self, T> for &'self [T] { #[inline] - #[cfg(stage0)] - fn slice(&self, start: uint, end: uint) -> &'self [T] { - assert!(start <= end); - assert!(end <= self.len()); - do self.as_imm_buf |p, _len| { - unsafe { - cast::transmute(Slice { - data: ptr::offset(p, start as int), - len: (end - start) * sys::nonzero_size_of::(), - }) - } - } - } - - #[inline] - #[cfg(not(stage0))] fn slice(&self, start: uint, end: uint) -> &'self [T] { assert!(start <= end); assert!(end <= self.len()); @@ -1149,14 +1133,6 @@ impl<'self,T> ImmutableVector<'self, T> for &'self [T] { } #[inline] - #[cfg(stage0)] - fn as_imm_buf(&self, f: &fn(*T, uint) -> U) -> U { - let s = self.repr(); - f(s.data, s.len / sys::nonzero_size_of::()) - } - - #[inline] - #[cfg(not(stage0))] fn as_imm_buf(&self, f: &fn(*T, uint) -> U) -> U { let s = self.repr(); f(s.data, s.len) @@ -1926,22 +1902,6 @@ pub trait MutableVector<'self, T> { impl<'self,T> MutableVector<'self, T> for &'self mut [T] { #[inline] - #[cfg(stage0)] - fn mut_slice(self, start: uint, end: uint) -> &'self mut [T] { - assert!(start <= end); - assert!(end <= self.len()); - do self.as_mut_buf |p, _len| { - unsafe { - cast::transmute(Slice { - data: ptr::mut_offset(p, start as int) as *T, - len: (end - start) * sys::nonzero_size_of::() - }) - } - } - } - - #[inline] - #[cfg(not(stage0))] fn mut_slice(self, start: uint, end: uint) -> &'self mut [T] { assert!(start <= end); assert!(end <= self.len()); @@ -2034,14 +1994,6 @@ impl<'self,T> MutableVector<'self, T> for &'self mut [T] { } #[inline] - #[cfg(stage0)] - fn as_mut_buf(self, f: &fn(*mut T, uint) -> U) -> U { - let Slice{ data, len } = self.repr(); - f(data as *mut T, len / sys::nonzero_size_of::()) - } - - #[inline] - #[cfg(not(stage0))] fn as_mut_buf(self, f: &fn(*mut T, uint) -> U) -> U { let Slice{ data, len } = self.repr(); f(data as *mut T, len) @@ -2133,22 +2085,6 @@ pub mod raw { * not bytes). */ #[inline] - #[cfg(stage0)] - pub unsafe fn buf_as_slice(p: *T, - len: uint, - f: &fn(v: &[T]) -> U) -> U { - f(cast::transmute(Slice { - data: p, - len: len * sys::nonzero_size_of::() - })) - } - - /** - * Form a slice from a pointer and length (as a number of units, - * not bytes). - */ - #[inline] - #[cfg(not(stage0))] pub unsafe fn buf_as_slice(p: *T, len: uint, f: &fn(v: &[T]) -> U) -> U { @@ -2163,22 +2099,6 @@ pub mod raw { * not bytes). */ #[inline] - #[cfg(stage0)] - pub unsafe fn mut_buf_as_slice(p: *mut T, - len: uint, - f: &fn(v: &mut [T]) -> U) -> U { - f(cast::transmute(Slice { - data: p as *T, - len: len * sys::nonzero_size_of::() - })) - } - - /** - * Form a slice from a pointer and length (as a number of units, - * not bytes). - */ - #[inline] - #[cfg(not(stage0))] pub unsafe fn mut_buf_as_slice(p: *mut T, len: uint, f: &fn(v: &mut [T]) -> U) -> U { diff --git a/src/snapshots.txt b/src/snapshots.txt index faeb2b19e868c..627546f090703 100644 --- a/src/snapshots.txt +++ b/src/snapshots.txt @@ -1,3 +1,11 @@ +S 2013-10-16 6c08cc2 + freebsd-x86_64 03caf882078eff9b4e04d116732b41a3cdfc260f + linux-i386 ce30bb90434e9eb9920028a5408e1f986ba2ad5d + linux-x86_64 58b1d58a9bf4f0cd11ab479e84f6167cb623cd7a + macos-i386 9efd28f2eabbc60f507f023faa4f20f3b87aab17 + macos-x86_64 5f877e0593925d488591e6f0386f4db9b76d2e34 + winnt-i386 ca2b4d24e992dc3178c5cde648305d5bc5c11676 + S 2013-10-10 8015f9c freebsd-x86_64 e63594f61d24bec15bc6fa2401fbc76d3651a743 linux-i386 7838768d94ba17866ac1e880b896372f08cb48e9