Skip to content

Commit 0adb41d

Browse files
committed
Register new snapshots
1 parent 2cb96a4 commit 0adb41d

File tree

7 files changed

+8
-167
lines changed

7 files changed

+8
-167
lines changed

src/libstd/fmt/mod.rs

-18
Original file line numberDiff line numberDiff line change
@@ -673,24 +673,6 @@ impl<'self> Formatter<'self> {
673673
}
674674
}
675675

676-
#[cfg(stage0)]
677-
fn getcount(&mut self, cnt: &parse::Count) -> Option<uint> {
678-
match *cnt {
679-
parse::CountIs(n) => { Some(n) }
680-
parse::CountImplied => { None }
681-
parse::CountIsParam(i) => {
682-
let v = self.args[i].value;
683-
unsafe { Some(*(v as *util::Void as *uint)) }
684-
}
685-
parse::CountIsNextParam => {
686-
let v = self.curarg.next().unwrap().value;
687-
unsafe { Some(*(v as *util::Void as *uint)) }
688-
}
689-
parse::CountIsName(*) => unreachable!()
690-
}
691-
}
692-
693-
#[cfg(not(stage0))]
694676
fn getcount(&mut self, cnt: &rt::Count) -> Option<uint> {
695677
match *cnt {
696678
rt::CountIs(n) => { Some(n) }

src/libstd/fmt/parse.rs

-47
Original file line numberDiff line numberDiff line change
@@ -48,27 +48,6 @@ pub struct Argument<'self> {
4848

4949
/// Specification for the formatting of an argument in the format string.
5050
#[deriving(Eq)]
51-
#[cfg(stage0)]
52-
pub struct FormatSpec<'self> {
53-
/// Optionally specified character to fill alignment with
54-
fill: Option<char>,
55-
/// Optionally specified alignment
56-
align: Alignment,
57-
/// Packed version of various flags provided
58-
flags: uint,
59-
/// The integer precision to use
60-
precision: Count,
61-
/// The string width requested for the resulting format
62-
width: Count,
63-
/// The descriptor string representing the name of the format desired for
64-
/// this argument, this can be empty or any number of characters, although
65-
/// it is required to be one word.
66-
ty: &'self str
67-
}
68-
69-
/// Specification for the formatting of an argument in the format string.
70-
#[deriving(Eq)]
71-
#[cfg(not(stage0))]
7251
pub struct FormatSpec<'self> {
7352
/// Optionally specified character to fill alignment with
7453
fill: Option<char>,
@@ -113,18 +92,6 @@ pub enum Flag {
11392
/// can reference either an argument or a literal integer.
11493
#[deriving(Eq)]
11594
#[allow(missing_doc)]
116-
#[cfg(stage0)]
117-
pub enum Count {
118-
CountIs(uint),
119-
CountIsParam(uint),
120-
CountIsName(&'static str), // not actually used, see stage1
121-
CountIsNextParam,
122-
CountImplied,
123-
}
124-
125-
#[deriving(Eq)]
126-
#[allow(missing_doc)]
127-
#[cfg(not(stage0))]
12895
pub enum Count<'self> {
12996
CountIs(uint),
13097
CountIsName(&'self str),
@@ -594,20 +561,6 @@ impl<'self> Parser<'self> {
594561
/// Parses a Count parameter at the current position. This does not check
595562
/// for 'CountIsNextParam' because that is only used in precision, not
596563
/// width.
597-
#[cfg(stage0)]
598-
fn count(&mut self) -> Count {
599-
match self.integer() {
600-
Some(i) => {
601-
if self.consume('$') {
602-
CountIsParam(i)
603-
} else {
604-
CountIs(i)
605-
}
606-
}
607-
None => { CountImplied }
608-
}
609-
}
610-
#[cfg(not(stage0))]
611564
fn count(&mut self) -> Count<'self> {
612565
match self.integer() {
613566
Some(i) => {

src/libstd/fmt/rt.rs

-11
Original file line numberDiff line numberDiff line change
@@ -34,16 +34,6 @@ pub struct Argument<'self> {
3434
method: Option<&'self Method<'self>>
3535
}
3636

37-
#[cfg(stage0)]
38-
pub struct FormatSpec {
39-
fill: char,
40-
align: parse::Alignment,
41-
flags: uint,
42-
precision: parse::Count,
43-
width: parse::Count,
44-
}
45-
46-
#[cfg(not(stage0))]
4737
pub struct FormatSpec {
4838
fill: char,
4939
align: parse::Alignment,
@@ -52,7 +42,6 @@ pub struct FormatSpec {
5242
width: Count,
5343
}
5444

55-
#[cfg(not(stage0))]
5645
pub enum Count {
5746
CountIs(uint), CountIsParam(uint), CountIsNextParam, CountImplied,
5847
}

src/libstd/repr.rs

-10
Original file line numberDiff line numberDiff line change
@@ -367,16 +367,6 @@ impl<'self> TyVisitor for ReprVisitor<'self> {
367367
}
368368
}
369369

370-
#[cfg(stage0)]
371-
fn visit_evec_slice(&mut self, mtbl: uint, inner: *TyDesc) -> bool {
372-
do self.get::<raw::Slice<()>> |this, s| {
373-
this.writer.write(['&' as u8]);
374-
this.write_mut_qualifier(mtbl);
375-
this.write_vec_range(s.data, s.len, inner);
376-
}
377-
}
378-
379-
#[cfg(not(stage0))]
380370
fn visit_evec_slice(&mut self, mtbl: uint, inner: *TyDesc) -> bool {
381371
do self.get::<raw::Slice<()>> |this, s| {
382372
this.writer.write(['&' as u8]);

src/libstd/unstable/intrinsics.rs

-1
Original file line numberDiff line numberDiff line change
@@ -172,7 +172,6 @@ pub trait TyVisitor {
172172

173173
extern "rust-intrinsic" {
174174
/// Abort the execution of the process.
175-
#[cfg(not(stage0))]
176175
pub fn abort() -> !;
177176

178177
/// Atomic compare and exchange, sequentially consistent.

src/libstd/vec.rs

-80
Original file line numberDiff line numberDiff line change
@@ -975,22 +975,6 @@ pub trait ImmutableVector<'self, T> {
975975

976976
impl<'self,T> ImmutableVector<'self, T> for &'self [T] {
977977
#[inline]
978-
#[cfg(stage0)]
979-
fn slice(&self, start: uint, end: uint) -> &'self [T] {
980-
assert!(start <= end);
981-
assert!(end <= self.len());
982-
do self.as_imm_buf |p, _len| {
983-
unsafe {
984-
cast::transmute(Slice {
985-
data: ptr::offset(p, start as int),
986-
len: (end - start) * sys::nonzero_size_of::<T>(),
987-
})
988-
}
989-
}
990-
}
991-
992-
#[inline]
993-
#[cfg(not(stage0))]
994978
fn slice(&self, start: uint, end: uint) -> &'self [T] {
995979
assert!(start <= end);
996980
assert!(end <= self.len());
@@ -1149,14 +1133,6 @@ impl<'self,T> ImmutableVector<'self, T> for &'self [T] {
11491133
}
11501134

11511135
#[inline]
1152-
#[cfg(stage0)]
1153-
fn as_imm_buf<U>(&self, f: &fn(*T, uint) -> U) -> U {
1154-
let s = self.repr();
1155-
f(s.data, s.len / sys::nonzero_size_of::<T>())
1156-
}
1157-
1158-
#[inline]
1159-
#[cfg(not(stage0))]
11601136
fn as_imm_buf<U>(&self, f: &fn(*T, uint) -> U) -> U {
11611137
let s = self.repr();
11621138
f(s.data, s.len)
@@ -1926,22 +1902,6 @@ pub trait MutableVector<'self, T> {
19261902

19271903
impl<'self,T> MutableVector<'self, T> for &'self mut [T] {
19281904
#[inline]
1929-
#[cfg(stage0)]
1930-
fn mut_slice(self, start: uint, end: uint) -> &'self mut [T] {
1931-
assert!(start <= end);
1932-
assert!(end <= self.len());
1933-
do self.as_mut_buf |p, _len| {
1934-
unsafe {
1935-
cast::transmute(Slice {
1936-
data: ptr::mut_offset(p, start as int) as *T,
1937-
len: (end - start) * sys::nonzero_size_of::<T>()
1938-
})
1939-
}
1940-
}
1941-
}
1942-
1943-
#[inline]
1944-
#[cfg(not(stage0))]
19451905
fn mut_slice(self, start: uint, end: uint) -> &'self mut [T] {
19461906
assert!(start <= end);
19471907
assert!(end <= self.len());
@@ -2034,14 +1994,6 @@ impl<'self,T> MutableVector<'self, T> for &'self mut [T] {
20341994
}
20351995

20361996
#[inline]
2037-
#[cfg(stage0)]
2038-
fn as_mut_buf<U>(self, f: &fn(*mut T, uint) -> U) -> U {
2039-
let Slice{ data, len } = self.repr();
2040-
f(data as *mut T, len / sys::nonzero_size_of::<T>())
2041-
}
2042-
2043-
#[inline]
2044-
#[cfg(not(stage0))]
20451997
fn as_mut_buf<U>(self, f: &fn(*mut T, uint) -> U) -> U {
20461998
let Slice{ data, len } = self.repr();
20471999
f(data as *mut T, len)
@@ -2133,22 +2085,6 @@ pub mod raw {
21332085
* not bytes).
21342086
*/
21352087
#[inline]
2136-
#[cfg(stage0)]
2137-
pub unsafe fn buf_as_slice<T,U>(p: *T,
2138-
len: uint,
2139-
f: &fn(v: &[T]) -> U) -> U {
2140-
f(cast::transmute(Slice {
2141-
data: p,
2142-
len: len * sys::nonzero_size_of::<T>()
2143-
}))
2144-
}
2145-
2146-
/**
2147-
* Form a slice from a pointer and length (as a number of units,
2148-
* not bytes).
2149-
*/
2150-
#[inline]
2151-
#[cfg(not(stage0))]
21522088
pub unsafe fn buf_as_slice<T,U>(p: *T,
21532089
len: uint,
21542090
f: &fn(v: &[T]) -> U) -> U {
@@ -2163,22 +2099,6 @@ pub mod raw {
21632099
* not bytes).
21642100
*/
21652101
#[inline]
2166-
#[cfg(stage0)]
2167-
pub unsafe fn mut_buf_as_slice<T,U>(p: *mut T,
2168-
len: uint,
2169-
f: &fn(v: &mut [T]) -> U) -> U {
2170-
f(cast::transmute(Slice {
2171-
data: p as *T,
2172-
len: len * sys::nonzero_size_of::<T>()
2173-
}))
2174-
}
2175-
2176-
/**
2177-
* Form a slice from a pointer and length (as a number of units,
2178-
* not bytes).
2179-
*/
2180-
#[inline]
2181-
#[cfg(not(stage0))]
21822102
pub unsafe fn mut_buf_as_slice<T,U>(p: *mut T,
21832103
len: uint,
21842104
f: &fn(v: &mut [T]) -> U) -> U {

src/snapshots.txt

+8
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,11 @@
1+
S 2013-10-16 6c08cc2
2+
freebsd-x86_64 03caf882078eff9b4e04d116732b41a3cdfc260f
3+
linux-i386 ce30bb90434e9eb9920028a5408e1f986ba2ad5d
4+
linux-x86_64 58b1d58a9bf4f0cd11ab479e84f6167cb623cd7a
5+
macos-i386 9efd28f2eabbc60f507f023faa4f20f3b87aab17
6+
macos-x86_64 5f877e0593925d488591e6f0386f4db9b76d2e34
7+
winnt-i386 ca2b4d24e992dc3178c5cde648305d5bc5c11676
8+
19
S 2013-10-10 8015f9c
210
freebsd-x86_64 e63594f61d24bec15bc6fa2401fbc76d3651a743
311
linux-i386 7838768d94ba17866ac1e880b896372f08cb48e9

0 commit comments

Comments
 (0)