From: Oliver Middleton Date: Wed, 4 Apr 2018 23:35:09 +0000 (+0100) Subject: Correct a few stability attributes X-Git-Url: https://git.lizzy.rs/?a=commitdiff_plain;h=521e41e77d0c9213ff3ed3f2a5e863b600ce2c3a;p=rust.git Correct a few stability attributes --- diff --git a/src/libcore/ascii.rs b/src/libcore/ascii.rs index 2c4bccebceb..e6b0569281f 100644 --- a/src/libcore/ascii.rs +++ b/src/libcore/ascii.rs @@ -31,7 +31,7 @@ /// documentation for more. /// /// [`escape_default`]: fn.escape_default.html -#[stable(feature = "core_ascii", since = "1.26.0")] +#[stable(feature = "rust1", since = "1.0.0")] pub struct EscapeDefault { range: Range, data: [u8; 4], @@ -99,7 +99,7 @@ pub struct EscapeDefault { /// assert_eq!(b'9', escaped.next().unwrap()); /// assert_eq!(b'd', escaped.next().unwrap()); /// ``` -#[stable(feature = "core_ascii", since = "1.26.0")] +#[stable(feature = "rust1", since = "1.0.0")] pub fn escape_default(c: u8) -> EscapeDefault { let (data, len) = match c { b'\t' => ([b'\\', b't', 0, 0], 2), diff --git a/src/libcore/iter/range.rs b/src/libcore/iter/range.rs index 72b48b56571..bcc0e1f05be 100644 --- a/src/libcore/iter/range.rs +++ b/src/libcore/iter/range.rs @@ -200,7 +200,7 @@ unsafe impl TrustedLen for ops::Range<$t> { } macro_rules! range_incl_trusted_len_impl { ($($t:ty)*) => ($( - #[stable(feature = "inclusive_range", since = "1.26.0")] + #[unstable(feature = "trusted_len", issue = "37572")] unsafe impl TrustedLen for ops::RangeInclusive<$t> { } )*) } diff --git a/src/libcore/panic.rs b/src/libcore/panic.rs index 4e72eaa57c7..1720c9d8c60 100644 --- a/src/libcore/panic.rs +++ b/src/libcore/panic.rs @@ -120,6 +120,7 @@ pub fn location(&self) -> Option<&Location> { } } +#[stable(feature = "panic_hook_display", since = "1.26.0")] impl<'a> fmt::Display for PanicInfo<'a> { fn fmt(&self, formatter: &mut fmt::Formatter) -> fmt::Result { formatter.write_str("panicked at ")?; @@ -244,6 +245,7 @@ pub fn column(&self) -> u32 { } } +#[stable(feature = "panic_hook_display", since = "1.26.0")] impl<'a> fmt::Display for Location<'a> { fn fmt(&self, formatter: &mut fmt::Formatter) -> fmt::Result { write!(formatter, "{}:{}:{}", self.file, self.line, self.col) diff --git a/src/libstd/env.rs b/src/libstd/env.rs index 320a9f935d4..a103c0bdd59 100644 --- a/src/libstd/env.rs +++ b/src/libstd/env.rs @@ -723,10 +723,10 @@ pub fn args_os() -> ArgsOs { ArgsOs { inner: sys::args::args() } } -#[stable(feature = "env_unimpl_send_sync", since = "1.25.0")] +#[stable(feature = "env_unimpl_send_sync", since = "1.26.0")] impl !Send for Args {} -#[stable(feature = "env_unimpl_send_sync", since = "1.25.0")] +#[stable(feature = "env_unimpl_send_sync", since = "1.26.0")] impl !Sync for Args {} #[stable(feature = "env", since = "1.0.0")] @@ -760,10 +760,10 @@ fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result { } } -#[stable(feature = "env_unimpl_send_sync", since = "1.25.0")] +#[stable(feature = "env_unimpl_send_sync", since = "1.26.0")] impl !Send for ArgsOs {} -#[stable(feature = "env_unimpl_send_sync", since = "1.25.0")] +#[stable(feature = "env_unimpl_send_sync", since = "1.26.0")] impl !Sync for ArgsOs {} #[stable(feature = "env", since = "1.0.0")] diff --git a/src/libsyntax/feature_gate.rs b/src/libsyntax/feature_gate.rs index e734a4e3735..d1348c89faf 100644 --- a/src/libsyntax/feature_gate.rs +++ b/src/libsyntax/feature_gate.rs @@ -483,7 +483,7 @@ pub fn walk_feature_fields(&self, mut f: F) // allow empty structs and enum variants with braces (accepted, braced_empty_structs, "1.8.0", Some(29720), None), // Allows indexing into constant arrays. - (accepted, const_indexing, "1.24.0", Some(29947), None), + (accepted, const_indexing, "1.26.0", Some(29947), None), (accepted, default_type_params, "1.0.0", None, None), (accepted, globs, "1.0.0", None, None), (accepted, if_let, "1.0.0", None, None),