From 2f703e4304c1c9b15c616b7a08bac581af5ab430 Mon Sep 17 00:00:00 2001 From: Oliver Middleton Date: Sat, 20 May 2017 08:38:39 +0100 Subject: Correct some stability versions These were found by running tidy on stable versions of rust and finding features stabilised with the wrong version numbers. --- src/libstd/env.rs | 4 ++-- src/libstd/error.rs | 6 +++--- src/libstd/ffi/c_str.rs | 4 ++-- src/libstd/ffi/os_str.rs | 4 ++-- src/libstd/macros.rs | 4 ++-- src/libstd/net/ip.rs | 18 +++++++++--------- src/libstd/path.rs | 6 +++--- src/libstd/sync/condvar.rs | 2 +- src/libstd/sync/mpsc/mod.rs | 10 +++++----- src/libstd/sync/mutex.rs | 4 ++-- src/libstd/sync/rwlock.rs | 2 +- 11 files changed, 32 insertions(+), 32 deletions(-) (limited to 'src/libstd') diff --git a/src/libstd/env.rs b/src/libstd/env.rs index 64eb52e28bc..27255bef849 100644 --- a/src/libstd/env.rs +++ b/src/libstd/env.rs @@ -680,7 +680,7 @@ impl ExactSizeIterator for Args { fn is_empty(&self) -> bool { self.inner.is_empty() } } -#[stable(feature = "env_iterators", since = "1.11.0")] +#[stable(feature = "env_iterators", since = "1.12.0")] impl DoubleEndedIterator for Args { fn next_back(&mut self) -> Option { self.inner.next_back().map(|s| s.into_string().unwrap()) @@ -707,7 +707,7 @@ impl ExactSizeIterator for ArgsOs { fn is_empty(&self) -> bool { self.inner.is_empty() } } -#[stable(feature = "env_iterators", since = "1.11.0")] +#[stable(feature = "env_iterators", since = "1.12.0")] impl DoubleEndedIterator for ArgsOs { fn next_back(&mut self) -> Option { self.inner.next_back() } } diff --git a/src/libstd/error.rs b/src/libstd/error.rs index 9ff7d746733..f56e3a5d780 100644 --- a/src/libstd/error.rs +++ b/src/libstd/error.rs @@ -193,7 +193,7 @@ impl From for Box { } } -#[stable(feature = "string_box_error", since = "1.7.0")] +#[stable(feature = "string_box_error", since = "1.6.0")] impl From for Box { fn from(str_err: String) -> Box { let err1: Box = From::from(str_err); @@ -209,7 +209,7 @@ impl<'a, 'b> From<&'b str> for Box { } } -#[stable(feature = "string_box_error", since = "1.7.0")] +#[stable(feature = "string_box_error", since = "1.6.0")] impl<'a> From<&'a str> for Box { fn from(err: &'a str) -> Box { From::from(String::from(err)) @@ -282,7 +282,7 @@ impl Error for char::DecodeUtf16Error { } } -#[stable(feature = "box_error", since = "1.7.0")] +#[stable(feature = "box_error", since = "1.8.0")] impl Error for Box { fn description(&self) -> &str { Error::description(&**self) diff --git a/src/libstd/ffi/c_str.rs b/src/libstd/ffi/c_str.rs index 44b62593fa3..f40475a4142 100644 --- a/src/libstd/ffi/c_str.rs +++ b/src/libstd/ffi/c_str.rs @@ -419,14 +419,14 @@ impl<'a> From<&'a CStr> for Box { } } -#[stable(feature = "c_string_from_box", since = "1.17.0")] +#[stable(feature = "c_string_from_box", since = "1.18.0")] impl From> for CString { fn from(s: Box) -> CString { s.into_c_string() } } -#[stable(feature = "box_from_c_string", since = "1.17.0")] +#[stable(feature = "box_from_c_string", since = "1.18.0")] impl Into> for CString { fn into(self) -> Box { self.into_boxed_c_str() diff --git a/src/libstd/ffi/os_str.rs b/src/libstd/ffi/os_str.rs index b90192dd8af..eaf0502a577 100644 --- a/src/libstd/ffi/os_str.rs +++ b/src/libstd/ffi/os_str.rs @@ -529,14 +529,14 @@ impl<'a> From<&'a OsStr> for Box { } } -#[stable(feature = "os_string_from_box", since = "1.17.0")] +#[stable(feature = "os_string_from_box", since = "1.18.0")] impl<'a> From> for OsString { fn from(boxed: Box) -> OsString { boxed.into_os_string() } } -#[stable(feature = "box_from_c_string", since = "1.17.0")] +#[stable(feature = "box_from_os_string", since = "1.18.0")] impl Into> for OsString { fn into(self) -> Box { self.into_boxed_os_str() diff --git a/src/libstd/macros.rs b/src/libstd/macros.rs index ef78ea6dfe8..df3fce0da76 100644 --- a/src/libstd/macros.rs +++ b/src/libstd/macros.rs @@ -143,7 +143,7 @@ macro_rules! println { /// /// Panics if writing to `io::stderr` fails. #[macro_export] -#[stable(feature = "eprint", since="1.18.0")] +#[stable(feature = "eprint", since = "1.19.0")] #[allow_internal_unstable] macro_rules! eprint { ($($arg:tt)*) => ($crate::io::_eprint(format_args!($($arg)*))); @@ -162,7 +162,7 @@ macro_rules! eprint { /// /// Panics if writing to `io::stderr` fails. #[macro_export] -#[stable(feature = "eprint", since="1.18.0")] +#[stable(feature = "eprint", since = "1.19.0")] macro_rules! eprintln { () => (eprint!("\n")); ($fmt:expr) => (eprint!(concat!($fmt, "\n"))); diff --git a/src/libstd/net/ip.rs b/src/libstd/net/ip.rs index c46fe4a58c7..1e5368896af 100644 --- a/src/libstd/net/ip.rs +++ b/src/libstd/net/ip.rs @@ -657,7 +657,7 @@ impl PartialEq for Ipv4Addr { } } -#[stable(feature = "ip_cmp", since = "1.15.0")] +#[stable(feature = "ip_cmp", since = "1.16.0")] impl PartialEq for IpAddr { fn eq(&self, other: &Ipv4Addr) -> bool { match *self { @@ -667,7 +667,7 @@ impl PartialEq for IpAddr { } } -#[stable(feature = "ip_cmp", since = "1.15.0")] +#[stable(feature = "ip_cmp", since = "1.16.0")] impl PartialEq for Ipv4Addr { fn eq(&self, other: &IpAddr) -> bool { match *other { @@ -694,7 +694,7 @@ impl PartialOrd for Ipv4Addr { } } -#[stable(feature = "ip_cmp", since = "1.15.0")] +#[stable(feature = "ip_cmp", since = "1.16.0")] impl PartialOrd for IpAddr { fn partial_cmp(&self, other: &Ipv4Addr) -> Option { match *self { @@ -704,7 +704,7 @@ impl PartialOrd for IpAddr { } } -#[stable(feature = "ip_cmp", since = "1.15.0")] +#[stable(feature = "ip_cmp", since = "1.16.0")] impl PartialOrd for Ipv4Addr { fn partial_cmp(&self, other: &IpAddr) -> Option { match *other { @@ -1200,7 +1200,7 @@ impl PartialEq for Ipv6Addr { } } -#[stable(feature = "ip_cmp", since = "1.15.0")] +#[stable(feature = "ip_cmp", since = "1.16.0")] impl PartialEq for Ipv6Addr { fn eq(&self, other: &IpAddr) -> bool { match *other { @@ -1210,7 +1210,7 @@ impl PartialEq for Ipv6Addr { } } -#[stable(feature = "ip_cmp", since = "1.15.0")] +#[stable(feature = "ip_cmp", since = "1.16.0")] impl PartialEq for IpAddr { fn eq(&self, other: &Ipv6Addr) -> bool { match *self { @@ -1237,7 +1237,7 @@ impl PartialOrd for Ipv6Addr { } } -#[stable(feature = "ip_cmp", since = "1.15.0")] +#[stable(feature = "ip_cmp", since = "1.16.0")] impl PartialOrd for IpAddr { fn partial_cmp(&self, other: &Ipv6Addr) -> Option { match *self { @@ -1247,7 +1247,7 @@ impl PartialOrd for IpAddr { } } -#[stable(feature = "ip_cmp", since = "1.15.0")] +#[stable(feature = "ip_cmp", since = "1.16.0")] impl PartialOrd for Ipv6Addr { fn partial_cmp(&self, other: &IpAddr) -> Option { match *other { @@ -1302,7 +1302,7 @@ impl From<[u8; 16]> for Ipv6Addr { } } -#[stable(feature = "ipv6_from_segments", since = "1.15.0")] +#[stable(feature = "ipv6_from_segments", since = "1.16.0")] impl From<[u16; 8]> for Ipv6Addr { fn from(segments: [u16; 8]) -> Ipv6Addr { let [a, b, c, d, e, f, g, h] = segments; diff --git a/src/libstd/path.rs b/src/libstd/path.rs index f4b9a8972e3..e7d8c3007f6 100644 --- a/src/libstd/path.rs +++ b/src/libstd/path.rs @@ -1341,14 +1341,14 @@ impl<'a> From<&'a Path> for Box { } } -#[stable(feature = "path_buf_from_box", since = "1.17.0")] +#[stable(feature = "path_buf_from_box", since = "1.18.0")] impl<'a> From> for PathBuf { fn from(boxed: Box) -> PathBuf { boxed.into_path_buf() } } -#[stable(feature = "box_from_path_buf", since = "1.17.0")] +#[stable(feature = "box_from_path_buf", since = "1.18.0")] impl Into> for PathBuf { fn into(self) -> Box { self.into_boxed_path() @@ -1424,7 +1424,7 @@ impl Borrow for PathBuf { } } -#[stable(feature = "default_for_pathbuf", since = "1.16.0")] +#[stable(feature = "default_for_pathbuf", since = "1.17.0")] impl Default for PathBuf { fn default() -> Self { PathBuf::new() diff --git a/src/libstd/sync/condvar.rs b/src/libstd/sync/condvar.rs index 7ad9d9ee37c..c120a3045e4 100644 --- a/src/libstd/sync/condvar.rs +++ b/src/libstd/sync/condvar.rs @@ -461,7 +461,7 @@ impl fmt::Debug for Condvar { } } -#[stable(feature = "condvar_default", since = "1.9.0")] +#[stable(feature = "condvar_default", since = "1.10.0")] impl Default for Condvar { /// Creates a `Condvar` which is ready to be waited on and notified. fn default() -> Condvar { diff --git a/src/libstd/sync/mpsc/mod.rs b/src/libstd/sync/mpsc/mod.rs index 2cb649ce67b..f7fb83aa3b9 100644 --- a/src/libstd/sync/mpsc/mod.rs +++ b/src/libstd/sync/mpsc/mod.rs @@ -921,7 +921,7 @@ impl Drop for Sender { } } -#[stable(feature = "mpsc_debug", since = "1.7.0")] +#[stable(feature = "mpsc_debug", since = "1.8.0")] impl fmt::Debug for Sender { fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result { write!(f, "Sender {{ .. }}") @@ -1051,7 +1051,7 @@ impl Drop for SyncSender { } } -#[stable(feature = "mpsc_debug", since = "1.7.0")] +#[stable(feature = "mpsc_debug", since = "1.8.0")] impl fmt::Debug for SyncSender { fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result { write!(f, "SyncSender {{ .. }}") @@ -1517,7 +1517,7 @@ impl Drop for Receiver { } } -#[stable(feature = "mpsc_debug", since = "1.7.0")] +#[stable(feature = "mpsc_debug", since = "1.8.0")] impl fmt::Debug for Receiver { fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result { write!(f, "Receiver {{ .. }}") @@ -1644,7 +1644,7 @@ impl error::Error for TryRecvError { } } -#[stable(feature = "mpsc_recv_timeout_error", since = "1.14.0")] +#[stable(feature = "mpsc_recv_timeout_error", since = "1.15.0")] impl fmt::Display for RecvTimeoutError { fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result { match *self { @@ -1658,7 +1658,7 @@ impl fmt::Display for RecvTimeoutError { } } -#[stable(feature = "mpsc_recv_timeout_error", since = "1.14.0")] +#[stable(feature = "mpsc_recv_timeout_error", since = "1.15.0")] impl error::Error for RecvTimeoutError { fn description(&self) -> &str { match *self { diff --git a/src/libstd/sync/mutex.rs b/src/libstd/sync/mutex.rs index 5c3eaa4668d..9a242a96d46 100644 --- a/src/libstd/sync/mutex.rs +++ b/src/libstd/sync/mutex.rs @@ -153,7 +153,7 @@ pub struct MutexGuard<'a, T: ?Sized + 'a> { #[stable(feature = "rust1", since = "1.0.0")] impl<'a, T: ?Sized> !Send for MutexGuard<'a, T> { } -#[stable(feature = "mutexguard", since = "1.18.0")] +#[stable(feature = "mutexguard", since = "1.19.0")] unsafe impl<'a, T: ?Sized + Sync> Sync for MutexGuard<'a, T> { } impl Mutex { @@ -372,7 +372,7 @@ unsafe impl<#[may_dangle] T: ?Sized> Drop for Mutex { } } -#[stable(feature = "mutex_default", since = "1.9.0")] +#[stable(feature = "mutex_default", since = "1.10.0")] impl Default for Mutex { /// Creates a `Mutex`, with the `Default` value for T. fn default() -> Mutex { diff --git a/src/libstd/sync/rwlock.rs b/src/libstd/sync/rwlock.rs index d26f2f7bb7e..95bc8d30932 100644 --- a/src/libstd/sync/rwlock.rs +++ b/src/libstd/sync/rwlock.rs @@ -330,7 +330,7 @@ impl fmt::Debug for RwLock { } } -#[stable(feature = "rw_lock_default", since = "1.9.0")] +#[stable(feature = "rw_lock_default", since = "1.10.0")] impl Default for RwLock { /// Creates a new `RwLock`, with the `Default` value for T. fn default() -> RwLock { -- cgit 1.4.1-3-g733a5