diff options
| author | bors <bors@rust-lang.org> | 2019-08-14 20:49:07 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2019-08-14 20:49:07 +0000 |
| commit | 082cf2f9d136166cd1d552d3fb5abb1c46c99a14 (patch) | |
| tree | 6ef4da1d58e6bd5dde9b627629ab4e837d079469 /src/libstd/lib.rs | |
| parent | c43d03a19f326f4a323569328cc501e86eb6d22e (diff) | |
| parent | f7ff36dcb27b48329e9b1c12f5b78d469fafc067 (diff) | |
| download | rust-082cf2f9d136166cd1d552d3fb5abb1c46c99a14.tar.gz rust-082cf2f9d136166cd1d552d3fb5abb1c46c99a14.zip | |
Auto merge of #63534 - Mark-Simulacrum:stage0-bump, r=Centril
Bump to 1.39 r? @Centril
Diffstat (limited to 'src/libstd/lib.rs')
| -rw-r--r-- | src/libstd/lib.rs | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/src/libstd/lib.rs b/src/libstd/lib.rs index ba80d1b7004..1f48315d3f8 100644 --- a/src/libstd/lib.rs +++ b/src/libstd/lib.rs @@ -228,7 +228,7 @@ // std is implemented with unstable features, many of which are internal // compiler details that will never be stable // NB: the following list is sorted to minimize merge conflicts. -#![cfg_attr(not(bootstrap), feature(__rust_unstable_column))] +#![feature(__rust_unstable_column)] #![feature(alloc_error_handler)] #![feature(alloc_layout_extra)] #![feature(allocator_api)] @@ -513,7 +513,7 @@ pub use std_detect::detect; // Re-export macros defined in libcore. #[stable(feature = "rust1", since = "1.0.0")] -#[allow(deprecated_in_future)] +#[allow(deprecated, deprecated_in_future)] pub use core::{ // Stable assert_eq, @@ -531,7 +531,6 @@ pub use core::{ }; // Re-export built-in macros defined through libcore. -#[cfg(not(bootstrap))] #[stable(feature = "builtin_macro_prelude", since = "1.38.0")] pub use core::{ // Stable |