Skip to content

Commit 8ae79ef

Browse files
committed
Auto merge of #49673 - ollie27:stab, r=sfackler
Correct a few stability attributes * `const_indexing` language feature was stabilized in 1.26.0 by #46882 * `Display` impls for `PanicInfo` and `Location` were stabilized in 1.26.0 by #47687 * `TrustedLen` is still unstable so its impls should be as well even though `RangeInclusive` was stabilized by #47813 * `!Send` and `!Sync` for `Args` and `ArgsOs` were stabilized in 1.26.0 by #48005 * `EscapeDefault` has been stable since 1.0.0 so should continue to show that even though it was moved to core in #48735 This could be backported to beta like #49612
2 parents 292685e + 521e41e commit 8ae79ef

File tree

5 files changed

+10
-8
lines changed

5 files changed

+10
-8
lines changed

Diff for: src/libcore/ascii.rs

+2-2
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ use iter::FusedIterator;
3131
/// documentation for more.
3232
///
3333
/// [`escape_default`]: fn.escape_default.html
34-
#[stable(feature = "core_ascii", since = "1.26.0")]
34+
#[stable(feature = "rust1", since = "1.0.0")]
3535
pub struct EscapeDefault {
3636
range: Range<usize>,
3737
data: [u8; 4],
@@ -99,7 +99,7 @@ pub struct EscapeDefault {
9999
/// assert_eq!(b'9', escaped.next().unwrap());
100100
/// assert_eq!(b'd', escaped.next().unwrap());
101101
/// ```
102-
#[stable(feature = "core_ascii", since = "1.26.0")]
102+
#[stable(feature = "rust1", since = "1.0.0")]
103103
pub fn escape_default(c: u8) -> EscapeDefault {
104104
let (data, len) = match c {
105105
b'\t' => ([b'\\', b't', 0, 0], 2),

Diff for: src/libcore/iter/range.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -200,7 +200,7 @@ macro_rules! range_trusted_len_impl {
200200

201201
macro_rules! range_incl_trusted_len_impl {
202202
($($t:ty)*) => ($(
203-
#[stable(feature = "inclusive_range", since = "1.26.0")]
203+
#[unstable(feature = "trusted_len", issue = "37572")]
204204
unsafe impl TrustedLen for ops::RangeInclusive<$t> { }
205205
)*)
206206
}

Diff for: src/libcore/panic.rs

+2
Original file line numberDiff line numberDiff line change
@@ -120,6 +120,7 @@ impl<'a> PanicInfo<'a> {
120120
}
121121
}
122122

123+
#[stable(feature = "panic_hook_display", since = "1.26.0")]
123124
impl<'a> fmt::Display for PanicInfo<'a> {
124125
fn fmt(&self, formatter: &mut fmt::Formatter) -> fmt::Result {
125126
formatter.write_str("panicked at ")?;
@@ -244,6 +245,7 @@ impl<'a> Location<'a> {
244245
}
245246
}
246247

248+
#[stable(feature = "panic_hook_display", since = "1.26.0")]
247249
impl<'a> fmt::Display for Location<'a> {
248250
fn fmt(&self, formatter: &mut fmt::Formatter) -> fmt::Result {
249251
write!(formatter, "{}:{}:{}", self.file, self.line, self.col)

Diff for: src/libstd/env.rs

+4-4
Original file line numberDiff line numberDiff line change
@@ -723,10 +723,10 @@ pub fn args_os() -> ArgsOs {
723723
ArgsOs { inner: sys::args::args() }
724724
}
725725

726-
#[stable(feature = "env_unimpl_send_sync", since = "1.25.0")]
726+
#[stable(feature = "env_unimpl_send_sync", since = "1.26.0")]
727727
impl !Send for Args {}
728728

729-
#[stable(feature = "env_unimpl_send_sync", since = "1.25.0")]
729+
#[stable(feature = "env_unimpl_send_sync", since = "1.26.0")]
730730
impl !Sync for Args {}
731731

732732
#[stable(feature = "env", since = "1.0.0")]
@@ -760,10 +760,10 @@ impl fmt::Debug for Args {
760760
}
761761
}
762762

763-
#[stable(feature = "env_unimpl_send_sync", since = "1.25.0")]
763+
#[stable(feature = "env_unimpl_send_sync", since = "1.26.0")]
764764
impl !Send for ArgsOs {}
765765

766-
#[stable(feature = "env_unimpl_send_sync", since = "1.25.0")]
766+
#[stable(feature = "env_unimpl_send_sync", since = "1.26.0")]
767767
impl !Sync for ArgsOs {}
768768

769769
#[stable(feature = "env", since = "1.0.0")]

Diff for: src/libsyntax/feature_gate.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -483,7 +483,7 @@ declare_features! (
483483
// allow empty structs and enum variants with braces
484484
(accepted, braced_empty_structs, "1.8.0", Some(29720), None),
485485
// Allows indexing into constant arrays.
486-
(accepted, const_indexing, "1.24.0", Some(29947), None),
486+
(accepted, const_indexing, "1.26.0", Some(29947), None),
487487
(accepted, default_type_params, "1.0.0", None, None),
488488
(accepted, globs, "1.0.0", None, None),
489489
(accepted, if_let, "1.0.0", None, None),

0 commit comments

Comments
 (0)