Skip to content

Commit 559a4b3

Browse files
authored
Rollup merge of rust-lang#41380 - ollie27:stability, r=BurntSushi
Fix a few stability attributes These show up in rustdoc so need to be correct.
2 parents 31906a9 + fd325a1 commit 559a4b3

File tree

5 files changed

+17
-7
lines changed

5 files changed

+17
-7
lines changed

src/libcollections/btree/map.rs

+5
Original file line numberDiff line numberDiff line change
@@ -1442,6 +1442,7 @@ impl<'a, K, V> Clone for Values<'a, K, V> {
14421442
}
14431443
}
14441444

1445+
#[stable(feature = "btree_range", since = "1.17.0")]
14451446
impl<'a, K, V> Iterator for Range<'a, K, V> {
14461447
type Item = (&'a K, &'a V);
14471448

@@ -1517,6 +1518,7 @@ impl<'a, K, V> Range<'a, K, V> {
15171518
}
15181519
}
15191520

1521+
#[stable(feature = "btree_range", since = "1.17.0")]
15201522
impl<'a, K, V> DoubleEndedIterator for Range<'a, K, V> {
15211523
fn next_back(&mut self) -> Option<(&'a K, &'a V)> {
15221524
if self.front == self.back {
@@ -1562,6 +1564,7 @@ impl<'a, K, V> Range<'a, K, V> {
15621564
#[unstable(feature = "fused", issue = "35602")]
15631565
impl<'a, K, V> FusedIterator for Range<'a, K, V> {}
15641566

1567+
#[stable(feature = "btree_range", since = "1.17.0")]
15651568
impl<'a, K, V> Clone for Range<'a, K, V> {
15661569
fn clone(&self) -> Range<'a, K, V> {
15671570
Range {
@@ -1571,6 +1574,7 @@ impl<'a, K, V> Clone for Range<'a, K, V> {
15711574
}
15721575
}
15731576

1577+
#[stable(feature = "btree_range", since = "1.17.0")]
15741578
impl<'a, K, V> Iterator for RangeMut<'a, K, V> {
15751579
type Item = (&'a K, &'a mut V);
15761580

@@ -1615,6 +1619,7 @@ impl<'a, K, V> RangeMut<'a, K, V> {
16151619
}
16161620
}
16171621

1622+
#[stable(feature = "btree_range", since = "1.17.0")]
16181623
impl<'a, K, V> DoubleEndedIterator for RangeMut<'a, K, V> {
16191624
fn next_back(&mut self) -> Option<(&'a K, &'a mut V)> {
16201625
if self.front == self.back {

src/libcollections/btree/set.rs

+5
Original file line numberDiff line numberDiff line change
@@ -941,18 +941,23 @@ impl<T> ExactSizeIterator for IntoIter<T> {
941941
#[unstable(feature = "fused", issue = "35602")]
942942
impl<T> FusedIterator for IntoIter<T> {}
943943

944+
#[stable(feature = "btree_range", since = "1.17.0")]
944945
impl<'a, T> Clone for Range<'a, T> {
945946
fn clone(&self) -> Range<'a, T> {
946947
Range { iter: self.iter.clone() }
947948
}
948949
}
950+
951+
#[stable(feature = "btree_range", since = "1.17.0")]
949952
impl<'a, T> Iterator for Range<'a, T> {
950953
type Item = &'a T;
951954

952955
fn next(&mut self) -> Option<&'a T> {
953956
self.iter.next().map(|(k, _)| k)
954957
}
955958
}
959+
960+
#[stable(feature = "btree_range", since = "1.17.0")]
956961
impl<'a, T> DoubleEndedIterator for Range<'a, T> {
957962
fn next_back(&mut self) -> Option<&'a T> {
958963
self.iter.next_back().map(|(k, _)| k)

src/libcollections/vec_deque.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -2272,7 +2272,7 @@ macro_rules! __impl_slice_eq1 {
22722272
__impl_slice_eq1! { $Lhs, $Rhs, Sized }
22732273
};
22742274
($Lhs: ty, $Rhs: ty, $Bound: ident) => {
2275-
#[stable(feature = "vec-deque-partial-eq-slice", since = "1.16.0")]
2275+
#[stable(feature = "vec-deque-partial-eq-slice", since = "1.17.0")]
22762276
impl<'a, 'b, A: $Bound, B> PartialEq<$Rhs> for $Lhs where A: PartialEq<B> {
22772277
fn eq(&self, other: &$Rhs) -> bool {
22782278
if self.len() != other.len() {

src/libcore/macros.rs

+5-5
Original file line numberDiff line numberDiff line change
@@ -150,7 +150,7 @@ macro_rules! assert_eq {
150150
/// assert_ne!(a, b, "we are testing that the values are not equal");
151151
/// ```
152152
#[macro_export]
153-
#[stable(feature = "assert_ne", since = "1.12.0")]
153+
#[stable(feature = "assert_ne", since = "1.13.0")]
154154
macro_rules! assert_ne {
155155
($left:expr, $right:expr) => ({
156156
match (&$left, &$right) {
@@ -268,7 +268,7 @@ macro_rules! debug_assert_eq {
268268
/// debug_assert_ne!(a, b);
269269
/// ```
270270
#[macro_export]
271-
#[stable(feature = "assert_ne", since = "1.12.0")]
271+
#[stable(feature = "assert_ne", since = "1.13.0")]
272272
macro_rules! debug_assert_ne {
273273
($($arg:tt)*) => (if cfg!(debug_assertions) { assert_ne!($($arg)*); })
274274
}
@@ -379,7 +379,7 @@ macro_rules! try {
379379
/// assert_eq!(v, b"s = \"abc 123\"");
380380
/// ```
381381
#[macro_export]
382-
#[stable(feature = "core", since = "1.6.0")]
382+
#[stable(feature = "rust1", since = "1.0.0")]
383383
macro_rules! write {
384384
($dst:expr, $($arg:tt)*) => ($dst.write_fmt(format_args!($($arg)*)))
385385
}
@@ -479,7 +479,7 @@ macro_rules! writeln {
479479
/// }
480480
/// ```
481481
#[macro_export]
482-
#[stable(feature = "core", since = "1.6.0")]
482+
#[stable(feature = "rust1", since = "1.0.0")]
483483
macro_rules! unreachable {
484484
() => ({
485485
panic!("internal error: entered unreachable code")
@@ -540,7 +540,7 @@ macro_rules! unreachable {
540540
/// }
541541
/// ```
542542
#[macro_export]
543-
#[stable(feature = "core", since = "1.6.0")]
543+
#[stable(feature = "rust1", since = "1.0.0")]
544544
macro_rules! unimplemented {
545545
() => (panic!("not yet implemented"))
546546
}

src/libstd/error.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -216,7 +216,7 @@ impl<'a> From<&'a str> for Box<Error> {
216216
}
217217
}
218218

219-
#[stable(feature = "never_error", since = "1.18.0")]
219+
#[unstable(feature = "never_type_impls", issue = "35121")]
220220
impl Error for ! {
221221
fn description(&self) -> &str { *self }
222222
}

0 commit comments

Comments
 (0)