Skip to content

Commit 47f91a9

Browse files
alexcrichtonalexcrichton
committed
Register new snapshots
1 parent 665ea96 commit 47f91a9

File tree

30 files changed

+25
-547
lines changed

30 files changed

+25
-547
lines changed

‎src/liballoc/lib.rs

-8
Original file line numberDiff line numberDiff line change
@@ -126,11 +126,3 @@ pub fn oom() -> ! {
126126
// optimize it out).
127127
#[doc(hidden)]
128128
pub fn fixme_14344_be_sure_to_link_to_collections() {}
129-
130-
// NOTE: remove after next snapshot
131-
#[cfg(all(stage0, not(test)))]
132-
#[doc(hidden)]
133-
mod std {
134-
pub use core::fmt;
135-
pub use core::option;
136-
}

‎src/liballoc/rc.rs

+2-6
Original file line numberDiff line numberDiff line change
@@ -776,9 +776,7 @@ impl<T> RcBoxPtr<T> for Rc<T> {
776776
// the contract anyway.
777777
// This allows the null check to be elided in the destructor if we
778778
// manipulated the reference count in the same function.
779-
if cfg!(not(stage0)) { // NOTE remove cfg after next snapshot
780-
assume(!self._ptr.is_null());
781-
}
779+
assume(!self._ptr.is_null());
782780
&(**self._ptr)
783781
}
784782
}
@@ -792,9 +790,7 @@ impl<T> RcBoxPtr<T> for Weak<T> {
792790
// the contract anyway.
793791
// This allows the null check to be elided in the destructor if we
794792
// manipulated the reference count in the same function.
795-
if cfg!(not(stage0)) { // NOTE remove cfg after next snapshot
796-
assume(!self._ptr.is_null());
797-
}
793+
assume(!self._ptr.is_null());
798794
&(**self._ptr)
799795
}
800796
}

‎src/libcollections/binary_heap.rs

-22
Original file line numberDiff line numberDiff line change
@@ -655,17 +655,6 @@ impl<T: Ord> FromIterator<T> for BinaryHeap<T> {
655655
}
656656
}
657657

658-
// NOTE(stage0): remove impl after a snapshot
659-
#[cfg(stage0)]
660-
impl<T: Ord> IntoIterator for BinaryHeap<T> {
661-
type IntoIter = IntoIter<T>;
662-
663-
fn into_iter(self) -> IntoIter<T> {
664-
self.into_iter()
665-
}
666-
}
667-
668-
#[cfg(not(stage0))] // NOTE(stage0): remove cfg after a snapshot
669658
#[stable(feature = "rust1", since = "1.0.0")]
670659
impl<T: Ord> IntoIterator for BinaryHeap<T> {
671660
type Item = T;
@@ -676,17 +665,6 @@ impl<T: Ord> IntoIterator for BinaryHeap<T> {
676665
}
677666
}
678667

679-
// NOTE(stage0): remove impl after a snapshot
680-
#[cfg(stage0)]
681-
impl<'a, T> IntoIterator for &'a BinaryHeap<T> where T: Ord {
682-
type IntoIter = Iter<'a, T>;
683-
684-
fn into_iter(self) -> Iter<'a, T> {
685-
self.iter()
686-
}
687-
}
688-
689-
#[cfg(not(stage0))] // NOTE(stage0): remove cfg after a snapshot
690668
#[stable(feature = "rust1", since = "1.0.0")]
691669
impl<'a, T> IntoIterator for &'a BinaryHeap<T> where T: Ord {
692670
type Item = &'a T;

‎src/libcollections/bit.rs

-22
Original file line numberDiff line numberDiff line change
@@ -1070,17 +1070,6 @@ impl<'a> RandomAccessIterator for Iter<'a> {
10701070
}
10711071
}
10721072

1073-
// NOTE(stage0): remove impl after a snapshot
1074-
#[cfg(stage0)]
1075-
impl<'a> IntoIterator for &'a Bitv {
1076-
type IntoIter = Iter<'a>;
1077-
1078-
fn into_iter(self) -> Iter<'a> {
1079-
self.iter()
1080-
}
1081-
}
1082-
1083-
#[cfg(not(stage0))] // NOTE(stage0): remove cfg after a snapshot
10841073
#[stable(feature = "rust1", since = "1.0.0")]
10851074
impl<'a> IntoIterator for &'a Bitv {
10861075
type Item = bool;
@@ -1895,17 +1884,6 @@ impl<'a> Iterator for SymmetricDifference<'a> {
18951884
#[inline] fn size_hint(&self) -> (usize, Option<usize>) { self.0.size_hint() }
18961885
}
18971886

1898-
// NOTE(stage0): remove impl after a snapshot
1899-
#[cfg(stage0)]
1900-
impl<'a> IntoIterator for &'a BitvSet {
1901-
type IntoIter = SetIter<'a>;
1902-
1903-
fn into_iter(self) -> SetIter<'a> {
1904-
self.iter()
1905-
}
1906-
}
1907-
1908-
#[cfg(not(stage0))] // NOTE(stage0): remove cfg after a snapshot
19091887
#[stable(feature = "rust1", since = "1.0.0")]
19101888
impl<'a> IntoIterator for &'a BitvSet {
19111889
type Item = usize;

‎src/libcollections/btree/map.rs

-33
Original file line numberDiff line numberDiff line change
@@ -462,17 +462,6 @@ impl<K: Ord, V> BTreeMap<K, V> {
462462
}
463463
}
464464

465-
// NOTE(stage0): remove impl after a snapshot
466-
#[cfg(stage0)]
467-
impl<K, V> IntoIterator for BTreeMap<K, V> {
468-
type IntoIter = IntoIter<K, V>;
469-
470-
fn into_iter(self) -> IntoIter<K, V> {
471-
self.into_iter()
472-
}
473-
}
474-
475-
#[cfg(not(stage0))] // NOTE(stage0): remove cfg after a snapshot
476465
#[stable(feature = "rust1", since = "1.0.0")]
477466
impl<K, V> IntoIterator for BTreeMap<K, V> {
478467
type Item = (K, V);
@@ -483,17 +472,6 @@ impl<K, V> IntoIterator for BTreeMap<K, V> {
483472
}
484473
}
485474

486-
// NOTE(stage0): remove impl after a snapshot
487-
#[cfg(stage0)]
488-
impl<'a, K, V> IntoIterator for &'a BTreeMap<K, V> {
489-
type IntoIter = Iter<'a, K, V>;
490-
491-
fn into_iter(self) -> Iter<'a, K, V> {
492-
self.iter()
493-
}
494-
}
495-
496-
#[cfg(not(stage0))] // NOTE(stage0): remove cfg after a snapshot
497475
#[stable(feature = "rust1", since = "1.0.0")]
498476
impl<'a, K, V> IntoIterator for &'a BTreeMap<K, V> {
499477
type Item = (&'a K, &'a V);
@@ -504,17 +482,6 @@ impl<'a, K, V> IntoIterator for &'a BTreeMap<K, V> {
504482
}
505483
}
506484

507-
// NOTE(stage0): remove impl after a snapshot
508-
#[cfg(stage0)]
509-
impl<'a, K, V> IntoIterator for &'a mut BTreeMap<K, V> {
510-
type IntoIter = IterMut<'a, K, V>;
511-
512-
fn into_iter(mut self) -> IterMut<'a, K, V> {
513-
self.iter_mut()
514-
}
515-
}
516-
517-
#[cfg(not(stage0))] // NOTE(stage0): remove cfg after a snapshot
518485
#[stable(feature = "rust1", since = "1.0.0")]
519486
impl<'a, K, V> IntoIterator for &'a mut BTreeMap<K, V> {
520487
type Item = (&'a K, &'a mut V);

‎src/libcollections/btree/set.rs

-22
Original file line numberDiff line numberDiff line change
@@ -480,17 +480,6 @@ impl<T: Ord> FromIterator<T> for BTreeSet<T> {
480480
}
481481
}
482482

483-
// NOTE(stage0): remove impl after a snapshot
484-
#[cfg(stage0)]
485-
impl<T> IntoIterator for BTreeSet<T> {
486-
type IntoIter = IntoIter<T>;
487-
488-
fn into_iter(self) -> IntoIter<T> {
489-
self.into_iter()
490-
}
491-
}
492-
493-
#[cfg(not(stage0))] // NOTE(stage0): remove cfg after a snapshot
494483
#[stable(feature = "rust1", since = "1.0.0")]
495484
impl<T> IntoIterator for BTreeSet<T> {
496485
type Item = T;
@@ -501,17 +490,6 @@ impl<T> IntoIterator for BTreeSet<T> {
501490
}
502491
}
503492

504-
// NOTE(stage0): remove impl after a snapshot
505-
#[cfg(stage0)]
506-
impl<'a, T> IntoIterator for &'a BTreeSet<T> {
507-
type IntoIter = Iter<'a, T>;
508-
509-
fn into_iter(self) -> Iter<'a, T> {
510-
self.iter()
511-
}
512-
}
513-
514-
#[cfg(not(stage0))] // NOTE(stage0): remove cfg after a snapshot
515493
#[stable(feature = "rust1", since = "1.0.0")]
516494
impl<'a, T> IntoIterator for &'a BTreeSet<T> {
517495
type Item = &'a T;

‎src/libcollections/dlist.rs

-33
Original file line numberDiff line numberDiff line change
@@ -837,17 +837,6 @@ impl<A> FromIterator<A> for DList<A> {
837837
}
838838
}
839839

840-
// NOTE(stage0): remove impl after a snapshot
841-
#[cfg(stage0)]
842-
impl<T> IntoIterator for DList<T> {
843-
type IntoIter = IntoIter<T>;
844-
845-
fn into_iter(self) -> IntoIter<T> {
846-
self.into_iter()
847-
}
848-
}
849-
850-
#[cfg(not(stage0))] // NOTE(stage0): remove cfg after a snapshot
851840
#[stable(feature = "rust1", since = "1.0.0")]
852841
impl<T> IntoIterator for DList<T> {
853842
type Item = T;
@@ -858,17 +847,6 @@ impl<T> IntoIterator for DList<T> {
858847
}
859848
}
860849

861-
// NOTE(stage0): remove impl after a snapshot
862-
#[cfg(stage0)]
863-
impl<'a, T> IntoIterator for &'a DList<T> {
864-
type IntoIter = Iter<'a, T>;
865-
866-
fn into_iter(self) -> Iter<'a, T> {
867-
self.iter()
868-
}
869-
}
870-
871-
#[cfg(not(stage0))] // NOTE(stage0): remove cfg after a snapshot
872850
#[stable(feature = "rust1", since = "1.0.0")]
873851
impl<'a, T> IntoIterator for &'a DList<T> {
874852
type Item = &'a T;
@@ -879,17 +857,6 @@ impl<'a, T> IntoIterator for &'a DList<T> {
879857
}
880858
}
881859

882-
// NOTE(stage0): remove impl after a snapshot
883-
#[cfg(stage0)]
884-
impl<'a, T> IntoIterator for &'a mut DList<T> {
885-
type IntoIter = IterMut<'a, T>;
886-
887-
fn into_iter(mut self) -> IterMut<'a, T> {
888-
self.iter_mut()
889-
}
890-
}
891-
892-
#[cfg(not(stage0))] // NOTE(stage0): remove cfg after a snapshot
893860
impl<'a, T> IntoIterator for &'a mut DList<T> {
894861
type Item = &'a mut T;
895862
type IntoIter = IterMut<'a, T>;

‎src/libcollections/enum_set.rs

-11
Original file line numberDiff line numberDiff line change
@@ -257,17 +257,6 @@ impl<E:CLike> FromIterator<E> for EnumSet<E> {
257257
}
258258
}
259259

260-
// NOTE(stage0): remove impl after a snapshot
261-
#[cfg(stage0)]
262-
impl<'a, E> IntoIterator for &'a EnumSet<E> where E: CLike {
263-
type IntoIter = Iter<E>;
264-
265-
fn into_iter(self) -> Iter<E> {
266-
self.iter()
267-
}
268-
}
269-
270-
#[cfg(not(stage0))] // NOTE(stage0): remove cfg after a snapshot
271260
#[stable(feature = "rust1", since = "1.0.0")]
272261
impl<'a, E> IntoIterator for &'a EnumSet<E> where E: CLike {
273262
type Item = E;

‎src/libcollections/lib.rs

-9
Original file line numberDiff line numberDiff line change
@@ -111,15 +111,6 @@ pub fn fixme_14344_be_sure_to_link_to_collections() {}
111111

112112
#[cfg(not(test))]
113113
mod std {
114-
// NOTE: remove after next snapshot
115-
#[cfg(stage0)] pub use core::clone; // derive(Clone)
116-
#[cfg(stage0)] pub use core::cmp; // derive(Eq, Ord, etc.)
117-
#[cfg(stage0)] pub use core::marker; // derive(Copy)
118-
#[cfg(stage0)] pub use core::hash; // derive(Hash)
119-
#[cfg(stage0)] pub use core::iter;
120-
#[cfg(stage0)] pub use core::fmt; // necessary for panic!()
121-
#[cfg(stage0)] pub use core::option; // necessary for panic!()
122-
123114
pub use core::ops; // RangeFull
124115
}
125116

‎src/libcollections/ring_buf.rs

-33
Original file line numberDiff line numberDiff line change
@@ -1704,17 +1704,6 @@ impl<A> FromIterator<A> for RingBuf<A> {
17041704
}
17051705
}
17061706

1707-
// NOTE(stage0): remove impl after a snapshot
1708-
#[cfg(stage0)]
1709-
impl<T> IntoIterator for RingBuf<T> {
1710-
type IntoIter = IntoIter<T>;
1711-
1712-
fn into_iter(self) -> IntoIter<T> {
1713-
self.into_iter()
1714-
}
1715-
}
1716-
1717-
#[cfg(not(stage0))] // NOTE(stage0): remove cfg after a snapshot
17181707
#[stable(feature = "rust1", since = "1.0.0")]
17191708
impl<T> IntoIterator for RingBuf<T> {
17201709
type Item = T;
@@ -1725,17 +1714,6 @@ impl<T> IntoIterator for RingBuf<T> {
17251714
}
17261715
}
17271716

1728-
// NOTE(stage0): remove impl after a snapshot
1729-
#[cfg(stage0)]
1730-
impl<'a, T> IntoIterator for &'a RingBuf<T> {
1731-
type IntoIter = Iter<'a, T>;
1732-
1733-
fn into_iter(self) -> Iter<'a, T> {
1734-
self.iter()
1735-
}
1736-
}
1737-
1738-
#[cfg(not(stage0))] // NOTE(stage0): remove cfg after a snapshot
17391717
#[stable(feature = "rust1", since = "1.0.0")]
17401718
impl<'a, T> IntoIterator for &'a RingBuf<T> {
17411719
type Item = &'a T;
@@ -1746,17 +1724,6 @@ impl<'a, T> IntoIterator for &'a RingBuf<T> {
17461724
}
17471725
}
17481726

1749-
// NOTE(stage0): remove impl after a snapshot
1750-
#[cfg(stage0)]
1751-
impl<'a, T> IntoIterator for &'a mut RingBuf<T> {
1752-
type IntoIter = IterMut<'a, T>;
1753-
1754-
fn into_iter(mut self) -> IterMut<'a, T> {
1755-
self.iter_mut()
1756-
}
1757-
}
1758-
1759-
#[cfg(not(stage0))] // NOTE(stage0): remove cfg after a snapshot
17601727
#[stable(feature = "rust1", since = "1.0.0")]
17611728
impl<'a, T> IntoIterator for &'a mut RingBuf<T> {
17621729
type Item = &'a mut T;

‎src/libcollections/vec.rs

-33
Original file line numberDiff line numberDiff line change
@@ -1447,17 +1447,6 @@ impl<T> FromIterator<T> for Vec<T> {
14471447
}
14481448
}
14491449

1450-
// NOTE(stage0): remove impl after a snapshot
1451-
#[cfg(stage0)]
1452-
impl<T> IntoIterator for Vec<T> {
1453-
type IntoIter = IntoIter<T>;
1454-
1455-
fn into_iter(self) -> IntoIter<T> {
1456-
self.into_iter()
1457-
}
1458-
}
1459-
1460-
#[cfg(not(stage0))] // NOTE(stage0): remove cfg after a snapshot
14611450
#[stable(feature = "rust1", since = "1.0.0")]
14621451
impl<T> IntoIterator for Vec<T> {
14631452
type Item = T;
@@ -1468,17 +1457,6 @@ impl<T> IntoIterator for Vec<T> {
14681457
}
14691458
}
14701459

1471-
// NOTE(stage0): remove impl after a snapshot
1472-
#[cfg(stage0)]
1473-
impl<'a, T> IntoIterator for &'a Vec<T> {
1474-
type IntoIter = slice::Iter<'a, T>;
1475-
1476-
fn into_iter(self) -> slice::Iter<'a, T> {
1477-
self.iter()
1478-
}
1479-
}
1480-
1481-
#[cfg(not(stage0))] // NOTE(stage0): remove cfg after a snapshot
14821460
#[stable(feature = "rust1", since = "1.0.0")]
14831461
impl<'a, T> IntoIterator for &'a Vec<T> {
14841462
type Item = &'a T;
@@ -1489,17 +1467,6 @@ impl<'a, T> IntoIterator for &'a Vec<T> {
14891467
}
14901468
}
14911469

1492-
// NOTE(stage0): remove impl after a snapshot
1493-
#[cfg(stage0)]
1494-
impl<'a, T> IntoIterator for &'a mut Vec<T> {
1495-
type IntoIter = slice::IterMut<'a, T>;
1496-
1497-
fn into_iter(mut self) -> slice::IterMut<'a, T> {
1498-
self.iter_mut()
1499-
}
1500-
}
1501-
1502-
#[cfg(not(stage0))] // NOTE(stage0): remove cfg after a snapshot
15031470
#[stable(feature = "rust1", since = "1.0.0")]
15041471
impl<'a, T> IntoIterator for &'a mut Vec<T> {
15051472
type Item = &'a mut T;

0 commit comments

Comments
 (0)