diff options
| author | Alex Crichton <alex@alexcrichton.com> | 2018-12-05 06:42:56 -0800 |
|---|---|---|
| committer | Alex Crichton <alex@alexcrichton.com> | 2018-12-12 08:09:26 -0800 |
| commit | cf47a19305d929d1870414dd6911ca3191597668 (patch) | |
| tree | be90f3c8c33f5276f5159794db0e038b7592cdf0 /src/libstd | |
| parent | bd47d6825bf4090517549d33cfef10d3300b4a75 (diff) | |
| download | rust-cf47a19305d929d1870414dd6911ca3191597668.tar.gz rust-cf47a19305d929d1870414dd6911ca3191597668.zip | |
Bump to 1.33.0
* Update bootstrap compiler * Update version to 1.33.0 * Remove some `#[cfg(stage0)]` annotations Actually updating the version number is blocked on updating Cargo
Diffstat (limited to 'src/libstd')
| -rw-r--r-- | src/libstd/error.rs | 1 | ||||
| -rw-r--r-- | src/libstd/ffi/mod.rs | 1 | ||||
| -rw-r--r-- | src/libstd/io/error.rs | 1 | ||||
| -rw-r--r-- | src/libstd/lib.rs | 4 | ||||
| -rw-r--r-- | src/libstd/panic.rs | 4 | ||||
| -rw-r--r-- | src/libstd/sys/windows/os.rs | 2 |
6 files changed, 5 insertions, 8 deletions
diff --git a/src/libstd/error.rs b/src/libstd/error.rs index a9b27115261..e5c5ab83cbc 100644 --- a/src/libstd/error.rs +++ b/src/libstd/error.rs @@ -533,6 +533,7 @@ impl<T: Error> Error for Box<T> { Error::description(&**self) } + #[allow(deprecated)] fn cause(&self) -> Option<&dyn Error> { Error::cause(&**self) } diff --git a/src/libstd/ffi/mod.rs b/src/libstd/ffi/mod.rs index 99da73adc63..f46c4f2938b 100644 --- a/src/libstd/ffi/mod.rs +++ b/src/libstd/ffi/mod.rs @@ -174,7 +174,6 @@ pub use self::os_str::{OsString, OsStr}; #[stable(feature = "raw_os", since = "1.1.0")] pub use core::ffi::c_void; -#[cfg(not(stage0))] #[unstable(feature = "c_variadic", reason = "the `c_variadic` feature has not been properly tested on \ all supported platforms", diff --git a/src/libstd/io/error.rs b/src/libstd/io/error.rs index 32e29962760..d3844ebe19e 100644 --- a/src/libstd/io/error.rs +++ b/src/libstd/io/error.rs @@ -555,6 +555,7 @@ impl error::Error for Error { } } + #[allow(deprecated)] fn cause(&self) -> Option<&dyn error::Error> { match self.repr { Repr::Os(..) => None, diff --git a/src/libstd/lib.rs b/src/libstd/lib.rs index 90c8eaf0f7c..7c43ba5afa7 100644 --- a/src/libstd/lib.rs +++ b/src/libstd/lib.rs @@ -317,10 +317,6 @@ #![default_lib_allocator] -#[cfg(stage0)] -#[global_allocator] -static ALLOC: alloc::System = alloc::System; - // Explicitly import the prelude. The compiler uses this same unstable attribute // to import the prelude implicitly when building crates that depend on std. #[prelude_import] diff --git a/src/libstd/panic.rs b/src/libstd/panic.rs index 099b4d6f577..3eacc7afc41 100644 --- a/src/libstd/panic.rs +++ b/src/libstd/panic.rs @@ -264,7 +264,7 @@ impl RefUnwindSafe for atomic::AtomicI32 {} #[cfg(target_has_atomic = "64")] #[unstable(feature = "integer_atomics", issue = "32976")] impl RefUnwindSafe for atomic::AtomicI64 {} -#[cfg(all(not(stage0), target_has_atomic = "128"))] +#[cfg(target_has_atomic = "128")] #[unstable(feature = "integer_atomics", issue = "32976")] impl RefUnwindSafe for atomic::AtomicI128 {} @@ -283,7 +283,7 @@ impl RefUnwindSafe for atomic::AtomicU32 {} #[cfg(target_has_atomic = "64")] #[unstable(feature = "integer_atomics", issue = "32976")] impl RefUnwindSafe for atomic::AtomicU64 {} -#[cfg(all(not(stage0), target_has_atomic = "128"))] +#[cfg(target_has_atomic = "128")] #[unstable(feature = "integer_atomics", issue = "32976")] impl RefUnwindSafe for atomic::AtomicU128 {} diff --git a/src/libstd/sys/windows/os.rs b/src/libstd/sys/windows/os.rs index 2be30e68d24..84ef62e5fe9 100644 --- a/src/libstd/sys/windows/os.rs +++ b/src/libstd/sys/windows/os.rs @@ -76,7 +76,7 @@ pub fn error_string(mut errnum: i32) -> String { match String::from_utf16(&buf[..res]) { Ok(mut msg) => { // Trim trailing CRLF inserted by FormatMessageW - let len = msg.trim_right().len(); + let len = msg.trim_end().len(); msg.truncate(len); msg }, |