about summary refs log tree commit diff
path: root/compiler/rustc_builtin_macros
diff options
context:
space:
mode:
authorMara Bos <m-ou.se@m-ou.se>2021-01-09 16:48:58 +0100
committerMara Bos <m-ou.se@m-ou.se>2021-01-09 19:50:06 +0100
commitd651fa78cefecefa87fa3d7dc1e1389d275afb63 (patch)
tree45bc43f0d9979d6cd5051426d24cab97102593ae /compiler/rustc_builtin_macros
parent1f9dc9a1821d55b1641c517feac7fcd6ac76aadc (diff)
downloadrust-d651fa78cefecefa87fa3d7dc1e1389d275afb63.tar.gz
rust-d651fa78cefecefa87fa3d7dc1e1389d275afb63.zip
Allow #[rustc_builtin_macro = "name"].
This makes it possible to have both std::panic and core::panic as a
builtin macro, by using different builtin macro names for each.

Also removes SyntaxExtension::is_derive_copy, as the macro name (e.g.
sym::Copy) is now tracked and provides that information directly.
Diffstat (limited to 'compiler/rustc_builtin_macros')
-rw-r--r--compiler/rustc_builtin_macros/src/lib.rs2
1 files changed, 1 insertions, 1 deletions
diff --git a/compiler/rustc_builtin_macros/src/lib.rs b/compiler/rustc_builtin_macros/src/lib.rs
index 97cadb913ca..774a13303bf 100644
--- a/compiler/rustc_builtin_macros/src/lib.rs
+++ b/compiler/rustc_builtin_macros/src/lib.rs
@@ -48,7 +48,7 @@ pub fn register_builtin_macros(resolver: &mut dyn ResolverExpand, edition: Editi
     let mut register = |name, kind| {
         resolver.register_builtin_macro(
             Ident::with_dummy_span(name),
-            SyntaxExtension { is_builtin: true, ..SyntaxExtension::default(kind, edition) },
+            SyntaxExtension { builtin_name: Some(name), ..SyntaxExtension::default(kind, edition) },
         )
     };
     macro register_bang($($name:ident: $f:expr,)*) {