Skip to content

Commit 848b2d2

Browse files
petrochenkovpetrochenkov
committed
resolve: Reserve cfg/cfg_attr/derive only in attribute sub-namespace
1 parent f993107 commit 848b2d2

File tree

6 files changed

+45
-39
lines changed

6 files changed

+45
-39
lines changed

‎src/librustc_resolve/build_reduced_graph.rs

+11-5
Original file line numberDiff line numberDiff line change
@@ -770,27 +770,33 @@ impl<'a> Resolver<'a> {
770770
}
771771

772772
pub fn get_macro(&mut self, res: Res) -> Lrc<SyntaxExtension> {
773+
self.opt_get_macro(res).expect("expected `DefKind::Macro` or `Res::NonMacroAttr`")
774+
}
775+
776+
crate fn opt_get_macro(&mut self, res: Res) -> Option<Lrc<SyntaxExtension>> {
773777
let def_id = match res {
778+
Res::Def(DefKind::Macro(MacroKind::ProcMacroStub), _) =>
779+
return Some(self.non_macro_attr(true)), // some dummy extension
774780
Res::Def(DefKind::Macro(..), def_id) => def_id,
775781
Res::NonMacroAttr(attr_kind) =>
776-
return self.non_macro_attr(attr_kind == NonMacroAttrKind::Tool),
777-
_ => panic!("expected `DefKind::Macro` or `Res::NonMacroAttr`"),
782+
return Some(self.non_macro_attr(attr_kind == NonMacroAttrKind::Tool)),
783+
_ => return None,
778784
};
779785
if let Some(ext) = self.macro_map.get(&def_id) {
780-
return ext.clone();
786+
return Some(ext.clone());
781787
}
782788

783789
let macro_def = match self.cstore.load_macro_untracked(def_id, &self.session) {
784790
LoadedMacro::MacroDef(macro_def) => macro_def,
785-
LoadedMacro::ProcMacro(ext) => return ext,
791+
LoadedMacro::ProcMacro(ext) => return Some(ext),
786792
};
787793

788794
let ext = Lrc::new(macro_rules::compile(&self.session.parse_sess,
789795
&self.session.features_untracked(),
790796
&macro_def,
791797
self.cstore.crate_edition_untracked(def_id.krate)));
792798
self.macro_map.insert(def_id, ext.clone());
793-
ext
799+
Some(ext)
794800
}
795801

796802
/// Ensures that the reduced graph rooted at the given external module

‎src/librustc_resolve/macros.rs

+14-5
Original file line numberDiff line numberDiff line change
@@ -1106,6 +1106,17 @@ impl<'a> Resolver<'a> {
11061106
});
11071107
}
11081108

1109+
crate fn check_reserved_macro_name(&self, ident: Ident, macro_kind: Option<MacroKind>) {
1110+
// Reserve some names that are not quite covered by the general check
1111+
// performed on `Resolver::builtin_attrs`.
1112+
if (macro_kind.is_some() && sub_namespace_match(macro_kind, Some(MacroKind::Attr))) &&
1113+
(ident.name == sym::cfg || ident.name == sym::cfg_attr || ident.name == sym::derive) {
1114+
self.session.span_err(
1115+
ident.span, &format!("name `{}` is reserved in attribute namespace", ident)
1116+
);
1117+
}
1118+
}
1119+
11091120
pub fn define_macro(&mut self,
11101121
item: &ast::Item,
11111122
expansion: Mark,
@@ -1117,13 +1128,14 @@ impl<'a> Resolver<'a> {
11171128
let ext = Lrc::new(macro_rules::compile(&self.session.parse_sess,
11181129
&self.session.features_untracked(),
11191130
item, self.session.edition()));
1131+
let macro_kind = ext.macro_kind();
1132+
let res = Res::Def(DefKind::Macro(macro_kind), def_id);
11201133
self.macro_map.insert(def_id, ext);
11211134

11221135
let def = match item.node { ast::ItemKind::MacroDef(ref def) => def, _ => unreachable!() };
11231136
if def.legacy {
11241137
let ident = ident.modern();
11251138
self.macro_names.insert(ident);
1126-
let res = Res::Def(DefKind::Macro(MacroKind::Bang), def_id);
11271139
let is_macro_export = attr::contains_name(&item.attrs, sym::macro_export);
11281140
let vis = if is_macro_export {
11291141
ty::Visibility::Public
@@ -1142,14 +1154,11 @@ impl<'a> Resolver<'a> {
11421154
self.define(module, ident, MacroNS,
11431155
(res, vis, item.span, expansion, IsMacroExport));
11441156
} else {
1145-
if !attr::contains_name(&item.attrs, sym::rustc_builtin_macro) {
1146-
self.check_reserved_macro_name(ident, MacroNS);
1147-
}
1157+
self.check_reserved_macro_name(ident, Some(macro_kind));
11481158
self.unused_macros.insert(def_id);
11491159
}
11501160
} else {
11511161
let module = self.current_module;
1152-
let res = Res::Def(DefKind::Macro(MacroKind::Bang), def_id);
11531162
let vis = self.resolve_visibility(&item.vis);
11541163
if vis != ty::Visibility::Public {
11551164
self.unused_macros.insert(def_id);

‎src/librustc_resolve/resolve_imports.rs

+6-15
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ use rustc::{bug, span_bug};
2929
use syntax::ast::{self, Ident, Name, NodeId, CRATE_NODE_ID};
3030
use syntax::ext::base::Determinacy::{self, Determined, Undetermined};
3131
use syntax::ext::hygiene::Mark;
32-
use syntax::symbol::{kw, sym};
32+
use syntax::symbol::kw;
3333
use syntax::util::lev_distance::find_best_match_for_name;
3434
use syntax::{struct_span_err, unwrap_or};
3535
use syntax_pos::{MultiSpan, Span};
@@ -492,35 +492,26 @@ impl<'a> Resolver<'a> {
492492
})
493493
}
494494

495-
crate fn check_reserved_macro_name(&self, ident: Ident, ns: Namespace) {
496-
// Reserve some names that are not quite covered by the general check
497-
// performed on `Resolver::builtin_attrs`.
498-
if ns == MacroNS &&
499-
(ident.name == sym::cfg || ident.name == sym::cfg_attr ||
500-
ident.name == sym::derive) {
501-
self.session.span_err(ident.span,
502-
&format!("name `{}` is reserved in macro namespace", ident));
503-
}
504-
}
505-
506495
// Define the name or return the existing binding if there is a collision.
507496
pub fn try_define(&mut self,
508497
module: Module<'a>,
509498
ident: Ident,
510499
ns: Namespace,
511500
binding: &'a NameBinding<'a>)
512501
-> Result<(), &'a NameBinding<'a>> {
513-
self.check_reserved_macro_name(ident, ns);
502+
let res = binding.res();
503+
let macro_kind = self.opt_get_macro(res).map(|ext| ext.macro_kind());
504+
self.check_reserved_macro_name(ident, macro_kind);
514505
self.set_binding_parent_module(binding, module);
515506
self.update_resolution(module, ident, ns, |this, resolution| {
516507
if let Some(old_binding) = resolution.binding {
517-
if binding.res() == Res::Err {
508+
if res == Res::Err {
518509
// Do not override real bindings with `Res::Err`s from error recovery.
519510
return Ok(());
520511
}
521512
match (old_binding.is_glob_import(), binding.is_glob_import()) {
522513
(true, true) => {
523-
if binding.res() != old_binding.res() {
514+
if res != old_binding.res() {
524515
resolution.binding = Some(this.ambiguity(AmbiguityKind::GlobVsGlob,
525516
old_binding, binding));
526517
} else if !old_binding.vis.is_at_least(binding.vis, &*this) {

‎src/test/ui/consts/const-eval/feature-gate-const_panic.stderr

+8-8
Original file line numberDiff line numberDiff line change
@@ -1,28 +1,28 @@
11
error[E0658]: panicking in constants is unstable
2-
--> $DIR/feature-gate-const_panic.rs:3:15
2+
--> $DIR/feature-gate-const_panic.rs:6:15
33
|
4-
LL | const Z: () = panic!("cheese");
5-
| ^^^^^^^^^^^^^^^^
4+
LL | const Y: () = unreachable!();
5+
| ^^^^^^^^^^^^^^
66
|
77
= note: for more information, see https://github.com/rust-lang/rust/issues/51999
88
= help: add #![feature(const_panic)] to the crate attributes to enable
99
= note: this error originates in a macro outside of the current crate (in Nightly builds, run with -Z external-macro-backtrace for more info)
1010

1111
error[E0658]: panicking in constants is unstable
12-
--> $DIR/feature-gate-const_panic.rs:9:15
12+
--> $DIR/feature-gate-const_panic.rs:3:15
1313
|
14-
LL | const X: () = unimplemented!();
14+
LL | const Z: () = panic!("cheese");
1515
| ^^^^^^^^^^^^^^^^
1616
|
1717
= note: for more information, see https://github.com/rust-lang/rust/issues/51999
1818
= help: add #![feature(const_panic)] to the crate attributes to enable
1919
= note: this error originates in a macro outside of the current crate (in Nightly builds, run with -Z external-macro-backtrace for more info)
2020

2121
error[E0658]: panicking in constants is unstable
22-
--> $DIR/feature-gate-const_panic.rs:6:15
22+
--> $DIR/feature-gate-const_panic.rs:9:15
2323
|
24-
LL | const Y: () = unreachable!();
25-
| ^^^^^^^^^^^^^^
24+
LL | const X: () = unimplemented!();
25+
| ^^^^^^^^^^^^^^^^
2626
|
2727
= note: for more information, see https://github.com/rust-lang/rust/issues/51999
2828
= help: add #![feature(const_panic)] to the crate attributes to enable

‎src/test/ui/proc-macro/reserved-macro-names.rs

+3-3
Original file line numberDiff line numberDiff line change
@@ -8,18 +8,18 @@ use proc_macro::*;
88

99
#[proc_macro_attribute]
1010
pub fn cfg(_: TokenStream, input: TokenStream) -> TokenStream {
11-
//~^ ERROR name `cfg` is reserved in macro namespace
11+
//~^ ERROR name `cfg` is reserved in attribute namespace
1212
input
1313
}
1414

1515
#[proc_macro_attribute]
1616
pub fn cfg_attr(_: TokenStream, input: TokenStream) -> TokenStream {
17-
//~^ ERROR name `cfg_attr` is reserved in macro namespace
17+
//~^ ERROR name `cfg_attr` is reserved in attribute namespace
1818
input
1919
}
2020

2121
#[proc_macro_attribute]
2222
pub fn derive(_: TokenStream, input: TokenStream) -> TokenStream {
23-
//~^ ERROR name `derive` is reserved in macro namespace
23+
//~^ ERROR name `derive` is reserved in attribute namespace
2424
input
2525
}

‎src/test/ui/proc-macro/reserved-macro-names.stderr

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,16 @@
1-
error: name `cfg` is reserved in macro namespace
1+
error: name `cfg` is reserved in attribute namespace
22
--> $DIR/reserved-macro-names.rs:10:8
33
|
44
LL | pub fn cfg(_: TokenStream, input: TokenStream) -> TokenStream {
55
| ^^^
66

7-
error: name `cfg_attr` is reserved in macro namespace
7+
error: name `cfg_attr` is reserved in attribute namespace
88
--> $DIR/reserved-macro-names.rs:16:8
99
|
1010
LL | pub fn cfg_attr(_: TokenStream, input: TokenStream) -> TokenStream {
1111
| ^^^^^^^^
1212

13-
error: name `derive` is reserved in macro namespace
13+
error: name `derive` is reserved in attribute namespace
1414
--> $DIR/reserved-macro-names.rs:22:8
1515
|
1616
LL | pub fn derive(_: TokenStream, input: TokenStream) -> TokenStream {

0 commit comments

Comments
 (0)