diff options
| author | Andrew Cann <shum@canndrew.org> | 2016-08-02 13:46:39 +0800 |
|---|---|---|
| committer | Andrew Cann <shum@canndrew.org> | 2016-08-13 21:37:09 +0800 |
| commit | f0a8b6d43f26907ac7d7abc35510878f61551fbf (patch) | |
| tree | fb4921c105c71850b888b3dfcf06d833e8532829 /src/libcore | |
| parent | 5096a8c5c01f8d1d7edece23bab6898bd3016f2c (diff) | |
Minor fixups based on @eddyb's feedback
Mainly, remove mk_empty() method and replace with tcx.types.empty
Diffstat (limited to 'src/libcore')
| -rw-r--r-- | src/libcore/cmp.rs | 4 | ||||
| -rw-r--r-- | src/libcore/fmt/mod.rs | 4 | ||||
| -rw-r--r-- | src/libcore/lib.rs | 2 |
3 files changed, 6 insertions, 4 deletions
diff --git a/src/libcore/cmp.rs b/src/libcore/cmp.rs index 1d2ed735e81..991f2df2478 100644 --- a/src/libcore/cmp.rs +++ b/src/libcore/cmp.rs @@ -701,7 +701,7 @@ mod impls { // Note: This macro is a temporary hack that can be remove once we are building with a compiler // that supports `!` - macro_rules! argh { + macro_rules! not_stage0 { () => { #[unstable(feature = "bang_type", issue = "35121")] impl PartialEq for ! { @@ -730,7 +730,7 @@ mod impls { } #[cfg(not(stage0))] - argh!(); + not_stage0!(); // & pointers diff --git a/src/libcore/fmt/mod.rs b/src/libcore/fmt/mod.rs index 60862334846..15fb950b143 100644 --- a/src/libcore/fmt/mod.rs +++ b/src/libcore/fmt/mod.rs @@ -1365,7 +1365,7 @@ fmt_refs! { Debug, Display, Octal, Binary, LowerHex, UpperHex, LowerExp, UpperEx // Note: This macro is a temporary hack that can be remove once we are building with a compiler // that supports `!` -macro_rules! argh { +macro_rules! not_stage0 { () => { #[unstable(feature = "bang_type", issue = "35121")] impl Debug for ! { @@ -1384,7 +1384,7 @@ macro_rules! argh { } #[cfg(not(stage0))] -argh!(); +not_stage0!(); #[stable(feature = "rust1", since = "1.0.0")] impl Debug for bool { diff --git a/src/libcore/lib.rs b/src/libcore/lib.rs index 74ef378f23d..d05036c97a6 100644 --- a/src/libcore/lib.rs +++ b/src/libcore/lib.rs @@ -87,6 +87,8 @@ #![feature(staged_api)] #![feature(unboxed_closures)] #![feature(question_mark)] + +// NOTE: remove the cfg_attr next snapshot #![cfg_attr(not(stage0), feature(bang_type))] #[macro_use] |