diff options
| author | Loïc BRANSTETT <lolo.branstett@numericable.fr> | 2022-01-21 23:04:06 +0100 |
|---|---|---|
| committer | Loïc BRANSTETT <lolo.branstett@numericable.fr> | 2022-01-31 17:09:31 +0100 |
| commit | 565710b33cb20c901b8b3371d1364cf7fb11e79b (patch) | |
| tree | ea8b01a50153f7188172d0a924b86fa30471d4a2 /compiler/rustc_builtin_macros/src/lib.rs | |
| parent | 86f5e177bca8121e1edc9864023a8ea61acf9034 (diff) | |
| download | rust-565710b33cb20c901b8b3371d1364cf7fb11e79b.tar.gz rust-565710b33cb20c901b8b3371d1364cf7fb11e79b.zip | |
Fix invalid special casing of the unreachable! macro
Diffstat (limited to 'compiler/rustc_builtin_macros/src/lib.rs')
| -rw-r--r-- | compiler/rustc_builtin_macros/src/lib.rs | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/compiler/rustc_builtin_macros/src/lib.rs b/compiler/rustc_builtin_macros/src/lib.rs index 6c16c285492..98c94dfc686 100644 --- a/compiler/rustc_builtin_macros/src/lib.rs +++ b/compiler/rustc_builtin_macros/src/lib.rs @@ -31,12 +31,12 @@ mod concat_bytes; mod concat_idents; mod derive; mod deriving; +mod edition_panic; mod env; mod format; mod format_foreign; mod global_allocator; mod log_syntax; -mod panic; mod source_util; mod test; mod trace_macros; @@ -82,8 +82,9 @@ pub fn register_builtin_macros(resolver: &mut dyn ResolverExpand) { log_syntax: log_syntax::expand_log_syntax, module_path: source_util::expand_mod, option_env: env::expand_option_env, - core_panic: panic::expand_panic, - std_panic: panic::expand_panic, + core_panic: edition_panic::expand_panic, + std_panic: edition_panic::expand_panic, + unreachable: edition_panic::expand_unreachable, stringify: source_util::expand_stringify, trace_macros: trace_macros::expand_trace_macros, } |