diff options
| author | bors <bors@rust-lang.org> | 2018-04-09 03:32:32 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2018-04-09 03:32:32 +0000 |
| commit | 8ae79efce3e43eadecd032cf38b2372b4cba7b62 (patch) | |
| tree | 3cc57eb3f99e83e26ab489cd7e1e6bc295891bfb /src | |
| parent | 292685e8965eb5dcd52637e93e93ebfd67b86615 (diff) | |
| parent | 521e41e77d0c9213ff3ed3f2a5e863b600ce2c3a (diff) | |
| download | rust-8ae79efce3e43eadecd032cf38b2372b4cba7b62.tar.gz rust-8ae79efce3e43eadecd032cf38b2372b4cba7b62.zip | |
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
Diffstat (limited to 'src')
| -rw-r--r-- | src/libcore/ascii.rs | 4 | ||||
| -rw-r--r-- | src/libcore/iter/range.rs | 2 | ||||
| -rw-r--r-- | src/libcore/panic.rs | 2 | ||||
| -rw-r--r-- | src/libstd/env.rs | 8 | ||||
| -rw-r--r-- | src/libsyntax/feature_gate.rs | 2 |
5 files changed, 10 insertions, 8 deletions
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 @@ use iter::FusedIterator; /// 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<usize>, 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 5d57207763e..5896322f111 100644 --- a/src/libcore/iter/range.rs +++ b/src/libcore/iter/range.rs @@ -200,7 +200,7 @@ macro_rules! range_trusted_len_impl { 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 @@ impl<'a> PanicInfo<'a> { } } +#[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 @@ impl<'a> Location<'a> { } } +#[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 @@ impl fmt::Debug for Args { } } -#[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 e1f1d95b8ab..0a3cd66d897 100644 --- a/src/libsyntax/feature_gate.rs +++ b/src/libsyntax/feature_gate.rs @@ -483,7 +483,7 @@ declare_features! ( // 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), |
