diff options
Diffstat (limited to 'library/std/src')
48 files changed, 203 insertions, 222 deletions
diff --git a/library/std/src/ascii.rs b/library/std/src/ascii.rs index 035cd9f243b..c29f015777f 100644 --- a/library/std/src/ascii.rs +++ b/library/std/src/ascii.rs @@ -39,7 +39,7 @@ pub use core::ascii::{escape_default, EscapeDefault}; /// /// [combining character]: https://en.wikipedia.org/wiki/Combining_character #[stable(feature = "rust1", since = "1.0.0")] -#[rustc_deprecated(since = "1.26.0", reason = "use inherent methods instead")] +#[deprecated(since = "1.26.0", note = "use inherent methods instead")] pub trait AsciiExt { /// Container type for copied ASCII characters. #[stable(feature = "rust1", since = "1.0.0")] diff --git a/library/std/src/collections/mod.rs b/library/std/src/collections/mod.rs index 0caec8fe05a..ae2baba09e6 100644 --- a/library/std/src/collections/mod.rs +++ b/library/std/src/collections/mod.rs @@ -402,7 +402,7 @@ #[stable(feature = "rust1", since = "1.0.0")] // FIXME(#82080) The deprecation here is only theoretical, and does not actually produce a warning. -#[rustc_deprecated(reason = "moved to `std::ops::Bound`", since = "1.26.0")] +#[deprecated(note = "moved to `std::ops::Bound`", since = "1.26.0")] #[doc(hidden)] pub use crate::ops::Bound; diff --git a/library/std/src/env.rs b/library/std/src/env.rs index e287a93da7b..4027a71a06c 100644 --- a/library/std/src/env.rs +++ b/library/std/src/env.rs @@ -577,10 +577,10 @@ impl Error for JoinPathsError { /// None => println!("Impossible to get your home dir!"), /// } /// ``` -#[rustc_deprecated( +#[deprecated( since = "1.29.0", - reason = "This function's behavior is unexpected and probably not what you want. \ - Consider using a crate from crates.io instead." + note = "This function's behavior is unexpected and probably not what you want. \ + Consider using a crate from crates.io instead." )] #[must_use] #[stable(feature = "env", since = "1.0.0")] diff --git a/library/std/src/error.rs b/library/std/src/error.rs index fdeb280d240..361163d1970 100644 --- a/library/std/src/error.rs +++ b/library/std/src/error.rs @@ -145,15 +145,15 @@ pub trait Error: Debug + Display { /// } /// ``` #[stable(feature = "rust1", since = "1.0.0")] - #[rustc_deprecated(since = "1.42.0", reason = "use the Display impl or to_string()")] + #[deprecated(since = "1.42.0", note = "use the Display impl or to_string()")] fn description(&self) -> &str { "description() is deprecated; use Display" } #[stable(feature = "rust1", since = "1.0.0")] - #[rustc_deprecated( + #[deprecated( since = "1.33.0", - reason = "replaced by Error::source, which can support downcasting" + note = "replaced by Error::source, which can support downcasting" )] #[allow(missing_docs)] fn cause(&self) -> Option<&dyn Error> { diff --git a/library/std/src/f32.rs b/library/std/src/f32.rs index ac288c599f3..933b52b4dcc 100644 --- a/library/std/src/f32.rs +++ b/library/std/src/f32.rs @@ -29,7 +29,7 @@ pub use core::f32::{ #[cfg(not(test))] impl f32 { - /// Returns the largest integer less than or equal to a number. + /// Returns the largest integer less than or equal to `self`. /// /// # Examples /// @@ -50,7 +50,7 @@ impl f32 { unsafe { intrinsics::floorf32(self) } } - /// Returns the smallest integer greater than or equal to a number. + /// Returns the smallest integer greater than or equal to `self`. /// /// # Examples /// @@ -69,7 +69,7 @@ impl f32 { unsafe { intrinsics::ceilf32(self) } } - /// Returns the nearest integer to a number. Round half-way cases away from + /// Returns the nearest integer to `self`. Round half-way cases away from /// `0.0`. /// /// # Examples @@ -89,7 +89,8 @@ impl f32 { unsafe { intrinsics::roundf32(self) } } - /// Returns the integer part of a number. + /// Returns the integer part of `self`. + /// This means that non-integer numbers are always truncated towards zero. /// /// # Examples /// @@ -110,7 +111,7 @@ impl f32 { unsafe { intrinsics::truncf32(self) } } - /// Returns the fractional part of a number. + /// Returns the fractional part of `self`. /// /// # Examples /// @@ -131,8 +132,7 @@ impl f32 { self - self.trunc() } - /// Computes the absolute value of `self`. Returns `NAN` if the - /// number is `NAN`. + /// Computes the absolute value of `self`. /// /// # Examples /// @@ -160,7 +160,7 @@ impl f32 { /// /// - `1.0` if the number is positive, `+0.0` or `INFINITY` /// - `-1.0` if the number is negative, `-0.0` or `NEG_INFINITY` - /// - `NAN` if the number is `NAN` + /// - NaN if the number is NaN /// /// # Examples /// @@ -184,8 +184,10 @@ impl f32 { /// `sign`. /// /// Equal to `self` if the sign of `self` and `sign` are the same, otherwise - /// equal to `-self`. If `self` is a `NAN`, then a `NAN` with the sign of - /// `sign` is returned. + /// equal to `-self`. If `self` is a NaN, then a NaN with the sign bit of + /// `sign` is returned. Note, however, that conserving the sign bit on NaN + /// across arithmetical operations is not generally guaranteed. + /// See [explanation of NaN as a special value](primitive@f32) for more info. /// /// # Examples /// @@ -298,7 +300,9 @@ impl f32 { /// Raises a number to an integer power. /// - /// Using this function is generally faster than using `powf` + /// Using this function is generally faster than using `powf`. + /// It might have a different sequence of rounding operations than `powf`, + /// so the results are not guaranteed to agree. /// /// # Examples /// @@ -511,15 +515,15 @@ impl f32 { #[must_use = "method returns a new number and does not mutate the original value"] #[stable(feature = "rust1", since = "1.0.0")] #[inline] - #[rustc_deprecated( + #[deprecated( since = "1.10.0", - reason = "you probably meant `(self - other).abs()`: \ - this operation is `(self - other).max(0.0)` \ - except that `abs_sub` also propagates NaNs (also \ - known as `fdimf` in C). If you truly need the positive \ - difference, consider using that expression or the C function \ - `fdimf`, depending on how you wish to handle NaN (please consider \ - filing an issue describing your use-case too)." + note = "you probably meant `(self - other).abs()`: \ + this operation is `(self - other).max(0.0)` \ + except that `abs_sub` also propagates NaNs (also \ + known as `fdimf` in C). If you truly need the positive \ + difference, consider using that expression or the C function \ + `fdimf`, depending on how you wish to handle NaN (please consider \ + filing an issue describing your use-case too)." )] pub fn abs_sub(self, other: f32) -> f32 { unsafe { cmath::fdimf(self, other) } diff --git a/library/std/src/f64.rs b/library/std/src/f64.rs index 01279f01b05..a9aa84f70d1 100644 --- a/library/std/src/f64.rs +++ b/library/std/src/f64.rs @@ -29,7 +29,7 @@ pub use core::f64::{ #[cfg(not(test))] impl f64 { - /// Returns the largest integer less than or equal to a number. + /// Returns the largest integer less than or equal to `self`. /// /// # Examples /// @@ -50,7 +50,7 @@ impl f64 { unsafe { intrinsics::floorf64(self) } } - /// Returns the smallest integer greater than or equal to a number. + /// Returns the smallest integer greater than or equal to `self`. /// /// # Examples /// @@ -69,7 +69,7 @@ impl f64 { unsafe { intrinsics::ceilf64(self) } } - /// Returns the nearest integer to a number. Round half-way cases away from + /// Returns the nearest integer to `self`. Round half-way cases away from /// `0.0`. /// /// # Examples @@ -89,7 +89,8 @@ impl f64 { unsafe { intrinsics::roundf64(self) } } - /// Returns the integer part of a number. + /// Returns the integer part of `self`. + /// This means that non-integer numbers are always truncated towards zero. /// /// # Examples /// @@ -110,7 +111,7 @@ impl f64 { unsafe { intrinsics::truncf64(self) } } - /// Returns the fractional part of a number. + /// Returns the fractional part of `self`. /// /// # Examples /// @@ -131,8 +132,7 @@ impl f64 { self - self.trunc() } - /// Computes the absolute value of `self`. Returns `NAN` if the - /// number is `NAN`. + /// Computes the absolute value of `self`. /// /// # Examples /// @@ -160,7 +160,7 @@ impl f64 { /// /// - `1.0` if the number is positive, `+0.0` or `INFINITY` /// - `-1.0` if the number is negative, `-0.0` or `NEG_INFINITY` - /// - `NAN` if the number is `NAN` + /// - NaN if the number is NaN /// /// # Examples /// @@ -184,8 +184,10 @@ impl f64 { /// `sign`. /// /// Equal to `self` if the sign of `self` and `sign` are the same, otherwise - /// equal to `-self`. If `self` is a `NAN`, then a `NAN` with the sign of - /// `sign` is returned. + /// equal to `-self`. If `self` is a NaN, then a NaN with the sign bit of + /// `sign` is returned. Note, however, that conserving the sign bit on NaN + /// across arithmetical operations is not generally guaranteed. + /// See [explanation of NaN as a special value](primitive@f32) for more info. /// /// # Examples /// @@ -298,7 +300,9 @@ impl f64 { /// Raises a number to an integer power. /// - /// Using this function is generally faster than using `powf` + /// Using this function is generally faster than using `powf`. + /// It might have a different sequence of rounding operations than `powf`, + /// so the results are not guaranteed to agree. /// /// # Examples /// @@ -513,15 +517,15 @@ impl f64 { #[must_use = "method returns a new number and does not mutate the original value"] #[stable(feature = "rust1", since = "1.0.0")] #[inline] - #[rustc_deprecated( + #[deprecated( since = "1.10.0", - reason = "you probably meant `(self - other).abs()`: \ - this operation is `(self - other).max(0.0)` \ - except that `abs_sub` also propagates NaNs (also \ - known as `fdim` in C). If you truly need the positive \ - difference, consider using that expression or the C function \ - `fdim`, depending on how you wish to handle NaN (please consider \ - filing an issue describing your use-case too)." + note = "you probably meant `(self - other).abs()`: \ + this operation is `(self - other).max(0.0)` \ + except that `abs_sub` also propagates NaNs (also \ + known as `fdim` in C). If you truly need the positive \ + difference, consider using that expression or the C function \ + `fdim`, depending on how you wish to handle NaN (please consider \ + filing an issue describing your use-case too)." )] pub fn abs_sub(self, other: f64) -> f64 { unsafe { cmath::fdim(self, other) } diff --git a/library/std/src/ffi/os_str.rs b/library/std/src/ffi/os_str.rs index dd316bdb2c6..9b5e5d6c0cc 100644 --- a/library/std/src/ffi/os_str.rs +++ b/library/std/src/ffi/os_str.rs @@ -1222,23 +1222,6 @@ impl OsStr { } } -#[unstable(feature = "slice_concat_ext", issue = "27747")] -impl<S: Borrow<OsStr>> alloc::slice::Join<&OsStr> for [S] { - type Output = OsString; - - fn join(slice: &Self, sep: &OsStr) -> OsString { - let Some(first) = slice.first() else { - return OsString::new(); - }; - let first = first.borrow().to_owned(); - slice[1..].iter().fold(first, |mut a, b| { - a.push(sep); - a.push(b.borrow()); - a - }) - } -} - #[stable(feature = "rust1", since = "1.0.0")] impl Borrow<OsStr> for OsString { #[inline] diff --git a/library/std/src/ffi/os_str/tests.rs b/library/std/src/ffi/os_str/tests.rs index d7926749aae..283f2b577e8 100644 --- a/library/std/src/ffi/os_str/tests.rs +++ b/library/std/src/ffi/os_str/tests.rs @@ -85,20 +85,6 @@ fn test_os_string_reserve_exact() { } #[test] -fn test_os_string_join() { - let strings = [OsStr::new("hello"), OsStr::new("dear"), OsStr::new("world")]; - assert_eq!("hello", strings[..1].join(OsStr::new(" "))); - assert_eq!("hello dear world", strings.join(OsStr::new(" "))); - assert_eq!("hellodearworld", strings.join(OsStr::new(""))); - assert_eq!("hello.\n dear.\n world", strings.join(OsStr::new(".\n "))); - - assert_eq!("dear world", strings[1..].join(&OsString::from(" "))); - - let strings_abc = [OsString::from("a"), OsString::from("b"), OsString::from("c")]; - assert_eq!("a b c", strings_abc.join(OsStr::new(" "))); -} - -#[test] fn test_os_string_default() { let os_string: OsString = Default::default(); assert_eq!("", &os_string); diff --git a/library/std/src/fs.rs b/library/std/src/fs.rs index 369a251696e..431a1efc8d1 100644 --- a/library/std/src/fs.rs +++ b/library/std/src/fs.rs @@ -1851,10 +1851,10 @@ pub fn hard_link<P: AsRef<Path>, Q: AsRef<Path>>(original: P, link: Q) -> io::Re /// } /// ``` #[stable(feature = "rust1", since = "1.0.0")] -#[rustc_deprecated( +#[deprecated( since = "1.1.0", - reason = "replaced with std::os::unix::fs::symlink and \ - std::os::windows::fs::{symlink_file, symlink_dir}" + note = "replaced with std::os::unix::fs::symlink and \ + std::os::windows::fs::{symlink_file, symlink_dir}" )] pub fn soft_link<P: AsRef<Path>, Q: AsRef<Path>>(original: P, link: Q) -> io::Result<()> { fs_imp::symlink(original.as_ref(), link.as_ref()) diff --git a/library/std/src/lib.rs b/library/std/src/lib.rs index c394865d886..8ee50925f85 100644 --- a/library/std/src/lib.rs +++ b/library/std/src/lib.rs @@ -241,7 +241,6 @@ #![feature(intra_doc_pointers)] #![feature(lang_items)] #![feature(let_chains)] -#![feature(let_else)] #![feature(linkage)] #![feature(min_specialization)] #![feature(must_not_suspend)] @@ -302,7 +301,6 @@ #![feature(toowned_clone_into)] #![feature(try_reserve_kind)] #![feature(vec_into_raw_parts)] -#![feature(slice_concat_trait)] // // Library features (unwind): #![feature(panic_unwind)] diff --git a/library/std/src/net/tcp.rs b/library/std/src/net/tcp.rs index f5d3c4905e0..06300035633 100644 --- a/library/std/src/net/tcp.rs +++ b/library/std/src/net/tcp.rs @@ -915,20 +915,14 @@ impl TcpListener { } #[stable(feature = "net2_mutators", since = "1.9.0")] - #[rustc_deprecated( - since = "1.16.0", - reason = "this option can only be set before the socket is bound" - )] + #[deprecated(since = "1.16.0", note = "this option can only be set before the socket is bound")] #[allow(missing_docs)] pub fn set_only_v6(&self, only_v6: bool) -> io::Result<()> { self.0.set_only_v6(only_v6) } #[stable(feature = "net2_mutators", since = "1.9.0")] - #[rustc_deprecated( - since = "1.16.0", - reason = "this option can only be set before the socket is bound" - )] + #[deprecated(since = "1.16.0", note = "this option can only be set before the socket is bound")] #[allow(missing_docs)] pub fn only_v6(&self) -> io::Result<bool> { self.0.only_v6() diff --git a/library/std/src/os/android/fs.rs b/library/std/src/os/android/fs.rs index 6aeef330dfa..1beb3cf6e84 100644 --- a/library/std/src/os/android/fs.rs +++ b/library/std/src/os/android/fs.rs @@ -18,10 +18,10 @@ pub trait MetadataExt { /// Unix platforms. The `os::unix::fs::MetadataExt` trait contains the /// cross-Unix abstractions contained within the raw stat. #[stable(feature = "metadata_ext", since = "1.1.0")] - #[rustc_deprecated( + #[deprecated( since = "1.8.0", - reason = "deprecated in favor of the accessor \ - methods of this trait" + note = "deprecated in favor of the accessor \ + methods of this trait" )] #[allow(deprecated)] fn as_raw_stat(&self) -> &raw::stat; diff --git a/library/std/src/os/android/raw.rs b/library/std/src/os/android/raw.rs index 2b8ade8a82e..a255d032086 100644 --- a/library/std/src/os/android/raw.rs +++ b/library/std/src/os/android/raw.rs @@ -1,12 +1,12 @@ //! Android-specific raw type definitions #![stable(feature = "raw_ext", since = "1.1.0")] -#![rustc_deprecated( +#![deprecated( since = "1.8.0", - reason = "these type aliases are no longer supported by \ - the standard library, the `libc` crate on \ - crates.io should be used instead for the correct \ - definitions" + note = "these type aliases are no longer supported by \ + the standard library, the `libc` crate on \ + crates.io should be used instead for the correct \ + definitions" )] #![allow(deprecated)] diff --git a/library/std/src/os/dragonfly/fs.rs b/library/std/src/os/dragonfly/fs.rs index e4c4e04cd30..1424fc4c698 100644 --- a/library/std/src/os/dragonfly/fs.rs +++ b/library/std/src/os/dragonfly/fs.rs @@ -18,10 +18,10 @@ pub trait MetadataExt { /// Unix platforms. The `os::unix::fs::MetadataExt` trait contains the /// cross-Unix abstractions contained within the raw stat. #[stable(feature = "metadata_ext", since = "1.1.0")] - #[rustc_deprecated( + #[deprecated( since = "1.8.0", - reason = "deprecated in favor of the accessor \ - methods of this trait" + note = "deprecated in favor of the accessor \ + methods of this trait" )] #[allow(deprecated)] fn as_raw_stat(&self) -> &raw::stat; diff --git a/library/std/src/os/dragonfly/raw.rs b/library/std/src/os/dragonfly/raw.rs index 2a2d2904372..071bf6199aa 100644 --- a/library/std/src/os/dragonfly/raw.rs +++ b/library/std/src/os/dragonfly/raw.rs @@ -1,12 +1,12 @@ //! Dragonfly-specific raw type definitions #![stable(feature = "raw_ext", since = "1.1.0")] -#![rustc_deprecated( +#![deprecated( since = "1.8.0", - reason = "these type aliases are no longer supported by \ - the standard library, the `libc` crate on \ - crates.io should be used instead for the correct \ - definitions" + note = "these type aliases are no longer supported by \ + the standard library, the `libc` crate on \ + crates.io should be used instead for the correct \ + definitions" )] #![allow(deprecated)] diff --git a/library/std/src/os/emscripten/fs.rs b/library/std/src/os/emscripten/fs.rs index d4f758a3457..d5ec8e03c00 100644 --- a/library/std/src/os/emscripten/fs.rs +++ b/library/std/src/os/emscripten/fs.rs @@ -18,10 +18,10 @@ pub trait MetadataExt { /// Unix platforms. The `os::unix::fs::MetadataExt` trait contains the /// cross-Unix abstractions contained within the raw stat. #[stable(feature = "metadata_ext", since = "1.1.0")] - #[rustc_deprecated( + #[deprecated( since = "1.8.0", - reason = "deprecated in favor of the accessor \ - methods of this trait" + note = "deprecated in favor of the accessor \ + methods of this trait" )] #[allow(deprecated)] fn as_raw_stat(&self) -> &raw::stat; diff --git a/library/std/src/os/emscripten/raw.rs b/library/std/src/os/emscripten/raw.rs index 503645c08ce..d23011c7381 100644 --- a/library/std/src/os/emscripten/raw.rs +++ b/library/std/src/os/emscripten/raw.rs @@ -3,12 +3,12 @@ //! except using the musl-specific stat64 structure in liblibc. #![stable(feature = "raw_ext", since = "1.1.0")] -#![rustc_deprecated( +#![deprecated( since = "1.8.0", - reason = "these type aliases are no longer supported by \ - the standard library, the `libc` crate on \ - crates.io should be used instead for the correct \ - definitions" + note = "these type aliases are no longer supported by \ + the standard library, the `libc` crate on \ + crates.io should be used instead for the correct \ + definitions" )] #![allow(deprecated)] diff --git a/library/std/src/os/espidf/fs.rs b/library/std/src/os/espidf/fs.rs index 93dc2c0cab7..88701dafe20 100644 --- a/library/std/src/os/espidf/fs.rs +++ b/library/std/src/os/espidf/fs.rs @@ -12,10 +12,10 @@ use crate::os::espidf::raw; #[stable(feature = "metadata_ext", since = "1.1.0")] pub trait MetadataExt { #[stable(feature = "metadata_ext", since = "1.1.0")] - #[rustc_deprecated( + #[deprecated( since = "1.8.0", - reason = "deprecated in favor of the accessor \ - methods of this trait" + note = "deprecated in favor of the accessor \ + methods of this trait" )] #[allow(deprecated)] fn as_raw_stat(&self) -> &raw::stat; diff --git a/library/std/src/os/espidf/raw.rs b/library/std/src/os/espidf/raw.rs index fb18ec6f6f8..7df0e74b223 100644 --- a/library/std/src/os/espidf/raw.rs +++ b/library/std/src/os/espidf/raw.rs @@ -1,12 +1,12 @@ //! Raw type definitions for the ESP-IDF framework. #![stable(feature = "raw_ext", since = "1.1.0")] -#![rustc_deprecated( +#![deprecated( since = "1.8.0", - reason = "these type aliases are no longer supported by \ - the standard library, the `libc` crate on \ - crates.io should be used instead for the correct \ - definitions" + note = "these type aliases are no longer supported by \ + the standard library, the `libc` crate on \ + crates.io should be used instead for the correct \ + definitions" )] use crate::os::raw::c_long; diff --git a/library/std/src/os/freebsd/fs.rs b/library/std/src/os/freebsd/fs.rs index 1eda8690d5d..8db3a950c40 100644 --- a/library/std/src/os/freebsd/fs.rs +++ b/library/std/src/os/freebsd/fs.rs @@ -18,10 +18,10 @@ pub trait MetadataExt { /// Unix platforms. The `os::unix::fs::MetadataExt` trait contains the /// cross-Unix abstractions contained within the raw stat. #[stable(feature = "metadata_ext", since = "1.1.0")] - #[rustc_deprecated( + #[deprecated( since = "1.8.0", - reason = "deprecated in favor of the accessor \ - methods of this trait" + note = "deprecated in favor of the accessor \ + methods of this trait" )] #[allow(deprecated)] fn as_raw_stat(&self) -> &raw::stat; diff --git a/library/std/src/os/freebsd/raw.rs b/library/std/src/os/freebsd/raw.rs index aeae08fc6aa..ab0bf792319 100644 --- a/library/std/src/os/freebsd/raw.rs +++ b/library/std/src/os/freebsd/raw.rs @@ -1,12 +1,12 @@ //! FreeBSD-specific raw type definitions #![stable(feature = "raw_ext", since = "1.1.0")] -#![rustc_deprecated( +#![deprecated( since = "1.8.0", - reason = "these type aliases are no longer supported by \ - the standard library, the `libc` crate on \ - crates.io should be used instead for the correct \ - definitions" + note = "these type aliases are no longer supported by \ + the standard library, the `libc` crate on \ + crates.io should be used instead for the correct \ + definitions" )] #![allow(deprecated)] diff --git a/library/std/src/os/fuchsia/raw.rs b/library/std/src/os/fuchsia/raw.rs index f94659cd5ba..060d6e86b6c 100644 --- a/library/std/src/os/fuchsia/raw.rs +++ b/library/std/src/os/fuchsia/raw.rs @@ -1,12 +1,12 @@ //! Fuchsia-specific raw type definitions #![stable(feature = "raw_ext", since = "1.1.0")] -#![rustc_deprecated( +#![deprecated( since = "1.8.0", - reason = "these type aliases are no longer supported by \ - the standard library, the `libc` crate on \ - crates.io should be used instead for the correct \ - definitions" + note = "these type aliases are no longer supported by \ + the standard library, the `libc` crate on \ + crates.io should be used instead for the correct \ + definitions" )] #![allow(deprecated)] diff --git a/library/std/src/os/haiku/fs.rs b/library/std/src/os/haiku/fs.rs index 28015f62526..a23a2af8f6e 100644 --- a/library/std/src/os/haiku/fs.rs +++ b/library/std/src/os/haiku/fs.rs @@ -18,10 +18,10 @@ pub trait MetadataExt { /// Unix platforms. The `os::unix::fs::MetadataExt` trait contains the /// cross-Unix abstractions contained within the raw stat. #[stable(feature = "metadata_ext", since = "1.1.0")] - #[rustc_deprecated( + #[deprecated( since = "1.8.0", - reason = "deprecated in favor of the accessor \ - methods of this trait" + note = "deprecated in favor of the accessor \ + methods of this trait" )] #[allow(deprecated)] fn as_raw_stat(&self) -> &raw::stat; diff --git a/library/std/src/os/haiku/raw.rs b/library/std/src/os/haiku/raw.rs index 48117d288ae..afbb66ccb5e 100644 --- a/library/std/src/os/haiku/raw.rs +++ b/library/std/src/os/haiku/raw.rs @@ -1,12 +1,12 @@ //! Haiku-specific raw type definitions #![stable(feature = "raw_ext", since = "1.1.0")] -#![rustc_deprecated( +#![deprecated( since = "1.53.0", - reason = "these type aliases are no longer supported by \ - the standard library, the `libc` crate on \ - crates.io should be used instead for the correct \ - definitions" + note = "these type aliases are no longer supported by \ + the standard library, the `libc` crate on \ + crates.io should be used instead for the correct \ + definitions" )] #![allow(deprecated)] diff --git a/library/std/src/os/illumos/fs.rs b/library/std/src/os/illumos/fs.rs index 021d154ff5a..63be48b8131 100644 --- a/library/std/src/os/illumos/fs.rs +++ b/library/std/src/os/illumos/fs.rs @@ -18,9 +18,9 @@ pub trait MetadataExt { /// Unix platforms. The `os::unix::fs::MetadataExt` trait contains the /// cross-Unix abstractions contained within the raw stat. #[stable(feature = "metadata_ext", since = "1.1.0")] - #[rustc_deprecated( + #[deprecated( since = "1.8.0", - reason = "deprecated in favor of the accessor methods of this trait" + note = "deprecated in favor of the accessor methods of this trait" )] #[allow(deprecated)] fn as_raw_stat(&self) -> &raw::stat; diff --git a/library/std/src/os/illumos/raw.rs b/library/std/src/os/illumos/raw.rs index 88c832ae7c7..2bea9ebb3c8 100644 --- a/library/std/src/os/illumos/raw.rs +++ b/library/std/src/os/illumos/raw.rs @@ -1,9 +1,9 @@ //! illumos-specific raw type definitions #![stable(feature = "raw_ext", since = "1.1.0")] -#![rustc_deprecated( +#![deprecated( since = "1.8.0", - reason = "these type aliases are no longer supported by the standard library, the `libc` \ + note = "these type aliases are no longer supported by the standard library, the `libc` \ crate on crates.io should be used instead for the correct definitions" )] #![allow(deprecated)] diff --git a/library/std/src/os/ios/fs.rs b/library/std/src/os/ios/fs.rs index 2c5e38a803d..4a4637ce072 100644 --- a/library/std/src/os/ios/fs.rs +++ b/library/std/src/os/ios/fs.rs @@ -18,10 +18,10 @@ pub trait MetadataExt { /// Unix platforms. The `os::unix::fs::MetadataExt` trait contains the /// cross-Unix abstractions contained within the raw stat. #[stable(feature = "metadata_ext", since = "1.1.0")] - #[rustc_deprecated( + #[deprecated( since = "1.8.0", - reason = "deprecated in favor of the accessor \ - methods of this trait" + note = "deprecated in favor of the accessor \ + methods of this trait" )] #[allow(deprecated)] fn as_raw_stat(&self) -> &raw::stat; diff --git a/library/std/src/os/ios/raw.rs b/library/std/src/os/ios/raw.rs index 97b0a96b0f1..af12aeebe5d 100644 --- a/library/std/src/os/ios/raw.rs +++ b/library/std/src/os/ios/raw.rs @@ -1,12 +1,12 @@ //! iOS-specific raw type definitions #![stable(feature = "raw_ext", since = "1.1.0")] -#![rustc_deprecated( +#![deprecated( since = "1.8.0", - reason = "these type aliases are no longer supported by \ - the standard library, the `libc` crate on \ - crates.io should be used instead for the correct \ - definitions" + note = "these type aliases are no longer supported by \ + the standard library, the `libc` crate on \ + crates.io should be used instead for the correct \ + definitions" )] #![allow(deprecated)] diff --git a/library/std/src/os/l4re/fs.rs b/library/std/src/os/l4re/fs.rs index b9b6918292f..6d6a535b1e8 100644 --- a/library/std/src/os/l4re/fs.rs +++ b/library/std/src/os/l4re/fs.rs @@ -38,7 +38,7 @@ pub trait MetadataExt { /// } /// ``` #[stable(feature = "metadata_ext", since = "1.1.0")] - #[rustc_deprecated(since = "1.8.0", reason = "other methods of this trait are now preferred")] + #[deprecated(since = "1.8.0", note = "other methods of this trait are now preferred")] #[allow(deprecated)] fn as_raw_stat(&self) -> &raw::stat; diff --git a/library/std/src/os/l4re/raw.rs b/library/std/src/os/l4re/raw.rs index 5efd6301fc9..699e8be33c8 100644 --- a/library/std/src/os/l4re/raw.rs +++ b/library/std/src/os/l4re/raw.rs @@ -1,12 +1,12 @@ //! L4Re-specific raw type definitions. #![stable(feature = "raw_ext", since = "1.1.0")] -#![rustc_deprecated( +#![deprecated( since = "1.8.0", - reason = "these type aliases are no longer supported by \ - the standard library, the `libc` crate on \ - crates.io should be used instead for the correct \ - definitions" + note = "these type aliases are no longer supported by \ + the standard library, the `libc` crate on \ + crates.io should be used instead for the correct \ + definitions" )] #![allow(deprecated)] diff --git a/library/std/src/os/linux/fs.rs b/library/std/src/os/linux/fs.rs index 23267c44685..479bbcc17a8 100644 --- a/library/std/src/os/linux/fs.rs +++ b/library/std/src/os/linux/fs.rs @@ -38,7 +38,7 @@ pub trait MetadataExt { /// } /// ``` #[stable(feature = "metadata_ext", since = "1.1.0")] - #[rustc_deprecated(since = "1.8.0", reason = "other methods of this trait are now preferred")] + #[deprecated(since = "1.8.0", note = "other methods of this trait are now preferred")] #[allow(deprecated)] fn as_raw_stat(&self) -> &raw::stat; diff --git a/library/std/src/os/linux/raw.rs b/library/std/src/os/linux/raw.rs index d78049bce24..c73791d1452 100644 --- a/library/std/src/os/linux/raw.rs +++ b/library/std/src/os/linux/raw.rs @@ -1,12 +1,12 @@ //! Linux-specific raw type definitions. #![stable(feature = "raw_ext", since = "1.1.0")] -#![rustc_deprecated( +#![deprecated( since = "1.8.0", - reason = "these type aliases are no longer supported by \ - the standard library, the `libc` crate on \ - crates.io should be used instead for the correct \ - definitions" + note = "these type aliases are no longer supported by \ + the standard library, the `libc` crate on \ + crates.io should be used instead for the correct \ + definitions" )] #![allow(deprecated)] diff --git a/library/std/src/os/macos/fs.rs b/library/std/src/os/macos/fs.rs index 4152c352936..91915da6a43 100644 --- a/library/std/src/os/macos/fs.rs +++ b/library/std/src/os/macos/fs.rs @@ -18,10 +18,10 @@ pub trait MetadataExt { /// Unix platforms. The `os::unix::fs::MetadataExt` trait contains the /// cross-Unix abstractions contained within the raw stat. #[stable(feature = "metadata_ext", since = "1.1.0")] - #[rustc_deprecated( + #[deprecated( since = "1.8.0", - reason = "deprecated in favor of the accessor \ - methods of this trait" + note = "deprecated in favor of the accessor \ + methods of this trait" )] #[allow(deprecated)] fn as_raw_stat(&self) -> &raw::stat; diff --git a/library/std/src/os/macos/raw.rs b/library/std/src/os/macos/raw.rs index 708261d86bd..0b21f6ee5e4 100644 --- a/library/std/src/os/macos/raw.rs +++ b/library/std/src/os/macos/raw.rs @@ -1,12 +1,12 @@ //! macOS-specific raw type definitions #![stable(feature = "raw_ext", since = "1.1.0")] -#![rustc_deprecated( +#![deprecated( since = "1.8.0", - reason = "these type aliases are no longer supported by \ - the standard library, the `libc` crate on \ - crates.io should be used instead for the correct \ - definitions" + note = "these type aliases are no longer supported by \ + the standard library, the `libc` crate on \ + crates.io should be used instead for the correct \ + definitions" )] #![allow(deprecated)] diff --git a/library/std/src/os/netbsd/fs.rs b/library/std/src/os/netbsd/fs.rs index 6b29a40d2b5..fe0be069e5e 100644 --- a/library/std/src/os/netbsd/fs.rs +++ b/library/std/src/os/netbsd/fs.rs @@ -18,10 +18,10 @@ pub trait MetadataExt { /// Unix platforms. The `os::unix::fs::MetadataExt` trait contains the /// cross-Unix abstractions contained within the raw stat. #[stable(feature = "metadata_ext", since = "1.1.0")] - #[rustc_deprecated( + #[deprecated( since = "1.8.0", - reason = "deprecated in favor of the accessor \ - methods of this trait" + note = "deprecated in favor of the accessor \ + methods of this trait" )] #[allow(deprecated)] fn as_raw_stat(&self) -> &raw::stat; diff --git a/library/std/src/os/netbsd/raw.rs b/library/std/src/os/netbsd/raw.rs index 475fcdcc4aa..18057291fee 100644 --- a/library/std/src/os/netbsd/raw.rs +++ b/library/std/src/os/netbsd/raw.rs @@ -1,12 +1,12 @@ //! NetBSD-specific raw type definitions #![stable(feature = "raw_ext", since = "1.1.0")] -#![rustc_deprecated( +#![deprecated( since = "1.8.0", - reason = "these type aliases are no longer supported by \ - the standard library, the `libc` crate on \ - crates.io should be used instead for the correct \ - definitions" + note = "these type aliases are no longer supported by \ + the standard library, the `libc` crate on \ + crates.io should be used instead for the correct \ + definitions" )] #![allow(deprecated)] diff --git a/library/std/src/os/openbsd/fs.rs b/library/std/src/os/openbsd/fs.rs index 3143dc95fdf..b8d8d31c5b8 100644 --- a/library/std/src/os/openbsd/fs.rs +++ b/library/std/src/os/openbsd/fs.rs @@ -18,10 +18,10 @@ pub trait MetadataExt { /// Unix platforms. The `os::unix::fs::MetadataExt` trait contains the /// cross-Unix abstractions contained within the raw stat. #[stable(feature = "metadata_ext", since = "1.1.0")] - #[rustc_deprecated( + #[deprecated( since = "1.8.0", - reason = "deprecated in favor of the accessor \ - methods of this trait" + note = "deprecated in favor of the accessor \ + methods of this trait" )] #[allow(deprecated)] fn as_raw_stat(&self) -> &raw::stat; diff --git a/library/std/src/os/openbsd/raw.rs b/library/std/src/os/openbsd/raw.rs index 8e34e5483b7..6711fb51b17 100644 --- a/library/std/src/os/openbsd/raw.rs +++ b/library/std/src/os/openbsd/raw.rs @@ -1,12 +1,12 @@ //! OpenBSD-specific raw type definitions #![stable(feature = "raw_ext", since = "1.1.0")] -#![rustc_deprecated( +#![deprecated( since = "1.8.0", - reason = "these type aliases are no longer supported by \ - the standard library, the `libc` crate on \ - crates.io should be used instead for the correct \ - definitions" + note = "these type aliases are no longer supported by \ + the standard library, the `libc` crate on \ + crates.io should be used instead for the correct \ + definitions" )] #![allow(deprecated)] diff --git a/library/std/src/os/redox/fs.rs b/library/std/src/os/redox/fs.rs index 0f179c8b837..682ca6a2c03 100644 --- a/library/std/src/os/redox/fs.rs +++ b/library/std/src/os/redox/fs.rs @@ -34,10 +34,10 @@ pub trait MetadataExt { /// } /// ``` #[stable(feature = "metadata_ext", since = "1.1.0")] - #[rustc_deprecated( + #[deprecated( since = "1.8.0", - reason = "deprecated in favor of the accessor \ - methods of this trait" + note = "deprecated in favor of the accessor \ + methods of this trait" )] #[allow(deprecated)] fn as_raw_stat(&self) -> &raw::stat; diff --git a/library/std/src/os/redox/raw.rs b/library/std/src/os/redox/raw.rs index 9a6b99684c5..7b1cd8ae800 100644 --- a/library/std/src/os/redox/raw.rs +++ b/library/std/src/os/redox/raw.rs @@ -1,12 +1,12 @@ //! Redox-specific raw type definitions #![stable(feature = "raw_ext", since = "1.1.0")] -#![rustc_deprecated( +#![deprecated( since = "1.8.0", - reason = "these type aliases are no longer supported by \ - the standard library, the `libc` crate on \ - crates.io should be used instead for the correct \ - definitions" + note = "these type aliases are no longer supported by \ + the standard library, the `libc` crate on \ + crates.io should be used instead for the correct \ + definitions" )] #![allow(deprecated)] diff --git a/library/std/src/os/solaris/fs.rs b/library/std/src/os/solaris/fs.rs index 908c5c38a84..09314373704 100644 --- a/library/std/src/os/solaris/fs.rs +++ b/library/std/src/os/solaris/fs.rs @@ -18,10 +18,10 @@ pub trait MetadataExt { /// Unix platforms. The `os::unix::fs::MetadataExt` trait contains the /// cross-Unix abstractions contained within the raw stat. #[stable(feature = "metadata_ext", since = "1.1.0")] - #[rustc_deprecated( + #[deprecated( since = "1.8.0", - reason = "deprecated in favor of the accessor \ - methods of this trait" + note = "deprecated in favor of the accessor \ + methods of this trait" )] #[allow(deprecated)] fn as_raw_stat(&self) -> &raw::stat; diff --git a/library/std/src/os/solaris/raw.rs b/library/std/src/os/solaris/raw.rs index e78f9992bb3..63426c96951 100644 --- a/library/std/src/os/solaris/raw.rs +++ b/library/std/src/os/solaris/raw.rs @@ -1,12 +1,12 @@ //! Solaris-specific raw type definitions #![stable(feature = "raw_ext", since = "1.1.0")] -#![rustc_deprecated( +#![deprecated( since = "1.8.0", - reason = "these type aliases are no longer supported by \ - the standard library, the `libc` crate on \ - crates.io should be used instead for the correct \ - definitions" + note = "these type aliases are no longer supported by \ + the standard library, the `libc` crate on \ + crates.io should be used instead for the correct \ + definitions" )] #![allow(deprecated)] diff --git a/library/std/src/os/unix/process.rs b/library/std/src/os/unix/process.rs index 9a6778c0e86..9dca9b4a4a3 100644 --- a/library/std/src/os/unix/process.rs +++ b/library/std/src/os/unix/process.rs @@ -103,7 +103,7 @@ pub trait CommandExt: Sealed { /// /// [`pre_exec`]: CommandExt::pre_exec #[stable(feature = "process_exec", since = "1.15.0")] - #[rustc_deprecated(since = "1.37.0", reason = "should be unsafe, use `pre_exec` instead")] + #[deprecated(since = "1.37.0", note = "should be unsafe, use `pre_exec` instead")] fn before_exec<F>(&mut self, f: F) -> &mut process::Command where F: FnMut() -> io::Result<()> + Send + Sync + 'static, diff --git a/library/std/src/os/unix/raw.rs b/library/std/src/os/unix/raw.rs index c292955cb4e..fe761627bc1 100644 --- a/library/std/src/os/unix/raw.rs +++ b/library/std/src/os/unix/raw.rs @@ -1,12 +1,12 @@ //! Unix-specific primitives available on all unix platforms. #![stable(feature = "raw_ext", since = "1.1.0")] -#![rustc_deprecated( +#![deprecated( since = "1.8.0", - reason = "these type aliases are no longer supported by \ - the standard library, the `libc` crate on \ - crates.io should be used instead for the correct \ - definitions" + note = "these type aliases are no longer supported by \ + the standard library, the `libc` crate on \ + crates.io should be used instead for the correct \ + definitions" )] #![allow(deprecated)] diff --git a/library/std/src/primitive_docs.rs b/library/std/src/primitive_docs.rs index 225a679efd2..ac4e668112b 100644 --- a/library/std/src/primitive_docs.rs +++ b/library/std/src/primitive_docs.rs @@ -977,10 +977,22 @@ mod prim_tuple {} /// like `1.0 / 0.0`. /// - [NaN (not a number)](#associatedconstant.NAN): this value results from /// calculations like `(-1.0).sqrt()`. NaN has some potentially unexpected -/// behavior: it is unequal to any float, including itself! It is also neither -/// smaller nor greater than any float, making it impossible to sort. Lastly, -/// it is considered infectious as almost all calculations where one of the -/// operands is NaN will also result in NaN. +/// behavior: +/// - It is unequal to any float, including itself! This is the reason `f32` +/// doesn't implement the `Eq` trait. +/// - It is also neither smaller nor greater than any float, making it +/// impossible to sort by the default comparison operation, which is the +/// reason `f32` doesn't implement the `Ord` trait. +/// - It is also considered *infectious* as almost all calculations where one +/// of the operands is NaN will also result in NaN. The explanations on this +/// page only explicitly document behavior on NaN operands if this default +/// is deviated from. +/// - Lastly, there are multiple bit patterns that are considered NaN. +/// Rust does not currently guarantee that the bit patterns of NaN are +/// preserved over arithmetic operations, and they are not guaranteed to be +/// portable or even fully deterministic! This means that there may be some +/// surprising results upon inspecting the bit patterns, +/// as the same calculations might produce NaNs with different bit patterns. /// /// For more information on floating point numbers, see [Wikipedia][wikipedia]. /// diff --git a/library/std/src/sync/condvar.rs b/library/std/src/sync/condvar.rs index b41918ec1cf..7ff2f330f8a 100644 --- a/library/std/src/sync/condvar.rs +++ b/library/std/src/sync/condvar.rs @@ -303,7 +303,7 @@ impl Condvar { /// } /// ``` #[stable(feature = "rust1", since = "1.0.0")] - #[rustc_deprecated(since = "1.6.0", reason = "replaced by `std::sync::Condvar::wait_timeout`")] + #[deprecated(since = "1.6.0", note = "replaced by `std::sync::Condvar::wait_timeout`")] pub fn wait_timeout_ms<'a, T>( &self, guard: MutexGuard<'a, T>, diff --git a/library/std/src/sync/once.rs b/library/std/src/sync/once.rs index d2dd4c075d2..a7feea58859 100644 --- a/library/std/src/sync/once.rs +++ b/library/std/src/sync/once.rs @@ -152,9 +152,9 @@ pub struct OnceState { /// static START: Once = ONCE_INIT; /// ``` #[stable(feature = "rust1", since = "1.0.0")] -#[rustc_deprecated( +#[deprecated( since = "1.38.0", - reason = "the `new` function is now preferred", + note = "the `new` function is now preferred", suggestion = "Once::new()" )] pub const ONCE_INIT: Once = Once::new(); diff --git a/library/std/src/thread/mod.rs b/library/std/src/thread/mod.rs index b4b1037a3cd..7f9b297e9dc 100644 --- a/library/std/src/thread/mod.rs +++ b/library/std/src/thread/mod.rs @@ -789,7 +789,7 @@ pub fn panicking() -> bool { /// thread::sleep_ms(2000); /// ``` #[stable(feature = "rust1", since = "1.0.0")] -#[rustc_deprecated(since = "1.6.0", reason = "replaced by `std::thread::sleep`")] +#[deprecated(since = "1.6.0", note = "replaced by `std::thread::sleep`")] pub fn sleep_ms(ms: u32) { sleep(Duration::from_millis(ms as u64)) } @@ -943,7 +943,7 @@ pub fn park() { /// /// See the [park documentation][`park`] for more detail. #[stable(feature = "rust1", since = "1.0.0")] -#[rustc_deprecated(since = "1.6.0", reason = "replaced by `std::thread::park_timeout`")] +#[deprecated(since = "1.6.0", note = "replaced by `std::thread::park_timeout`")] pub fn park_timeout_ms(ms: u32) { park_timeout(Duration::from_millis(ms as u64)) } |