diff options
| author | Vadim Petrochenkov <vadim.petrochenkov@gmail.com> | 2019-07-27 15:06:49 +0300 |
|---|---|---|
| committer | Vadim Petrochenkov <vadim.petrochenkov@gmail.com> | 2019-07-31 21:27:59 +0300 |
| commit | 73dae4eaf99c06f54b6cf642d18cc1bd3c30ead8 (patch) | |
| tree | ae239433b4f12f1fbd6fb01a6a7f342fd8cfba0e /src/libcore | |
| parent | 9152fe4ea053a29469691349f4b63aa94c9aac56 (diff) | |
Remove derives `Encodable`/`Decodable` and unstabilize attribute `#[bench]`
Diffstat (limited to 'src/libcore')
| -rw-r--r-- | src/libcore/hint.rs | 2 | ||||
| -rw-r--r-- | src/libcore/macros.rs | 27 | ||||
| -rw-r--r-- | src/libcore/prelude/v1.rs | 2 |
3 files changed, 3 insertions, 28 deletions
diff --git a/src/libcore/hint.rs b/src/libcore/hint.rs index 519212bb6cb..3b2b28217f9 100644 --- a/src/libcore/hint.rs +++ b/src/libcore/hint.rs @@ -110,7 +110,7 @@ pub fn spin_loop() { /// /// This function is a no-op, and does not even read from `dummy`. #[inline] -#[unstable(feature = "test", issue = "27812")] +#[unstable(feature = "test", issue = "50297")] #[allow(unreachable_code)] // this makes #[cfg] a bit easier below. pub fn black_box<T>(dummy: T) -> T { // We need to "use" the argument in some way LLVM can't introspect, and on diff --git a/src/libcore/macros.rs b/src/libcore/macros.rs index 218c164a7dc..db0a6eff836 100644 --- a/src/libcore/macros.rs +++ b/src/libcore/macros.rs @@ -1267,7 +1267,8 @@ pub(crate) mod builtin { pub macro test($item:item) { /* compiler built-in */ } /// Attribute macro applied to a function to turn it into a benchmark test. - #[stable(feature = "rust1", since = "1.0.0")] + #[unstable(feature = "test", issue = "50297", + reason = "`bench` is a part of custom test frameworks which are unstable")] #[allow_internal_unstable(test, rustc_attrs)] #[rustc_builtin_macro] #[rustc_macro_transparency = "semitransparent"] @@ -1309,18 +1310,6 @@ pub(crate) mod builtin { #[allow_internal_unstable(core_intrinsics)] pub macro Debug($item:item) { /* compiler built-in */ } - /// Unstable implementation detail of the `rustc` compiler, do not use. - #[rustc_builtin_macro] - #[rustc_macro_transparency = "semitransparent"] - #[stable(feature = "rust1", since = "1.0.0")] - #[rustc_deprecated( - since = "1.0.0", - reason = "derive(Decodable) is deprecated in favor of derive(RustcDecodable)", - suggestion = "RustcDecodable", - )] - #[allow_internal_unstable(core_intrinsics, libstd_sys_internals)] - pub macro Decodable($item:item) { /* compiler built-in */ } - /// Derive macro generating an impl of the trait `Default`. #[rustc_builtin_macro] #[rustc_macro_transparency = "semitransparent"] @@ -1328,18 +1317,6 @@ pub(crate) mod builtin { #[allow_internal_unstable(core_intrinsics)] pub macro Default($item:item) { /* compiler built-in */ } - /// Unstable implementation detail of the `rustc` compiler, do not use. - #[rustc_builtin_macro] - #[rustc_macro_transparency = "semitransparent"] - #[stable(feature = "rust1", since = "1.0.0")] - #[rustc_deprecated( - since = "1.0.0", - reason = "derive(Encodable) is deprecated in favor of derive(RustcEncodable)", - suggestion = "RustcEncodable", - )] - #[allow_internal_unstable(core_intrinsics)] - pub macro Encodable($item:item) { /* compiler built-in */ } - /// Derive macro generating an impl of the trait `Eq`. #[rustc_builtin_macro] #[rustc_macro_transparency = "semitransparent"] diff --git a/src/libcore/prelude/v1.rs b/src/libcore/prelude/v1.rs index de79e2fa260..c503d8c7019 100644 --- a/src/libcore/prelude/v1.rs +++ b/src/libcore/prelude/v1.rs @@ -54,9 +54,7 @@ pub use crate::macros::builtin::{ Clone, Copy, Debug, - Decodable, Default, - Encodable, Eq, Hash, Ord, |