diff options
| author | bors <bors@rust-lang.org> | 2018-03-16 08:22:11 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2018-03-16 08:22:11 +0000 |
| commit | 5f3996c3ec4824b92b2af251ac09406f9573e1ff (patch) | |
| tree | c74124eca698a97097e3fba8a4b26a2cd28587b0 /src/libstd/lib.rs | |
| parent | a7170b0412d1baa4e30cb31d1ea326617021f086 (diff) | |
| parent | 4a254c00506abdbb660e9c71d34b5b836b86da8d (diff) | |
Auto merge of #48813 - sinkuu:build_in_assert_macro, r=alexcrichton
Make `assert` a built-in procedural macro Makes `assert` macro a built-in one without touching its functionality. This is a prerequisite for RFC 2011 (#44838).
Diffstat (limited to 'src/libstd/lib.rs')
| -rw-r--r-- | src/libstd/lib.rs | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/libstd/lib.rs b/src/libstd/lib.rs index cd9484de85a..70a1f82c9a1 100644 --- a/src/libstd/lib.rs +++ b/src/libstd/lib.rs @@ -355,8 +355,9 @@ use prelude::v1::*; // We want to re-export a few macros from core but libcore has already been // imported by the compiler (via our #[no_std] attribute) In this case we just // add a new crate name so we can attach the re-exports to it. -#[macro_reexport(assert, assert_eq, assert_ne, debug_assert, debug_assert_eq, +#[macro_reexport(assert_eq, assert_ne, debug_assert, debug_assert_eq, debug_assert_ne, unreachable, unimplemented, write, writeln, try)] +#[cfg_attr(stage0, macro_reexport(assert))] extern crate core as __core; #[macro_use] |
