diff options
| author | bors <bors@rust-lang.org> | 2019-02-28 11:38:40 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2019-02-28 11:38:40 +0000 |
| commit | 190feb65290d39d7ab6d44e994bd99188d339f16 (patch) | |
| tree | 0dc440124b61d17495c4b8e4e680b38cd7b0fa13 /src/libstd/lib.rs | |
| parent | 7e001e5c6c7c090b41416a57d4be412ed3ccd937 (diff) | |
| parent | aad9e29f52988c55cd8cee2bd181a2e3c9d436a4 (diff) | |
| download | rust-190feb65290d39d7ab6d44e994bd99188d339f16.tar.gz rust-190feb65290d39d7ab6d44e994bd99188d339f16.zip | |
Auto merge of #58208 - taiki-e:libstd-2018, r=Centril
libstd => 2018 Transitions `libstd` to Rust 2018; cc #58099 r? @Centril
Diffstat (limited to 'src/libstd/lib.rs')
| -rw-r--r-- | src/libstd/lib.rs | 15 |
1 files changed, 6 insertions, 9 deletions
diff --git a/src/libstd/lib.rs b/src/libstd/lib.rs index ff72704bfbf..32a168619df 100644 --- a/src/libstd/lib.rs +++ b/src/libstd/lib.rs @@ -209,6 +209,10 @@ #![deny(intra_doc_link_resolution_failure)] #![deny(missing_debug_implementations)] +#![deny(rust_2018_idioms)] +#![allow(explicit_outlives_requirements)] +#![allow(elided_lifetimes_in_paths)] + // Tell the compiler to link to either panic_abort or panic_unwind #![needs_panic_runtime] @@ -313,29 +317,25 @@ use prelude::v1::*; // Access to Bencher, etc. #[cfg(test)] extern crate test; -#[cfg(test)] extern crate rand; // Re-export a few macros from core #[stable(feature = "rust1", since = "1.0.0")] pub use core::{assert_eq, assert_ne, debug_assert, debug_assert_eq, debug_assert_ne}; #[stable(feature = "rust1", since = "1.0.0")] -pub use core::{unreachable, unimplemented, write, writeln, try}; +pub use core::{unreachable, unimplemented, write, writeln, r#try}; #[allow(unused_imports)] // macros from `alloc` are not used on all platforms #[macro_use] extern crate alloc as alloc_crate; #[doc(masked)] +#[allow(unused_extern_crates)] extern crate libc; -extern crate rustc_demangle; // We always need an unwinder currently for backtraces #[doc(masked)] #[allow(unused_extern_crates)] extern crate unwind; -#[cfg(feature = "backtrace")] -extern crate backtrace_sys; - // During testing, this crate is not actually the "real" std library, but rather // it links to the real std library, which was compiled from this same source // code. So any lang items std defines are conditionally excluded (or else they @@ -344,9 +344,6 @@ extern crate backtrace_sys; // testing gives test-std access to real-std lang items and globals. See #2912 #[cfg(test)] extern crate std as realstd; -#[cfg(all(target_vendor = "fortanix", target_env = "sgx"))] -extern crate fortanix_sgx_abi; - // The standard macros that are not built-in to the compiler. #[macro_use] mod macros; |
