Skip to content

Commit 956c2eb

Browse files
alexcrichtonalexcrichton
committed
rollup merge of #23738: alexcrichton/snapshots
Conflicts: src/libcollections/vec.rs
2 parents 169231d + 36ef29a commit 956c2eb

File tree

29 files changed

+25
-1166
lines changed

29 files changed

+25
-1166
lines changed

‎src/driver/driver.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,9 +12,9 @@
1212
#![cfg_attr(rustdoc, feature(rustdoc))]
1313

1414
#[cfg(rustdoc)]
15-
extern crate "rustdoc" as this;
15+
extern crate rustdoc as this;
1616

1717
#[cfg(rustc)]
18-
extern crate "rustc_driver" as this;
18+
extern crate rustc_driver as this;
1919

2020
fn main() { this::main() }

‎src/libcollections/bit.rs

Lines changed: 0 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -171,18 +171,6 @@ pub struct BitVec {
171171
impl Index<usize> for BitVec {
172172
type Output = bool;
173173

174-
175-
#[cfg(stage0)]
176-
#[inline]
177-
fn index(&self, i: &usize) -> &bool {
178-
if self.get(*i).expect("index out of bounds") {
179-
&TRUE
180-
} else {
181-
&FALSE
182-
}
183-
}
184-
185-
#[cfg(not(stage0))]
186174
#[inline]
187175
fn index(&self, i: usize) -> &bool {
188176
if self.get(i).expect("index out of bounds") {

‎src/libcollections/btree/map.rs

Lines changed: 0 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -915,20 +915,6 @@ impl<K: Debug, V: Debug> Debug for BTreeMap<K, V> {
915915
}
916916
}
917917

918-
#[cfg(stage0)]
919-
#[stable(feature = "rust1", since = "1.0.0")]
920-
impl<K: Ord, Q: ?Sized, V> Index<Q> for BTreeMap<K, V>
921-
where K: Borrow<Q>, Q: Ord
922-
{
923-
type Output = V;
924-
925-
#[inline]
926-
fn index(&self, key: &Q) -> &V {
927-
self.get(key).expect("no entry found for key")
928-
}
929-
}
930-
931-
#[cfg(not(stage0))]
932918
#[stable(feature = "rust1", since = "1.0.0")]
933919
impl<'a, K: Ord, Q: ?Sized, V> Index<&'a Q> for BTreeMap<K, V>
934920
where K: Borrow<Q>, Q: Ord

‎src/libcollections/btree/node.rs

Lines changed: 0 additions & 61 deletions
Original file line numberDiff line numberDiff line change
@@ -1526,36 +1526,6 @@ macro_rules! node_slice_impl {
15261526
}
15271527

15281528
/// Returns a sub-slice with elements starting with `min_key`.
1529-
#[cfg(stage0)]
1530-
pub fn slice_from(self, min_key: &K) -> $NodeSlice<'a, K, V> {
1531-
// _______________
1532-
// |_1_|_3_|_5_|_7_|
1533-
// | | | | |
1534-
// 0 0 1 1 2 2 3 3 4 index
1535-
// | | | | |
1536-
// \___|___|___|___/ slice_from(&0); pos = 0
1537-
// \___|___|___/ slice_from(&2); pos = 1
1538-
// |___|___|___/ slice_from(&3); pos = 1; result.head_is_edge = false
1539-
// \___|___/ slice_from(&4); pos = 2
1540-
// \___/ slice_from(&6); pos = 3
1541-
// \|/ slice_from(&999); pos = 4
1542-
let (pos, pos_is_kv) = self.search_linear(min_key);
1543-
$NodeSlice {
1544-
has_edges: self.has_edges,
1545-
edges: if !self.has_edges {
1546-
self.edges
1547-
} else {
1548-
self.edges.$index(&(pos ..))
1549-
},
1550-
keys: &self.keys[pos ..],
1551-
vals: self.vals.$index(&(pos ..)),
1552-
head_is_edge: !pos_is_kv,
1553-
tail_is_edge: self.tail_is_edge,
1554-
}
1555-
}
1556-
1557-
/// Returns a sub-slice with elements starting with `min_key`.
1558-
#[cfg(not(stage0))]
15591529
pub fn slice_from(self, min_key: &K) -> $NodeSlice<'a, K, V> {
15601530
// _______________
15611531
// |_1_|_3_|_5_|_7_|
@@ -1584,37 +1554,6 @@ macro_rules! node_slice_impl {
15841554
}
15851555

15861556
/// Returns a sub-slice with elements up to and including `max_key`.
1587-
#[cfg(stage0)]
1588-
pub fn slice_to(self, max_key: &K) -> $NodeSlice<'a, K, V> {
1589-
// _______________
1590-
// |_1_|_3_|_5_|_7_|
1591-
// | | | | |
1592-
// 0 0 1 1 2 2 3 3 4 index
1593-
// | | | | |
1594-
//\|/ | | | | slice_to(&0); pos = 0
1595-
// \___/ | | | slice_to(&2); pos = 1
1596-
// \___|___| | | slice_to(&3); pos = 1; result.tail_is_edge = false
1597-
// \___|___/ | | slice_to(&4); pos = 2
1598-
// \___|___|___/ | slice_to(&6); pos = 3
1599-
// \___|___|___|___/ slice_to(&999); pos = 4
1600-
let (pos, pos_is_kv) = self.search_linear(max_key);
1601-
let pos = pos + if pos_is_kv { 1 } else { 0 };
1602-
$NodeSlice {
1603-
has_edges: self.has_edges,
1604-
edges: if !self.has_edges {
1605-
self.edges
1606-
} else {
1607-
self.edges.$index(&(.. (pos + 1)))
1608-
},
1609-
keys: &self.keys[..pos],
1610-
vals: self.vals.$index(&(.. pos)),
1611-
head_is_edge: self.head_is_edge,
1612-
tail_is_edge: !pos_is_kv,
1613-
}
1614-
}
1615-
1616-
/// Returns a sub-slice with elements up to and including `max_key`.
1617-
#[cfg(not(stage0))]
16181557
pub fn slice_to(self, max_key: &K) -> $NodeSlice<'a, K, V> {
16191558
// _______________
16201559
// |_1_|_3_|_5_|_7_|

‎src/libcollections/string.rs

Lines changed: 0 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -903,13 +903,6 @@ impl<'a> Add<&'a str> for String {
903903
impl ops::Index<ops::Range<usize>> for String {
904904
type Output = str;
905905

906-
#[cfg(stage0)]
907-
#[inline]
908-
fn index(&self, index: &ops::Range<usize>) -> &str {
909-
&self[..][*index]
910-
}
911-
912-
#[cfg(not(stage0))]
913906
#[inline]
914907
fn index(&self, index: ops::Range<usize>) -> &str {
915908
&self[..][index]
@@ -919,13 +912,6 @@ impl ops::Index<ops::Range<usize>> for String {
919912
impl ops::Index<ops::RangeTo<usize>> for String {
920913
type Output = str;
921914

922-
#[cfg(stage0)]
923-
#[inline]
924-
fn index(&self, index: &ops::RangeTo<usize>) -> &str {
925-
&self[..][*index]
926-
}
927-
928-
#[cfg(not(stage0))]
929915
#[inline]
930916
fn index(&self, index: ops::RangeTo<usize>) -> &str {
931917
&self[..][index]
@@ -935,13 +921,6 @@ impl ops::Index<ops::RangeTo<usize>> for String {
935921
impl ops::Index<ops::RangeFrom<usize>> for String {
936922
type Output = str;
937923

938-
#[cfg(stage0)]
939-
#[inline]
940-
fn index(&self, index: &ops::RangeFrom<usize>) -> &str {
941-
&self[..][*index]
942-
}
943-
944-
#[cfg(not(stage0))]
945924
#[inline]
946925
fn index(&self, index: ops::RangeFrom<usize>) -> &str {
947926
&self[..][index]
@@ -951,13 +930,6 @@ impl ops::Index<ops::RangeFrom<usize>> for String {
951930
impl ops::Index<ops::RangeFull> for String {
952931
type Output = str;
953932

954-
#[cfg(stage0)]
955-
#[inline]
956-
fn index(&self, _index: &ops::RangeFull) -> &str {
957-
unsafe { mem::transmute(&*self.vec) }
958-
}
959-
960-
#[cfg(not(stage0))]
961933
#[inline]
962934
fn index(&self, _index: ops::RangeFull) -> &str {
963935
unsafe { mem::transmute(&*self.vec) }

‎src/libcollections/vec.rs

Lines changed: 0 additions & 74 deletions
Original file line numberDiff line numberDiff line change
@@ -1332,15 +1332,6 @@ impl<T: Hash> Hash for Vec<T> {
13321332
impl<T> Index<usize> for Vec<T> {
13331333
type Output = T;
13341334

1335-
1336-
#[cfg(stage0)]
1337-
#[inline]
1338-
fn index(&self, index: &usize) -> &T {
1339-
// NB built-in indexing via `&[T]`
1340-
&(**self)[*index]
1341-
}
1342-
1343-
#[cfg(not(stage0))]
13441335
#[inline]
13451336
fn index(&self, index: usize) -> &T {
13461337
// NB built-in indexing via `&[T]`
@@ -1350,15 +1341,6 @@ impl<T> Index<usize> for Vec<T> {
13501341

13511342
#[stable(feature = "rust1", since = "1.0.0")]
13521343
impl<T> IndexMut<usize> for Vec<T> {
1353-
1354-
#[cfg(stage0)]
1355-
#[inline]
1356-
fn index_mut(&mut self, index: &usize) -> &mut T {
1357-
// NB built-in indexing via `&mut [T]`
1358-
&mut (**self)[*index]
1359-
}
1360-
1361-
#[cfg(not(stage0))]
13621344
#[inline]
13631345
fn index_mut(&mut self, index: usize) -> &mut T {
13641346
// NB built-in indexing via `&mut [T]`
@@ -1371,13 +1353,6 @@ impl<T> IndexMut<usize> for Vec<T> {
13711353
impl<T> ops::Index<ops::Range<usize>> for Vec<T> {
13721354
type Output = [T];
13731355

1374-
#[cfg(stage0)]
1375-
#[inline]
1376-
fn index(&self, index: &ops::Range<usize>) -> &[T] {
1377-
Index::index(&**self, index)
1378-
}
1379-
1380-
#[cfg(not(stage0))]
13811356
#[inline]
13821357
fn index(&self, index: ops::Range<usize>) -> &[T] {
13831358
Index::index(&**self, index)
@@ -1387,13 +1362,6 @@ impl<T> ops::Index<ops::Range<usize>> for Vec<T> {
13871362
impl<T> ops::Index<ops::RangeTo<usize>> for Vec<T> {
13881363
type Output = [T];
13891364

1390-
#[cfg(stage0)]
1391-
#[inline]
1392-
fn index(&self, index: &ops::RangeTo<usize>) -> &[T] {
1393-
Index::index(&**self, index)
1394-
}
1395-
1396-
#[cfg(not(stage0))]
13971365
#[inline]
13981366
fn index(&self, index: ops::RangeTo<usize>) -> &[T] {
13991367
Index::index(&**self, index)
@@ -1403,13 +1371,6 @@ impl<T> ops::Index<ops::RangeTo<usize>> for Vec<T> {
14031371
impl<T> ops::Index<ops::RangeFrom<usize>> for Vec<T> {
14041372
type Output = [T];
14051373

1406-
#[cfg(stage0)]
1407-
#[inline]
1408-
fn index(&self, index: &ops::RangeFrom<usize>) -> &[T] {
1409-
Index::index(&**self, index)
1410-
}
1411-
1412-
#[cfg(not(stage0))]
14131374
#[inline]
14141375
fn index(&self, index: ops::RangeFrom<usize>) -> &[T] {
14151376
Index::index(&**self, index)
@@ -1419,13 +1380,6 @@ impl<T> ops::Index<ops::RangeFrom<usize>> for Vec<T> {
14191380
impl<T> ops::Index<ops::RangeFull> for Vec<T> {
14201381
type Output = [T];
14211382

1422-
#[cfg(stage0)]
1423-
#[inline]
1424-
fn index(&self, _index: &ops::RangeFull) -> &[T] {
1425-
self
1426-
}
1427-
1428-
#[cfg(not(stage0))]
14291383
#[inline]
14301384
fn index(&self, _index: ops::RangeFull) -> &[T] {
14311385
self
@@ -1435,13 +1389,6 @@ impl<T> ops::Index<ops::RangeFull> for Vec<T> {
14351389
#[stable(feature = "rust1", since = "1.0.0")]
14361390
impl<T> ops::IndexMut<ops::Range<usize>> for Vec<T> {
14371391

1438-
#[cfg(stage0)]
1439-
#[inline]
1440-
fn index_mut(&mut self, index: &ops::Range<usize>) -> &mut [T] {
1441-
IndexMut::index_mut(&mut **self, index)
1442-
}
1443-
1444-
#[cfg(not(stage0))]
14451392
#[inline]
14461393
fn index_mut(&mut self, index: ops::Range<usize>) -> &mut [T] {
14471394
IndexMut::index_mut(&mut **self, index)
@@ -1450,13 +1397,6 @@ impl<T> ops::IndexMut<ops::Range<usize>> for Vec<T> {
14501397
#[stable(feature = "rust1", since = "1.0.0")]
14511398
impl<T> ops::IndexMut<ops::RangeTo<usize>> for Vec<T> {
14521399

1453-
#[cfg(stage0)]
1454-
#[inline]
1455-
fn index_mut(&mut self, index: &ops::RangeTo<usize>) -> &mut [T] {
1456-
IndexMut::index_mut(&mut **self, index)
1457-
}
1458-
1459-
#[cfg(not(stage0))]
14601400
#[inline]
14611401
fn index_mut(&mut self, index: ops::RangeTo<usize>) -> &mut [T] {
14621402
IndexMut::index_mut(&mut **self, index)
@@ -1465,13 +1405,6 @@ impl<T> ops::IndexMut<ops::RangeTo<usize>> for Vec<T> {
14651405
#[stable(feature = "rust1", since = "1.0.0")]
14661406
impl<T> ops::IndexMut<ops::RangeFrom<usize>> for Vec<T> {
14671407

1468-
#[cfg(stage0)]
1469-
#[inline]
1470-
fn index_mut(&mut self, index: &ops::RangeFrom<usize>) -> &mut [T] {
1471-
IndexMut::index_mut(&mut **self, index)
1472-
}
1473-
1474-
#[cfg(not(stage0))]
14751408
#[inline]
14761409
fn index_mut(&mut self, index: ops::RangeFrom<usize>) -> &mut [T] {
14771410
IndexMut::index_mut(&mut **self, index)
@@ -1480,13 +1413,6 @@ impl<T> ops::IndexMut<ops::RangeFrom<usize>> for Vec<T> {
14801413
#[stable(feature = "rust1", since = "1.0.0")]
14811414
impl<T> ops::IndexMut<ops::RangeFull> for Vec<T> {
14821415

1483-
#[cfg(stage0)]
1484-
#[inline]
1485-
fn index_mut(&mut self, _index: &ops::RangeFull) -> &mut [T] {
1486-
self
1487-
}
1488-
1489-
#[cfg(not(stage0))]
14901416
#[inline]
14911417
fn index_mut(&mut self, _index: ops::RangeFull) -> &mut [T] {
14921418
self

‎src/libcollections/vec_deque.rs

Lines changed: 0 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1705,13 +1705,6 @@ impl<A: Hash> Hash for VecDeque<A> {
17051705
impl<A> Index<usize> for VecDeque<A> {
17061706
type Output = A;
17071707

1708-
#[cfg(stage0)]
1709-
#[inline]
1710-
fn index(&self, i: &usize) -> &A {
1711-
self.get(*i).expect("Out of bounds access")
1712-
}
1713-
1714-
#[cfg(not(stage0))]
17151708
#[inline]
17161709
fn index(&self, i: usize) -> &A {
17171710
self.get(i).expect("Out of bounds access")
@@ -1720,13 +1713,6 @@ impl<A> Index<usize> for VecDeque<A> {
17201713

17211714
#[stable(feature = "rust1", since = "1.0.0")]
17221715
impl<A> IndexMut<usize> for VecDeque<A> {
1723-
#[cfg(stage0)]
1724-
#[inline]
1725-
fn index_mut(&mut self, i: &usize) -> &mut A {
1726-
self.get_mut(*i).expect("Out of bounds access")
1727-
}
1728-
1729-
#[cfg(not(stage0))]
17301716
#[inline]
17311717
fn index_mut(&mut self, i: usize) -> &mut A {
17321718
self.get_mut(i).expect("Out of bounds access")

0 commit comments

Comments
 (0)