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/libstd | |
| 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/libstd')
| -rw-r--r-- | src/libstd/env.rs | 8 |
1 files changed, 4 insertions, 4 deletions
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")] |