diff options
| author | bors <bors@rust-lang.org> | 2019-08-01 11:07:26 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2019-08-01 11:07:26 +0000 |
| commit | f23a5f208de7fba983bfaaa8d60f1208d5780a98 (patch) | |
| tree | 7bbe402729300474128162596336986fee874dd8 /src/libstd | |
| parent | a17951c4f80eb5208030f91fdb4ae93919fa6b12 (diff) | |
| parent | ef7ef05e8ee29ccf4c225b1ad1cd3772ace8d660 (diff) | |
| download | rust-f23a5f208de7fba983bfaaa8d60f1208d5780a98.tar.gz rust-f23a5f208de7fba983bfaaa8d60f1208d5780a98.zip | |
Auto merge of #62507 - petrochenkov:macunstab, r=alexcrichton
Remove derives `Encodable`/`Decodable` and unstabilize attribute `#[bench]` `Encodable` and `Decodable` were deprecated before 1.0 and emitted an unsuppressable warning all this time. `#[bench]` is a part of the custom test framework feature and cannot be used meaningfully on stable, only as `cfg(false)`. Crater results can be found in https://github.com/rust-lang/rust/pull/62507#issuecomment-513850732 and below. This PR also reroutes the tracking issue for `feature(test)` from #27812 (compiler internals) to #50297 (custom test frameworks). Closes https://github.com/rust-lang/rust/issues/62048
Diffstat (limited to 'src/libstd')
| -rw-r--r-- | src/libstd/lib.rs | 3 | ||||
| -rw-r--r-- | src/libstd/prelude/v1.rs | 2 |
2 files changed, 2 insertions, 3 deletions
diff --git a/src/libstd/lib.rs b/src/libstd/lib.rs index 8fd76eabe39..cfee49a7b55 100644 --- a/src/libstd/lib.rs +++ b/src/libstd/lib.rs @@ -218,7 +218,7 @@ // std may use features in a platform-specific way #![allow(unused_features)] -#![cfg_attr(test, feature(print_internals, set_stdio, test, update_panic_count))] +#![cfg_attr(test, feature(print_internals, set_stdio, update_panic_count))] #![cfg_attr(all(target_vendor = "fortanix", target_env = "sgx"), feature(slice_index_methods, decl_macro, coerce_unsized, sgx_platform, ptr_wrapping_offset_from))] @@ -304,6 +304,7 @@ #![feature(stdsimd)] #![feature(stmt_expr_attributes)] #![feature(str_internals)] +#![feature(test)] #![feature(thread_local)] #![feature(todo_macro)] #![feature(toowned_clone_into)] diff --git a/src/libstd/prelude/v1.rs b/src/libstd/prelude/v1.rs index 7b12d2ee6f0..1c61f21f7df 100644 --- a/src/libstd/prelude/v1.rs +++ b/src/libstd/prelude/v1.rs @@ -91,9 +91,7 @@ pub use core::prelude::v1::{ Clone, Copy, Debug, - Decodable, Default, - Encodable, Eq, Hash, Ord, |