Skip to content

Commit 134cf70

Browse files
author
Jorge Aparicio
committed
register snapshots
1 parent eaf4c5c commit 134cf70

File tree

21 files changed

+12
-195
lines changed

21 files changed

+12
-195
lines changed

src/libcollections/slice.rs

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -98,9 +98,6 @@ use core::iter::{range_step, MultiplicativeIterator};
9898
use core::marker::Sized;
9999
use core::mem::size_of;
100100
use core::mem;
101-
#[cfg(stage0)]
102-
use core::ops::{FnMut, FullRange};
103-
#[cfg(not(stage0))]
104101
use core::ops::FnMut;
105102
use core::option::Option::{self, Some, None};
106103
use core::ptr::PtrExt;
@@ -1512,9 +1509,6 @@ mod tests {
15121509
use core::prelude::{Some, None, range, Clone};
15131510
use core::prelude::{Iterator, IteratorExt};
15141511
use core::prelude::{AsSlice};
1515-
#[cfg(stage0)]
1516-
use core::prelude::{Ord, FullRange};
1517-
#[cfg(not(stage0))]
15181512
use core::prelude::Ord;
15191513
use core::default::Default;
15201514
use core::mem;

src/libcollections/str.rs

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -61,11 +61,6 @@ use core::clone::Clone;
6161
use core::iter::AdditiveIterator;
6262
use core::iter::{Iterator, IteratorExt};
6363
use core::ops::Index;
64-
#[cfg(stage0)]
65-
use core::ops::FullRange as RangeFull;
66-
#[cfg(stage0)]
67-
use core::ops::FullRange;
68-
#[cfg(not(stage0))]
6964
use core::ops::RangeFull;
7065
use core::option::Option::{self, Some, None};
7166
use core::result::Result;

src/libcollections/string.rs

Lines changed: 0 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -877,16 +877,6 @@ impl ops::Index<ops::RangeFrom<uint>> for String {
877877
&self[][*index]
878878
}
879879
}
880-
#[cfg(stage0)]
881-
#[stable(feature = "rust1", since = "1.0.0")]
882-
impl ops::Index<ops::FullRange> for String {
883-
type Output = str;
884-
#[inline]
885-
fn index(&self, _index: &ops::FullRange) -> &str {
886-
unsafe { mem::transmute(self.vec.as_slice()) }
887-
}
888-
}
889-
#[cfg(not(stage0))]
890880
#[stable(feature = "rust1", since = "1.0.0")]
891881
impl ops::Index<ops::RangeFull> for String {
892882
type Output = str;
@@ -1011,8 +1001,6 @@ mod tests {
10111001
use str::Utf8Error;
10121002
use core::iter::repeat;
10131003
use super::{as_string, CowString};
1014-
#[cfg(stage0)]
1015-
use core::ops::FullRange;
10161004

10171005
#[test]
10181006
fn test_as_string() {

src/libcollections/vec.rs

Lines changed: 0 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -1318,16 +1318,6 @@ impl<T> ops::Index<ops::RangeFrom<uint>> for Vec<T> {
13181318
self.as_slice().index(index)
13191319
}
13201320
}
1321-
#[cfg(stage0)]
1322-
#[stable(feature = "rust1", since = "1.0.0")]
1323-
impl<T> ops::Index<ops::FullRange> for Vec<T> {
1324-
type Output = [T];
1325-
#[inline]
1326-
fn index(&self, _index: &ops::FullRange) -> &[T] {
1327-
self.as_slice()
1328-
}
1329-
}
1330-
#[cfg(not(stage0))]
13311321
#[stable(feature = "rust1", since = "1.0.0")]
13321322
impl<T> ops::Index<ops::RangeFull> for Vec<T> {
13331323
type Output = [T];
@@ -1361,16 +1351,6 @@ impl<T> ops::IndexMut<ops::RangeFrom<uint>> for Vec<T> {
13611351
self.as_mut_slice().index_mut(index)
13621352
}
13631353
}
1364-
#[cfg(stage0)]
1365-
#[stable(feature = "rust1", since = "1.0.0")]
1366-
impl<T> ops::IndexMut<ops::FullRange> for Vec<T> {
1367-
type Output = [T];
1368-
#[inline]
1369-
fn index_mut(&mut self, _index: &ops::FullRange) -> &mut [T] {
1370-
self.as_mut_slice()
1371-
}
1372-
}
1373-
#[cfg(not(stage0))]
13741354
#[stable(feature = "rust1", since = "1.0.0")]
13751355
impl<T> ops::IndexMut<ops::RangeFull> for Vec<T> {
13761356
type Output = [T];
@@ -1934,8 +1914,6 @@ mod tests {
19341914
use prelude::*;
19351915
use core::mem::size_of;
19361916
use core::iter::repeat;
1937-
#[cfg(stage0)]
1938-
use core::ops::FullRange;
19391917
use test::Bencher;
19401918
use super::as_vec;
19411919

src/libcore/array.rs

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -20,9 +20,6 @@ use fmt;
2020
use hash::{Hash, Hasher, self};
2121
use iter::IntoIterator;
2222
use marker::Copy;
23-
#[cfg(stage0)]
24-
use ops::{Deref, FullRange};
25-
#[cfg(not(stage0))]
2623
use ops::Deref;
2724
use option::Option;
2825
use slice::{Iter, IterMut, SliceExt};

src/libcore/fmt/mod.rs

Lines changed: 0 additions & 53 deletions
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,6 @@ mod float;
3838
#[stable(feature = "rust1", since = "1.0.0")]
3939
#[doc(hidden)]
4040
pub mod rt {
41-
#[cfg(stage0)] pub use self::v1::*;
4241
pub mod v1;
4342
}
4443

@@ -191,46 +190,13 @@ impl<'a> Arguments<'a> {
191190
}
192191
}
193192

194-
/// When using the format_args!() macro, this function is used to generate the
195-
/// Arguments structure.
196-
#[doc(hidden)] #[inline]
197-
#[cfg(stage0)]
198-
#[stable(feature = "rust1", since = "1.0.0")]
199-
pub fn new(pieces: &'a [&'a str],
200-
args: &'a [ArgumentV1<'a>]) -> Arguments<'a> {
201-
Arguments {
202-
pieces: pieces,
203-
fmt: None,
204-
args: args
205-
}
206-
}
207-
208193
/// This function is used to specify nonstandard formatting parameters.
209194
/// The `pieces` array must be at least as long as `fmt` to construct
210195
/// a valid Arguments structure. Also, any `Count` within `fmt` that is
211196
/// `CountIsParam` or `CountIsNextParam` has to point to an argument
212197
/// created with `argumentuint`. However, failing to do so doesn't cause
213198
/// unsafety, but will ignore invalid .
214199
#[doc(hidden)] #[inline]
215-
#[cfg(stage0)]
216-
#[stable(feature = "rust1", since = "1.0.0")]
217-
pub fn with_placeholders(pieces: &'a [&'a str],
218-
fmt: &'a [rt::v1::Argument],
219-
args: &'a [ArgumentV1<'a>]) -> Arguments<'a> {
220-
Arguments {
221-
pieces: pieces,
222-
fmt: Some(fmt),
223-
args: args
224-
}
225-
}
226-
/// This function is used to specify nonstandard formatting parameters.
227-
/// The `pieces` array must be at least as long as `fmt` to construct
228-
/// a valid Arguments structure. Also, any `Count` within `fmt` that is
229-
/// `CountIsParam` or `CountIsNextParam` has to point to an argument
230-
/// created with `argumentuint`. However, failing to do so doesn't cause
231-
/// unsafety, but will ignore invalid .
232-
#[doc(hidden)] #[inline]
233-
#[cfg(not(stage0))]
234200
pub fn new_v1_formatted(pieces: &'a [&'a str],
235201
args: &'a [ArgumentV1<'a>],
236202
fmt: &'a [rt::v1::Argument]) -> Arguments<'a> {
@@ -684,25 +650,6 @@ impl Display for Error {
684650
}
685651
}
686652

687-
/// This is a function which calls are emitted to by the compiler itself to
688-
/// create the Argument structures that are passed into the `format` function.
689-
#[doc(hidden)] #[inline]
690-
#[cfg(stage0)]
691-
#[stable(feature = "rust1", since = "1.0.0")]
692-
pub fn argument<'a, T>(f: fn(&T, &mut Formatter) -> Result,
693-
t: &'a T) -> ArgumentV1<'a> {
694-
ArgumentV1::new(t, f)
695-
}
696-
697-
/// When the compiler determines that the type of an argument *must* be a uint
698-
/// (such as for width and precision), then it invokes this method.
699-
#[doc(hidden)] #[inline]
700-
#[cfg(stage0)]
701-
#[stable(feature = "rust1", since = "1.0.0")]
702-
pub fn argumentuint<'a>(s: &'a uint) -> ArgumentV1<'a> {
703-
ArgumentV1::from_uint(s)
704-
}
705-
706653
// Implementations of the core formatting traits
707654

708655
macro_rules! fmt_refs {

src/libcore/fmt/rt/v1.rs

Lines changed: 0 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -16,19 +16,6 @@
1616
1717
#![stable(feature = "rust1", since = "1.0.0")]
1818

19-
#[cfg(stage0)] pub use self::Position::*;
20-
21-
#[cfg(stage0)] pub use self::Alignment::Left as AlignLeft;
22-
#[cfg(stage0)] pub use self::Alignment::Right as AlignRight;
23-
#[cfg(stage0)] pub use self::Alignment::Center as AlignCenter;
24-
#[cfg(stage0)] pub use self::Alignment::Unknown as AlignUnknown;
25-
#[cfg(stage0)] pub use self::Count::Is as CountIs;
26-
#[cfg(stage0)] pub use self::Count::Implied as CountImplied;
27-
#[cfg(stage0)] pub use self::Count::Param as CountIsParam;
28-
#[cfg(stage0)] pub use self::Count::NextParam as CountIsNextParam;
29-
#[cfg(stage0)] pub use self::Position::Next as ArgumentNext;
30-
#[cfg(stage0)] pub use self::Position::At as ArgumentIs;
31-
3219
#[derive(Copy)]
3320
#[stable(feature = "rust1", since = "1.0.0")]
3421
pub struct Argument {

src/libcore/ops.rs

Lines changed: 0 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -947,28 +947,11 @@ pub trait IndexMut<Index: ?Sized> {
947947
}
948948

949949
/// An unbounded range.
950-
#[cfg(stage0)]
951-
#[derive(Copy, Clone, PartialEq, Eq)]
952-
#[lang="full_range"]
953-
#[unstable(feature = "core", reason = "may be renamed to RangeFull")]
954-
pub struct FullRange;
955-
956-
/// An unbounded range.
957-
#[cfg(not(stage0))]
958950
#[derive(Copy, Clone, PartialEq, Eq)]
959951
#[lang="range_full"]
960952
#[stable(feature = "rust1", since = "1.0.0")]
961953
pub struct RangeFull;
962954

963-
#[cfg(stage0)]
964-
#[stable(feature = "rust1", since = "1.0.0")]
965-
impl fmt::Debug for FullRange {
966-
fn fmt(&self, fmt: &mut fmt::Formatter) -> fmt::Result {
967-
fmt::Debug::fmt("..", fmt)
968-
}
969-
}
970-
971-
#[cfg(not(stage0))]
972955
#[stable(feature = "rust1", since = "1.0.0")]
973956
impl fmt::Debug for RangeFull {
974957
fn fmt(&self, fmt: &mut fmt::Formatter) -> fmt::Result {

src/libcore/prelude.rs

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -26,9 +26,6 @@
2626
2727
// Reexported core operators
2828
pub use marker::{Copy, Send, Sized, Sync};
29-
#[cfg(stage0)]
30-
pub use ops::{Drop, Fn, FnMut, FnOnce, FullRange};
31-
#[cfg(not(stage0))]
3229
pub use ops::{Drop, Fn, FnMut, FnOnce};
3330

3431
// Reexported functions

src/libcore/slice.rs

Lines changed: 0 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -43,9 +43,6 @@ use default::Default;
4343
use iter::*;
4444
use num::Int;
4545
use ops::{FnMut, self, Index};
46-
#[cfg(stage0)]
47-
use ops::FullRange as RangeFull;
48-
#[cfg(not(stage0))]
4946
use ops::RangeFull;
5047
use option::Option;
5148
use option::Option::{None, Some};
@@ -769,16 +766,6 @@ impl<'a, T> ops::Index<ops::RangeFrom<uint>> for Iter<'a, T> {
769766
}
770767
}
771768

772-
#[cfg(stage0)]
773-
#[unstable(feature = "core")]
774-
impl<'a, T> ops::Index<ops::FullRange> for Iter<'a, T> {
775-
type Output = [T];
776-
#[inline]
777-
fn index(&self, _index: &ops::FullRange) -> &[T] {
778-
self.as_slice()
779-
}
780-
}
781-
#[cfg(not(stage0))]
782769
#[unstable(feature = "core")]
783770
impl<'a, T> ops::Index<RangeFull> for Iter<'a, T> {
784771
type Output = [T];

0 commit comments

Comments
 (0)