Skip to content

Commit 63c8e0c

Browse files
kennytmkennytm
authored
Rollup merge of rust-lang#47030 - ollie27:stab, r=alexcrichton
Correct a few stability attributes * The extra impls for `ManuallyDrop` were added in rust-lang#44310 which was only stabilised in 1.22.0. * The impls for `SliceIndex` were stabilised in rust-lang#43373 but as `RangeInclusive` and `RangeToInclusive` are still unstable the impls should remain unstable. * The `From` impls for atomic integers were added in rust-lang#45610 but most atomic integers are still unstable. * The `shared_from_slice2` impls were added in rust-lang#45990 but they won't be stable until 1.24.0. * The `Mutex` and `RwLock` impls were added in rust-lang#46082 but won't be stable until 1.24.0.
2 parents 8a11b8c + a8d107b commit 63c8e0c

File tree

8 files changed

+39
-24
lines changed

8 files changed

+39
-24
lines changed

‎src/libcore/mem.rs‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1024,7 +1024,7 @@ impl<T: ::fmt::Debug> ::fmt::Debug for ManuallyDrop<T> {
10241024
}
10251025
}
10261026

1027-
#[stable(feature = "manually_drop", since = "1.20.0")]
1027+
#[stable(feature = "manually_drop_impls", since = "1.22.0")]
10281028
impl<T: Clone> Clone for ManuallyDrop<T> {
10291029
fn clone(&self) -> Self {
10301030
ManuallyDrop::new(self.deref().clone())
@@ -1035,14 +1035,14 @@ impl<T: Clone> Clone for ManuallyDrop<T> {
10351035
}
10361036
}
10371037

1038-
#[stable(feature = "manually_drop", since = "1.20.0")]
1038+
#[stable(feature = "manually_drop_impls", since = "1.22.0")]
10391039
impl<T: Default> Default for ManuallyDrop<T> {
10401040
fn default() -> Self {
10411041
ManuallyDrop::new(Default::default())
10421042
}
10431043
}
10441044

1045-
#[stable(feature = "manually_drop", since = "1.20.0")]
1045+
#[stable(feature = "manually_drop_impls", since = "1.22.0")]
10461046
impl<T: PartialEq> PartialEq for ManuallyDrop<T> {
10471047
fn eq(&self, other: &Self) -> bool {
10481048
self.deref().eq(other)
@@ -1053,10 +1053,10 @@ impl<T: PartialEq> PartialEq for ManuallyDrop<T> {
10531053
}
10541054
}
10551055

1056-
#[stable(feature = "manually_drop", since = "1.20.0")]
1056+
#[stable(feature = "manually_drop_impls", since = "1.22.0")]
10571057
impl<T: Eq> Eq for ManuallyDrop<T> {}
10581058

1059-
#[stable(feature = "manually_drop", since = "1.20.0")]
1059+
#[stable(feature = "manually_drop_impls", since = "1.22.0")]
10601060
impl<T: PartialOrd> PartialOrd for ManuallyDrop<T> {
10611061
fn partial_cmp(&self, other: &Self) -> Option<::cmp::Ordering> {
10621062
self.deref().partial_cmp(other)
@@ -1079,14 +1079,14 @@ impl<T: PartialOrd> PartialOrd for ManuallyDrop<T> {
10791079
}
10801080
}
10811081

1082-
#[stable(feature = "manually_drop", since = "1.20.0")]
1082+
#[stable(feature = "manually_drop_impls", since = "1.22.0")]
10831083
impl<T: Ord> Ord for ManuallyDrop<T> {
10841084
fn cmp(&self, other: &Self) -> ::cmp::Ordering {
10851085
self.deref().cmp(other)
10861086
}
10871087
}
10881088

1089-
#[stable(feature = "manually_drop", since = "1.20.0")]
1089+
#[stable(feature = "manually_drop_impls", since = "1.22.0")]
10901090
impl<T: ::hash::Hash> ::hash::Hash for ManuallyDrop<T> {
10911091
fn hash<H: ::hash::Hasher>(&self, state: &mut H) {
10921092
self.deref().hash(state);

‎src/libcore/str/mod.rs‎

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1997,7 +1997,9 @@ mod traits {
19971997
}
19981998
}
19991999

2000-
#[stable(feature = "str_checked_slicing", since = "1.20.0")]
2000+
#[unstable(feature = "inclusive_range",
2001+
reason = "recently added, follows RFC",
2002+
issue = "28237")]
20012003
impl SliceIndex<str> for ops::RangeInclusive<usize> {
20022004
type Output = str;
20032005
#[inline]
@@ -2040,7 +2042,9 @@ mod traits {
20402042

20412043

20422044

2043-
#[stable(feature = "str_checked_slicing", since = "1.20.0")]
2045+
#[unstable(feature = "inclusive_range",
2046+
reason = "recently added, follows RFC",
2047+
issue = "28237")]
20442048
impl SliceIndex<str> for ops::RangeToInclusive<usize> {
20452049
type Output = str;
20462050
#[inline]

‎src/libcore/sync/atomic.rs‎

Lines changed: 12 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -944,6 +944,7 @@ macro_rules! atomic_int {
944944
$stable_cxchg:meta,
945945
$stable_debug:meta,
946946
$stable_access:meta,
947+
$stable_from:meta,
947948
$s_int_type:expr, $int_ref:expr,
948949
$int_type:ident $atomic_type:ident $atomic_init:ident) => {
949950
/// An integer type which can be safely shared between threads.
@@ -978,7 +979,7 @@ macro_rules! atomic_int {
978979
}
979980
}
980981

981-
#[stable(feature = "atomic_from", since = "1.23.0")]
982+
#[$stable_from]
982983
impl From<$int_type> for $atomic_type {
983984
#[inline]
984985
fn from(v: $int_type) -> Self { Self::new(v) }
@@ -1375,6 +1376,7 @@ atomic_int! {
13751376
unstable(feature = "integer_atomics", issue = "32976"),
13761377
unstable(feature = "integer_atomics", issue = "32976"),
13771378
unstable(feature = "integer_atomics", issue = "32976"),
1379+
unstable(feature = "integer_atomics", issue = "32976"),
13781380
"i8", "../../../std/primitive.i8.html",
13791381
i8 AtomicI8 ATOMIC_I8_INIT
13801382
}
@@ -1384,6 +1386,7 @@ atomic_int! {
13841386
unstable(feature = "integer_atomics", issue = "32976"),
13851387
unstable(feature = "integer_atomics", issue = "32976"),
13861388
unstable(feature = "integer_atomics", issue = "32976"),
1389+
unstable(feature = "integer_atomics", issue = "32976"),
13871390
"u8", "../../../std/primitive.u8.html",
13881391
u8 AtomicU8 ATOMIC_U8_INIT
13891392
}
@@ -1393,6 +1396,7 @@ atomic_int! {
13931396
unstable(feature = "integer_atomics", issue = "32976"),
13941397
unstable(feature = "integer_atomics", issue = "32976"),
13951398
unstable(feature = "integer_atomics", issue = "32976"),
1399+
unstable(feature = "integer_atomics", issue = "32976"),
13961400
"i16", "../../../std/primitive.i16.html",
13971401
i16 AtomicI16 ATOMIC_I16_INIT
13981402
}
@@ -1402,6 +1406,7 @@ atomic_int! {
14021406
unstable(feature = "integer_atomics", issue = "32976"),
14031407
unstable(feature = "integer_atomics", issue = "32976"),
14041408
unstable(feature = "integer_atomics", issue = "32976"),
1409+
unstable(feature = "integer_atomics", issue = "32976"),
14051410
"u16", "../../../std/primitive.u16.html",
14061411
u16 AtomicU16 ATOMIC_U16_INIT
14071412
}
@@ -1411,6 +1416,7 @@ atomic_int! {
14111416
unstable(feature = "integer_atomics", issue = "32976"),
14121417
unstable(feature = "integer_atomics", issue = "32976"),
14131418
unstable(feature = "integer_atomics", issue = "32976"),
1419+
unstable(feature = "integer_atomics", issue = "32976"),
14141420
"i32", "../../../std/primitive.i32.html",
14151421
i32 AtomicI32 ATOMIC_I32_INIT
14161422
}
@@ -1420,6 +1426,7 @@ atomic_int! {
14201426
unstable(feature = "integer_atomics", issue = "32976"),
14211427
unstable(feature = "integer_atomics", issue = "32976"),
14221428
unstable(feature = "integer_atomics", issue = "32976"),
1429+
unstable(feature = "integer_atomics", issue = "32976"),
14231430
"u32", "../../../std/primitive.u32.html",
14241431
u32 AtomicU32 ATOMIC_U32_INIT
14251432
}
@@ -1429,6 +1436,7 @@ atomic_int! {
14291436
unstable(feature = "integer_atomics", issue = "32976"),
14301437
unstable(feature = "integer_atomics", issue = "32976"),
14311438
unstable(feature = "integer_atomics", issue = "32976"),
1439+
unstable(feature = "integer_atomics", issue = "32976"),
14321440
"i64", "../../../std/primitive.i64.html",
14331441
i64 AtomicI64 ATOMIC_I64_INIT
14341442
}
@@ -1438,6 +1446,7 @@ atomic_int! {
14381446
unstable(feature = "integer_atomics", issue = "32976"),
14391447
unstable(feature = "integer_atomics", issue = "32976"),
14401448
unstable(feature = "integer_atomics", issue = "32976"),
1449+
unstable(feature = "integer_atomics", issue = "32976"),
14411450
"u64", "../../../std/primitive.u64.html",
14421451
u64 AtomicU64 ATOMIC_U64_INIT
14431452
}
@@ -1447,6 +1456,7 @@ atomic_int!{
14471456
stable(feature = "extended_compare_and_swap", since = "1.10.0"),
14481457
stable(feature = "atomic_debug", since = "1.3.0"),
14491458
stable(feature = "atomic_access", since = "1.15.0"),
1459+
stable(feature = "atomic_from", since = "1.23.0"),
14501460
"isize", "../../../std/primitive.isize.html",
14511461
isize AtomicIsize ATOMIC_ISIZE_INIT
14521462
}
@@ -1456,6 +1466,7 @@ atomic_int!{
14561466
stable(feature = "extended_compare_and_swap", since = "1.10.0"),
14571467
stable(feature = "atomic_debug", since = "1.3.0"),
14581468
stable(feature = "atomic_access", since = "1.15.0"),
1469+
stable(feature = "atomic_from", since = "1.23.0"),
14591470
"usize", "../../../std/primitive.usize.html",
14601471
usize AtomicUsize ATOMIC_USIZE_INIT
14611472
}

‎src/libstd/ffi/c_str.rs‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -706,7 +706,7 @@ impl From<CString> for Box<CStr> {
706706
}
707707
}
708708

709-
#[stable(feature = "shared_from_slice2", since = "1.23.0")]
709+
#[stable(feature = "shared_from_slice2", since = "1.24.0")]
710710
impl From<CString> for Arc<CStr> {
711711
#[inline]
712712
fn from(s: CString) -> Arc<CStr> {
@@ -715,7 +715,7 @@ impl From<CString> for Arc<CStr> {
715715
}
716716
}
717717

718-
#[stable(feature = "shared_from_slice2", since = "1.23.0")]
718+
#[stable(feature = "shared_from_slice2", since = "1.24.0")]
719719
impl<'a> From<&'a CStr> for Arc<CStr> {
720720
#[inline]
721721
fn from(s: &CStr) -> Arc<CStr> {
@@ -724,7 +724,7 @@ impl<'a> From<&'a CStr> for Arc<CStr> {
724724
}
725725
}
726726

727-
#[stable(feature = "shared_from_slice2", since = "1.23.0")]
727+
#[stable(feature = "shared_from_slice2", since = "1.24.0")]
728728
impl From<CString> for Rc<CStr> {
729729
#[inline]
730730
fn from(s: CString) -> Rc<CStr> {
@@ -733,7 +733,7 @@ impl From<CString> for Rc<CStr> {
733733
}
734734
}
735735

736-
#[stable(feature = "shared_from_slice2", since = "1.23.0")]
736+
#[stable(feature = "shared_from_slice2", since = "1.24.0")]
737737
impl<'a> From<&'a CStr> for Rc<CStr> {
738738
#[inline]
739739
fn from(s: &CStr) -> Rc<CStr> {

‎src/libstd/ffi/os_str.rs‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -594,7 +594,7 @@ impl From<OsString> for Box<OsStr> {
594594
}
595595
}
596596

597-
#[stable(feature = "shared_from_slice2", since = "1.23.0")]
597+
#[stable(feature = "shared_from_slice2", since = "1.24.0")]
598598
impl From<OsString> for Arc<OsStr> {
599599
#[inline]
600600
fn from(s: OsString) -> Arc<OsStr> {
@@ -603,7 +603,7 @@ impl From<OsString> for Arc<OsStr> {
603603
}
604604
}
605605

606-
#[stable(feature = "shared_from_slice2", since = "1.23.0")]
606+
#[stable(feature = "shared_from_slice2", since = "1.24.0")]
607607
impl<'a> From<&'a OsStr> for Arc<OsStr> {
608608
#[inline]
609609
fn from(s: &OsStr) -> Arc<OsStr> {
@@ -612,7 +612,7 @@ impl<'a> From<&'a OsStr> for Arc<OsStr> {
612612
}
613613
}
614614

615-
#[stable(feature = "shared_from_slice2", since = "1.23.0")]
615+
#[stable(feature = "shared_from_slice2", since = "1.24.0")]
616616
impl From<OsString> for Rc<OsStr> {
617617
#[inline]
618618
fn from(s: OsString) -> Rc<OsStr> {
@@ -621,7 +621,7 @@ impl From<OsString> for Rc<OsStr> {
621621
}
622622
}
623623

624-
#[stable(feature = "shared_from_slice2", since = "1.23.0")]
624+
#[stable(feature = "shared_from_slice2", since = "1.24.0")]
625625
impl<'a> From<&'a OsStr> for Rc<OsStr> {
626626
#[inline]
627627
fn from(s: &OsStr) -> Rc<OsStr> {

‎src/libstd/path.rs‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1454,7 +1454,7 @@ impl<'a> From<PathBuf> for Cow<'a, Path> {
14541454
}
14551455
}
14561456

1457-
#[stable(feature = "shared_from_slice2", since = "1.23.0")]
1457+
#[stable(feature = "shared_from_slice2", since = "1.24.0")]
14581458
impl From<PathBuf> for Arc<Path> {
14591459
#[inline]
14601460
fn from(s: PathBuf) -> Arc<Path> {
@@ -1463,7 +1463,7 @@ impl From<PathBuf> for Arc<Path> {
14631463
}
14641464
}
14651465

1466-
#[stable(feature = "shared_from_slice2", since = "1.23.0")]
1466+
#[stable(feature = "shared_from_slice2", since = "1.24.0")]
14671467
impl<'a> From<&'a Path> for Arc<Path> {
14681468
#[inline]
14691469
fn from(s: &Path) -> Arc<Path> {
@@ -1472,7 +1472,7 @@ impl<'a> From<&'a Path> for Arc<Path> {
14721472
}
14731473
}
14741474

1475-
#[stable(feature = "shared_from_slice2", since = "1.23.0")]
1475+
#[stable(feature = "shared_from_slice2", since = "1.24.0")]
14761476
impl From<PathBuf> for Rc<Path> {
14771477
#[inline]
14781478
fn from(s: PathBuf) -> Rc<Path> {
@@ -1481,7 +1481,7 @@ impl From<PathBuf> for Rc<Path> {
14811481
}
14821482
}
14831483

1484-
#[stable(feature = "shared_from_slice2", since = "1.23.0")]
1484+
#[stable(feature = "shared_from_slice2", since = "1.24.0")]
14851485
impl<'a> From<&'a Path> for Rc<Path> {
14861486
#[inline]
14871487
fn from(s: &Path) -> Rc<Path> {

‎src/libstd/sync/mutex.rs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -382,7 +382,7 @@ unsafe impl<#[may_dangle] T: ?Sized> Drop for Mutex<T> {
382382
}
383383
}
384384

385-
#[stable(feature = "mutex_from", since = "1.22.0")]
385+
#[stable(feature = "mutex_from", since = "1.24.0")]
386386
impl<T> From<T> for Mutex<T> {
387387
/// Creates a new mutex in an unlocked state ready for use.
388388
/// This is equivalent to [`Mutex::new`].

‎src/libstd/sync/rwlock.rs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -457,7 +457,7 @@ impl<T: Default> Default for RwLock<T> {
457457
}
458458
}
459459

460-
#[stable(feature = "rw_lock_from", since = "1.22.0")]
460+
#[stable(feature = "rw_lock_from", since = "1.24.0")]
461461
impl<T> From<T> for RwLock<T> {
462462
/// Creates a new instance of an `RwLock<T>` which is unlocked.
463463
/// This is equivalent to [`RwLock::new`].

0 commit comments

Comments
 (0)