-// Copyright 2012-2014 The Rust Project Developers. See the COPYRIGHT
-// file at the top-level directory of this distribution and at
-// http://rust-lang.org/COPYRIGHT.
-//
-// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
-// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
-// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
-// option. This file may not be copied, modified, or distributed
-// except according to those terms.
-
-//! Reduced graph building
+//! After we obtain a fresh AST fragment from a macro, code in this module helps to integrate
+//! that fragment into the module structures that are already partially built.
//!
-//! Here we build the "reduced graph": the graph of the module tree without
-//! any imports resolved.
-
-use macros::{InvocationData, LegacyScope};
-use resolve_imports::ImportDirective;
-use resolve_imports::ImportDirectiveSubclass::{self, GlobImport, SingleImport};
-use {Resolver, Module, ModuleS, ModuleKind, NameBinding, NameBindingKind, ToNameBinding};
-use Namespace::{self, TypeNS, ValueNS, MacroNS};
-use {resolve_error, resolve_struct_error, ResolutionError};
+//! Items from the fragment are placed into modules,
+//! unexpanded macros in the fragment are visited and registered.
+//! Imports are also considered items and placed into modules here, but not resolved yet.
+
+use crate::def_collector::collect_definitions;
+use crate::imports::{Import, ImportKind};
+use crate::macros::{MacroRulesBinding, MacroRulesScope};
+use crate::Namespace::{self, MacroNS, TypeNS, ValueNS};
+use crate::{CrateLint, Determinacy, PathResult, ResolutionError, VisResolutionError};
+use crate::{
+ ExternPreludeEntry, ModuleOrUniformRoot, ParentScope, PerNS, Resolver, ResolverArenas,
+};
+use crate::{Module, ModuleData, ModuleKind, NameBinding, NameBindingKind, Segment, ToNameBinding};
+
+use rustc_ast::ast::{self, Block, ForeignItem, ForeignItemKind, Item, ItemKind, NodeId};
+use rustc_ast::ast::{AssocItem, AssocItemKind, MetaItemKind, StmtKind};
+use rustc_ast::token::{self, Token};
+use rustc_ast::visit::{self, AssocCtxt, Visitor};
+use rustc_attr as attr;
+use rustc_data_structures::sync::Lrc;
+use rustc_errors::{struct_span_err, Applicability};
+use rustc_expand::base::SyntaxExtension;
+use rustc_expand::expand::AstFragment;
+use rustc_hir::def::{self, *};
+use rustc_hir::def_id::{DefId, LocalDefId, CRATE_DEF_INDEX};
+use rustc_metadata::creader::LoadedMacro;
+use rustc_middle::bug;
+use rustc_middle::hir::exports::Export;
+use rustc_middle::middle::cstore::CrateStore;
+use rustc_middle::ty;
+use rustc_span::hygiene::{ExpnId, MacroKind};
+use rustc_span::source_map::{respan, Spanned};
+use rustc_span::symbol::{kw, sym, Ident, Symbol};
+use rustc_span::{Span, DUMMY_SP};
+
+use log::debug;
+use std::cell::Cell;
+use std::ptr;
-use rustc::middle::cstore::LoadedMacro;
-use rustc::hir::def::*;
-use rustc::hir::def_id::{CrateNum, CRATE_DEF_INDEX, DefId};
-use rustc::ty;
+type Res = def::Res<NodeId>;
-use std::cell::Cell;
-use std::rc::Rc;
-
-use syntax::ast::Name;
-use syntax::attr;
-
-use syntax::ast::{self, Block, ForeignItem, ForeignItemKind, Item, ItemKind};
-use syntax::ast::{Mutability, StmtKind, TraitItem, TraitItemKind};
-use syntax::ast::{Variant, ViewPathGlob, ViewPathList, ViewPathSimple};
-use syntax::ext::base::SyntaxExtension;
-use syntax::ext::base::Determinacy::Undetermined;
-use syntax::ext::expand::mark_tts;
-use syntax::ext::hygiene::Mark;
-use syntax::ext::tt::macro_rules;
-use syntax::symbol::keywords;
-use syntax::visit::{self, Visitor};
-
-use syntax_pos::{Span, DUMMY_SP};
-
-impl<'a> ToNameBinding<'a> for (Module<'a>, ty::Visibility, Span, Mark) {
- fn to_name_binding(self) -> NameBinding<'a> {
- NameBinding {
+impl<'a> ToNameBinding<'a> for (Module<'a>, ty::Visibility, Span, ExpnId) {
+ fn to_name_binding(self, arenas: &'a ResolverArenas<'a>) -> &'a NameBinding<'a> {
+ arenas.alloc_name_binding(NameBinding {
kind: NameBindingKind::Module(self.0),
+ ambiguity: None,
vis: self.1,
span: self.2,
expansion: self.3,
- }
+ })
}
}
-impl<'a> ToNameBinding<'a> for (Def, ty::Visibility, Span, Mark) {
- fn to_name_binding(self) -> NameBinding<'a> {
- NameBinding {
- kind: NameBindingKind::Def(self.0),
+impl<'a> ToNameBinding<'a> for (Res, ty::Visibility, Span, ExpnId) {
+ fn to_name_binding(self, arenas: &'a ResolverArenas<'a>) -> &'a NameBinding<'a> {
+ arenas.alloc_name_binding(NameBinding {
+ kind: NameBindingKind::Res(self.0, false),
+ ambiguity: None,
vis: self.1,
span: self.2,
expansion: self.3,
- }
+ })
}
}
-#[derive(Default, PartialEq, Eq)]
-struct LegacyMacroImports {
- import_all: Option<Span>,
- imports: Vec<(Name, Span)>,
- reexports: Vec<(Name, Span)>,
+struct IsMacroExport;
+
+impl<'a> ToNameBinding<'a> for (Res, ty::Visibility, Span, ExpnId, IsMacroExport) {
+ fn to_name_binding(self, arenas: &'a ResolverArenas<'a>) -> &'a NameBinding<'a> {
+ arenas.alloc_name_binding(NameBinding {
+ kind: NameBindingKind::Res(self.0, true),
+ ambiguity: None,
+ vis: self.1,
+ span: self.2,
+ expansion: self.3,
+ })
+ }
}
-impl<'b> Resolver<'b> {
+impl<'a> Resolver<'a> {
/// Defines `name` in namespace `ns` of module `parent` to be `def` if it is not yet defined;
/// otherwise, reports an error.
- fn define<T>(&mut self, parent: Module<'b>, name: Name, ns: Namespace, def: T)
- where T: ToNameBinding<'b>,
+ crate fn define<T>(&mut self, parent: Module<'a>, ident: Ident, ns: Namespace, def: T)
+ where
+ T: ToNameBinding<'a>,
{
- let binding = def.to_name_binding();
- if let Err(old_binding) = self.try_define(parent, name, ns, binding.clone()) {
- self.report_conflict(parent, name, ns, old_binding, &binding);
+ let binding = def.to_name_binding(self.arenas);
+ let key = self.new_key(ident, ns);
+ if let Err(old_binding) = self.try_define(parent, key, binding) {
+ self.report_conflict(parent, ident, ns, old_binding, &binding);
}
}
- fn block_needs_anonymous_module(&mut self, block: &Block) -> bool {
- // If any statements are items, we need to create an anonymous module
- block.stmts.iter().any(|statement| match statement.node {
- StmtKind::Item(_) | StmtKind::Mac(_) => true,
- _ => false,
+ crate fn get_module(&mut self, def_id: DefId) -> Module<'a> {
+ if let Some(def_id) = def_id.as_local() {
+ return self.module_map[&def_id];
+ }
+
+ if let Some(&module) = self.extern_module_map.get(&def_id) {
+ return module;
+ }
+
+ let (name, parent) = if def_id.index == CRATE_DEF_INDEX {
+ (self.cstore().crate_name_untracked(def_id.krate), None)
+ } else {
+ let def_key = self.cstore().def_key(def_id);
+ (
+ def_key.disambiguated_data.data.get_opt_name().unwrap(),
+ Some(self.get_module(DefId { index: def_key.parent.unwrap(), ..def_id })),
+ )
+ };
+
+ let kind = ModuleKind::Def(DefKind::Mod, def_id, name);
+ let module = self.arenas.alloc_module(ModuleData::new(
+ parent,
+ kind,
+ def_id,
+ ExpnId::root(),
+ DUMMY_SP,
+ ));
+ self.extern_module_map.insert(def_id, module);
+ module
+ }
+
+ crate fn macro_def_scope(&mut self, expn_id: ExpnId) -> Module<'a> {
+ let def_id = match expn_id.expn_data().macro_def_id {
+ Some(def_id) => def_id,
+ None => return self.ast_transform_scopes.get(&expn_id).unwrap_or(&self.graph_root),
+ };
+ if let Some(id) = def_id.as_local() {
+ self.local_macro_def_scopes[&id]
+ } else {
+ let module_def_id = ty::DefIdTree::parent(&*self, def_id).unwrap();
+ self.get_module(module_def_id)
+ }
+ }
+
+ crate fn get_macro(&mut self, res: Res) -> Option<Lrc<SyntaxExtension>> {
+ match res {
+ Res::Def(DefKind::Macro(..), def_id) => self.get_macro_by_def_id(def_id),
+ Res::NonMacroAttr(attr_kind) => Some(self.non_macro_attr(attr_kind.is_used())),
+ _ => None,
+ }
+ }
+
+ crate fn get_macro_by_def_id(&mut self, def_id: DefId) -> Option<Lrc<SyntaxExtension>> {
+ if let Some(ext) = self.macro_map.get(&def_id) {
+ return Some(ext.clone());
+ }
+
+ let ext = Lrc::new(match self.cstore().load_macro_untracked(def_id, &self.session) {
+ LoadedMacro::MacroDef(item, edition) => self.compile_macro(&item, edition),
+ LoadedMacro::ProcMacro(ext) => ext,
+ });
+
+ self.macro_map.insert(def_id, ext.clone());
+ Some(ext)
+ }
+
+ crate fn build_reduced_graph(
+ &mut self,
+ fragment: &AstFragment,
+ parent_scope: ParentScope<'a>,
+ ) -> MacroRulesScope<'a> {
+ collect_definitions(&mut self.definitions, fragment, parent_scope.expansion);
+ let mut visitor = BuildReducedGraphVisitor { r: self, parent_scope };
+ fragment.visit_with(&mut visitor);
+ visitor.parent_scope.macro_rules
+ }
+
+ crate fn build_reduced_graph_external(&mut self, module: Module<'a>) {
+ let def_id = module.def_id().expect("unpopulated module without a def-id");
+ for child in self.cstore().item_children_untracked(def_id, self.session) {
+ let child = child.map_id(|_| panic!("unexpected id"));
+ BuildReducedGraphVisitor { r: self, parent_scope: ParentScope::module(module) }
+ .build_reduced_graph_for_external_crate_res(child);
+ }
+ }
+}
+
+struct BuildReducedGraphVisitor<'a, 'b> {
+ r: &'b mut Resolver<'a>,
+ parent_scope: ParentScope<'a>,
+}
+
+impl<'a> AsMut<Resolver<'a>> for BuildReducedGraphVisitor<'a, '_> {
+ fn as_mut(&mut self) -> &mut Resolver<'a> {
+ self.r
+ }
+}
+
+impl<'a, 'b> BuildReducedGraphVisitor<'a, 'b> {
+ fn resolve_visibility(&mut self, vis: &ast::Visibility) -> ty::Visibility {
+ self.resolve_visibility_speculative(vis, false).unwrap_or_else(|err| {
+ self.r.report_vis_error(err);
+ ty::Visibility::Public
})
}
- fn insert_field_names(&mut self, def_id: DefId, field_names: Vec<Name>) {
+ fn resolve_visibility_speculative<'ast>(
+ &mut self,
+ vis: &'ast ast::Visibility,
+ speculative: bool,
+ ) -> Result<ty::Visibility, VisResolutionError<'ast>> {
+ let parent_scope = &self.parent_scope;
+ match vis.node {
+ ast::VisibilityKind::Public => Ok(ty::Visibility::Public),
+ ast::VisibilityKind::Crate(..) => {
+ Ok(ty::Visibility::Restricted(DefId::local(CRATE_DEF_INDEX)))
+ }
+ ast::VisibilityKind::Inherited => {
+ Ok(ty::Visibility::Restricted(parent_scope.module.normal_ancestor_id))
+ }
+ ast::VisibilityKind::Restricted { ref path, id, .. } => {
+ // For visibilities we are not ready to provide correct implementation of "uniform
+ // paths" right now, so on 2018 edition we only allow module-relative paths for now.
+ // On 2015 edition visibilities are resolved as crate-relative by default,
+ // so we are prepending a root segment if necessary.
+ let ident = path.segments.get(0).expect("empty path in visibility").ident;
+ let crate_root = if ident.is_path_segment_keyword() {
+ None
+ } else if ident.span.rust_2015() {
+ Some(Segment::from_ident(Ident::new(
+ kw::PathRoot,
+ path.span.shrink_to_lo().with_ctxt(ident.span.ctxt()),
+ )))
+ } else {
+ return Err(VisResolutionError::Relative2018(ident.span, path));
+ };
+
+ let segments = crate_root
+ .into_iter()
+ .chain(path.segments.iter().map(|seg| seg.into()))
+ .collect::<Vec<_>>();
+ let expected_found_error = |res| {
+ Err(VisResolutionError::ExpectedFound(
+ path.span,
+ Segment::names_to_string(&segments),
+ res,
+ ))
+ };
+ match self.r.resolve_path(
+ &segments,
+ Some(TypeNS),
+ parent_scope,
+ !speculative,
+ path.span,
+ CrateLint::SimplePath(id),
+ ) {
+ PathResult::Module(ModuleOrUniformRoot::Module(module)) => {
+ let res = module.res().expect("visibility resolved to unnamed block");
+ if !speculative {
+ self.r.record_partial_res(id, PartialRes::new(res));
+ }
+ if module.is_normal() {
+ if res == Res::Err {
+ Ok(ty::Visibility::Public)
+ } else {
+ let vis = ty::Visibility::Restricted(res.def_id());
+ if self.r.is_accessible_from(vis, parent_scope.module) {
+ Ok(vis)
+ } else {
+ Err(VisResolutionError::AncestorOnly(path.span))
+ }
+ }
+ } else {
+ expected_found_error(res)
+ }
+ }
+ PathResult::Module(..) => Err(VisResolutionError::ModuleOnly(path.span)),
+ PathResult::NonModule(partial_res) => {
+ expected_found_error(partial_res.base_res())
+ }
+ PathResult::Failed { span, label, suggestion, .. } => {
+ Err(VisResolutionError::FailedToResolve(span, label, suggestion))
+ }
+ PathResult::Indeterminate => Err(VisResolutionError::Indeterminate(path.span)),
+ }
+ }
+ }
+ }
+
+ fn insert_field_names_local(&mut self, def_id: DefId, vdata: &ast::VariantData) {
+ let field_names = vdata
+ .fields()
+ .iter()
+ .map(|field| respan(field.span, field.ident.map_or(kw::Invalid, |ident| ident.name)))
+ .collect();
+ self.insert_field_names(def_id, field_names);
+ }
+
+ fn insert_field_names(&mut self, def_id: DefId, field_names: Vec<Spanned<Symbol>>) {
if !field_names.is_empty() {
- self.field_names.insert(def_id, field_names);
+ self.r.field_names.insert(def_id, field_names);
}
}
- /// Constructs the reduced graph for one item.
- fn build_reduced_graph_for_item(&mut self, item: &Item, expansion: Mark) {
- let parent = self.current_module;
- let name = item.ident.name;
- let sp = item.span;
- let vis = self.resolve_visibility(&item.vis);
+ fn block_needs_anonymous_module(&mut self, block: &Block) -> bool {
+ // If any statements are items, we need to create an anonymous module
+ block.stmts.iter().any(|statement| match statement.kind {
+ StmtKind::Item(_) | StmtKind::MacCall(_) => true,
+ _ => false,
+ })
+ }
- match item.node {
- ItemKind::Use(ref view_path) => {
- // Extract and intern the module part of the path. For
- // globs and lists, the path is found directly in the AST;
- // for simple paths we have to munge the path a little.
- let module_path: Vec<_> = match view_path.node {
- ViewPathSimple(_, ref full_path) => {
- full_path.segments
- .split_last()
- .unwrap()
- .1
- .iter()
- .map(|seg| seg.identifier)
- .collect()
- }
+ // Add an import to the current module.
+ fn add_import(
+ &mut self,
+ module_path: Vec<Segment>,
+ kind: ImportKind<'a>,
+ span: Span,
+ id: NodeId,
+ item: &ast::Item,
+ root_span: Span,
+ root_id: NodeId,
+ vis: ty::Visibility,
+ ) {
+ let current_module = self.parent_scope.module;
+ let import = self.r.arenas.alloc_import(Import {
+ kind,
+ parent_scope: self.parent_scope,
+ module_path,
+ imported_module: Cell::new(None),
+ span,
+ id,
+ use_span: item.span,
+ use_span_with_attributes: item.span_with_attributes(),
+ has_attributes: !item.attrs.is_empty(),
+ root_span,
+ root_id,
+ vis: Cell::new(vis),
+ used: Cell::new(false),
+ });
- ViewPathGlob(ref module_ident_path) |
- ViewPathList(ref module_ident_path, _) => {
- module_ident_path.segments
- .iter()
- .map(|seg| seg.identifier)
- .collect()
+ debug!("add_import({:?})", import);
+
+ self.r.indeterminate_imports.push(import);
+ match import.kind {
+ // Don't add unresolved underscore imports to modules
+ ImportKind::Single { target: Ident { name: kw::Underscore, .. }, .. } => {}
+ ImportKind::Single { target, type_ns_only, .. } => {
+ self.r.per_ns(|this, ns| {
+ if !type_ns_only || ns == TypeNS {
+ let key = this.new_key(target, ns);
+ let mut resolution = this.resolution(current_module, key).borrow_mut();
+ resolution.add_single_import(import);
}
- };
+ });
+ }
+ // We don't add prelude imports to the globs since they only affect lexical scopes,
+ // which are not relevant to import resolution.
+ ImportKind::Glob { is_prelude: true, .. } => {}
+ ImportKind::Glob { .. } => current_module.globs.borrow_mut().push(import),
+ _ => unreachable!(),
+ }
+ }
- // Build up the import directives.
- let is_prelude = attr::contains_name(&item.attrs, "prelude_import");
-
- match view_path.node {
- ViewPathSimple(mut binding, ref full_path) => {
- let mut source = full_path.segments.last().unwrap().identifier;
- let source_name = source.name;
- if source_name == "mod" || source_name == "self" {
- resolve_error(self,
- view_path.span,
- ResolutionError::SelfImportsOnlyAllowedWithin);
- } else if source_name == "$crate" && full_path.segments.len() == 1 {
- let crate_root = self.resolve_crate_var(source.ctxt);
- let crate_name = match crate_root.kind {
- ModuleKind::Def(_, name) => name,
- ModuleKind::Block(..) => unreachable!(),
- };
- source.name = crate_name;
- if binding.name == "$crate" {
- binding.name = crate_name;
- }
+ fn build_reduced_graph_for_use_tree(
+ &mut self,
+ // This particular use tree
+ use_tree: &ast::UseTree,
+ id: NodeId,
+ parent_prefix: &[Segment],
+ nested: bool,
+ // The whole `use` item
+ item: &Item,
+ vis: ty::Visibility,
+ root_span: Span,
+ ) {
+ debug!(
+ "build_reduced_graph_for_use_tree(parent_prefix={:?}, use_tree={:?}, nested={})",
+ parent_prefix, use_tree, nested
+ );
+
+ let mut prefix_iter = parent_prefix
+ .iter()
+ .cloned()
+ .chain(use_tree.prefix.segments.iter().map(|seg| seg.into()))
+ .peekable();
+
+ // On 2015 edition imports are resolved as crate-relative by default,
+ // so prefixes are prepended with crate root segment if necessary.
+ // The root is prepended lazily, when the first non-empty prefix or terminating glob
+ // appears, so imports in braced groups can have roots prepended independently.
+ let is_glob = if let ast::UseTreeKind::Glob = use_tree.kind { true } else { false };
+ let crate_root = match prefix_iter.peek() {
+ Some(seg) if !seg.ident.is_path_segment_keyword() && seg.ident.span.rust_2015() => {
+ Some(seg.ident.span.ctxt())
+ }
+ None if is_glob && use_tree.span.rust_2015() => Some(use_tree.span.ctxt()),
+ _ => None,
+ }
+ .map(|ctxt| {
+ Segment::from_ident(Ident::new(
+ kw::PathRoot,
+ use_tree.prefix.span.shrink_to_lo().with_ctxt(ctxt),
+ ))
+ });
+
+ let prefix = crate_root.into_iter().chain(prefix_iter).collect::<Vec<_>>();
+ debug!("build_reduced_graph_for_use_tree: prefix={:?}", prefix);
- self.session.struct_span_warn(item.span, "`$crate` may not be imported")
- .note("`use $crate;` was erroneously allowed and \
- will become a hard error in a future release")
- .emit();
+ let empty_for_self = |prefix: &[Segment]| {
+ prefix.is_empty() || prefix.len() == 1 && prefix[0].ident.name == kw::PathRoot
+ };
+ match use_tree.kind {
+ ast::UseTreeKind::Simple(rename, ..) => {
+ let mut ident = use_tree.ident();
+ let mut module_path = prefix;
+ let mut source = module_path.pop().unwrap();
+ let mut type_ns_only = false;
+
+ if nested {
+ // Correctly handle `self`
+ if source.ident.name == kw::SelfLower {
+ type_ns_only = true;
+
+ if empty_for_self(&module_path) {
+ self.r.report_error(
+ use_tree.span,
+ ResolutionError::SelfImportOnlyInImportListWithNonEmptyPrefix,
+ );
+ return;
}
- let subclass = SingleImport {
- target: binding.name,
- source: source.name,
- result: self.per_ns(|_, _| Cell::new(Err(Undetermined))),
+ // Replace `use foo::{ self };` with `use foo;`
+ source = module_path.pop().unwrap();
+ if rename.is_none() {
+ ident = source.ident;
+ }
+ }
+ } else {
+ // Disallow `self`
+ if source.ident.name == kw::SelfLower {
+ let parent = module_path.last();
+
+ let span = match parent {
+ // only `::self` from `use foo::self as bar`
+ Some(seg) => seg.ident.span.shrink_to_hi().to(source.ident.span),
+ None => source.ident.span,
};
- self.add_import_directive(
- module_path, subclass, view_path.span, item.id, vis, expansion,
+ let span_with_rename = match rename {
+ // only `self as bar` from `use foo::self as bar`
+ Some(rename) => source.ident.span.to(rename.span),
+ None => source.ident.span,
+ };
+ self.r.report_error(
+ span,
+ ResolutionError::SelfImportsOnlyAllowedWithin {
+ root: parent.is_none(),
+ span_with_rename,
+ },
);
- }
- ViewPathList(_, ref source_items) => {
- // Make sure there's at most one `mod` import in the list.
- let mod_spans = source_items.iter().filter_map(|item| {
- if item.node.name.name == keywords::SelfValue.name() {
- Some(item.span)
- } else {
- None
- }
- }).collect::<Vec<Span>>();
-
- if mod_spans.len() > 1 {
- let mut e = resolve_struct_error(self,
- mod_spans[0],
- ResolutionError::SelfImportCanOnlyAppearOnceInTheList);
- for other_span in mod_spans.iter().skip(1) {
- e.span_note(*other_span, "another `self` import appears here");
+
+ // Error recovery: replace `use foo::self;` with `use foo;`
+ if let Some(parent) = module_path.pop() {
+ source = parent;
+ if rename.is_none() {
+ ident = source.ident;
}
- e.emit();
}
+ }
- for source_item in source_items {
- let node = source_item.node;
- let (module_path, name, rename) = {
- if node.name.name != keywords::SelfValue.name() {
- let rename = node.rename.unwrap_or(node.name).name;
- (module_path.clone(), node.name.name, rename)
- } else {
- let name = match module_path.last() {
- Some(ident) => ident.name,
- None => {
- resolve_error(
- self,
- source_item.span,
- ResolutionError::
- SelfImportOnlyInImportListWithNonEmptyPrefix
- );
- continue;
- }
- };
- let module_path = module_path.split_last().unwrap().1;
- let rename = node.rename.map(|i| i.name).unwrap_or(name);
- (module_path.to_vec(), name, rename)
- }
- };
- let subclass = SingleImport {
- target: rename,
- source: name,
- result: self.per_ns(|_, _| Cell::new(Err(Undetermined))),
- };
- let id = source_item.node.id;
- self.add_import_directive(
- module_path, subclass, source_item.span, id, vis, expansion,
- );
+ // Disallow `use $crate;`
+ if source.ident.name == kw::DollarCrate && module_path.is_empty() {
+ let crate_root = self.r.resolve_crate_root(source.ident);
+ let crate_name = match crate_root.kind {
+ ModuleKind::Def(.., name) => name,
+ ModuleKind::Block(..) => unreachable!(),
+ };
+ // HACK(eddyb) unclear how good this is, but keeping `$crate`
+ // in `source` breaks `src/test/compile-fail/import-crate-var.rs`,
+ // while the current crate doesn't have a valid `crate_name`.
+ if crate_name != kw::Invalid {
+ // `crate_name` should not be interpreted as relative.
+ module_path.push(Segment {
+ ident: Ident { name: kw::PathRoot, span: source.ident.span },
+ id: Some(self.r.next_node_id()),
+ });
+ source.ident.name = crate_name;
}
+ if rename.is_none() {
+ ident.name = crate_name;
+ }
+
+ self.r
+ .session
+ .struct_span_err(item.span, "`$crate` may not be imported")
+ .emit();
}
- ViewPathGlob(_) => {
- let subclass = GlobImport {
- is_prelude: is_prelude,
- max_vis: Cell::new(ty::Visibility::PrivateExternal),
- };
- self.add_import_directive(
- module_path, subclass, view_path.span, item.id, vis, expansion,
- );
+ }
+
+ if ident.name == kw::Crate {
+ self.r.session.span_err(
+ ident.span,
+ "crate root imports need to be explicitly named: \
+ `use crate as name;`",
+ );
+ }
+
+ let kind = ImportKind::Single {
+ source: source.ident,
+ target: ident,
+ source_bindings: PerNS {
+ type_ns: Cell::new(Err(Determinacy::Undetermined)),
+ value_ns: Cell::new(Err(Determinacy::Undetermined)),
+ macro_ns: Cell::new(Err(Determinacy::Undetermined)),
+ },
+ target_bindings: PerNS {
+ type_ns: Cell::new(None),
+ value_ns: Cell::new(None),
+ macro_ns: Cell::new(None),
+ },
+ type_ns_only,
+ nested,
+ };
+ self.add_import(
+ module_path,
+ kind,
+ use_tree.span,
+ id,
+ item,
+ root_span,
+ item.id,
+ vis,
+ );
+ }
+ ast::UseTreeKind::Glob => {
+ let kind = ImportKind::Glob {
+ is_prelude: attr::contains_name(&item.attrs, sym::prelude_import),
+ max_vis: Cell::new(ty::Visibility::Invisible),
+ };
+ self.add_import(prefix, kind, use_tree.span, id, item, root_span, item.id, vis);
+ }
+ ast::UseTreeKind::Nested(ref items) => {
+ // Ensure there is at most one `self` in the list
+ let self_spans = items
+ .iter()
+ .filter_map(|&(ref use_tree, _)| {
+ if let ast::UseTreeKind::Simple(..) = use_tree.kind {
+ if use_tree.ident().name == kw::SelfLower {
+ return Some(use_tree.span);
+ }
+ }
+
+ None
+ })
+ .collect::<Vec<_>>();
+ if self_spans.len() > 1 {
+ let mut e = self.r.into_struct_error(
+ self_spans[0],
+ ResolutionError::SelfImportCanOnlyAppearOnceInTheList,
+ );
+
+ for other_span in self_spans.iter().skip(1) {
+ e.span_label(*other_span, "another `self` import appears here");
}
+
+ e.emit();
}
+
+ for &(ref tree, id) in items {
+ self.build_reduced_graph_for_use_tree(
+ // This particular use tree
+ tree, id, &prefix, true, // The whole `use` item
+ item, vis, root_span,
+ );
+ }
+
+ // Empty groups `a::b::{}` are turned into synthetic `self` imports
+ // `a::b::c::{self as _}`, so that their prefixes are correctly
+ // resolved and checked for privacy/stability/etc.
+ if items.is_empty() && !empty_for_self(&prefix) {
+ let new_span = prefix[prefix.len() - 1].ident.span;
+ let tree = ast::UseTree {
+ prefix: ast::Path::from_ident(Ident::new(kw::SelfLower, new_span)),
+ kind: ast::UseTreeKind::Simple(
+ Some(Ident::new(kw::Underscore, new_span)),
+ ast::DUMMY_NODE_ID,
+ ast::DUMMY_NODE_ID,
+ ),
+ span: use_tree.span,
+ };
+ self.build_reduced_graph_for_use_tree(
+ // This particular use tree
+ &tree,
+ id,
+ &prefix,
+ true,
+ // The whole `use` item
+ item,
+ ty::Visibility::Invisible,
+ root_span,
+ );
+ }
+ }
+ }
+ }
+
+ /// Constructs the reduced graph for one item.
+ fn build_reduced_graph_for_item(&mut self, item: &'b Item) {
+ let parent_scope = &self.parent_scope;
+ let parent = parent_scope.module;
+ let expansion = parent_scope.expansion;
+ let ident = item.ident;
+ let sp = item.span;
+ let vis = self.resolve_visibility(&item.vis);
+
+ match item.kind {
+ ItemKind::Use(ref use_tree) => {
+ self.build_reduced_graph_for_use_tree(
+ // This particular use tree
+ use_tree,
+ item.id,
+ &[],
+ false,
+ // The whole `use` item
+ item,
+ vis,
+ use_tree.span,
+ );
}
- ItemKind::ExternCrate(_) => {
- self.crate_loader.process_item(item, &self.definitions);
+ ItemKind::ExternCrate(orig_name) => {
+ let module = if orig_name.is_none() && ident.name == kw::SelfLower {
+ self.r
+ .session
+ .struct_span_err(item.span, "`extern crate self;` requires renaming")
+ .span_suggestion(
+ item.span,
+ "try",
+ "extern crate self as name;".into(),
+ Applicability::HasPlaceholders,
+ )
+ .emit();
+ return;
+ } else if orig_name == Some(kw::SelfLower) {
+ self.r.graph_root
+ } else {
+ let def_id = self.r.definitions.local_def_id(item.id);
+ let crate_id =
+ self.r.crate_loader.process_extern_crate(item, &self.r.definitions);
+ self.r.extern_crate_map.insert(def_id, crate_id);
+ self.r.get_module(DefId { krate: crate_id, index: CRATE_DEF_INDEX })
+ };
- // n.b. we don't need to look at the path option here, because cstore already did
- let crate_id = self.session.cstore.extern_mod_stmt_cnum(item.id).unwrap();
- let module = self.get_extern_crate_root(crate_id);
- let binding = (module, ty::Visibility::Public, sp, expansion).to_name_binding();
- let binding = self.arenas.alloc_name_binding(binding);
- let directive = self.arenas.alloc_import_directive(ImportDirective {
+ let used = self.process_macro_use_imports(item, module);
+ let binding =
+ (module, ty::Visibility::Public, sp, expansion).to_name_binding(self.r.arenas);
+ let import = self.r.arenas.alloc_import(Import {
+ kind: ImportKind::ExternCrate { source: orig_name, target: ident },
+ root_id: item.id,
id: item.id,
- parent: parent,
- imported_module: Cell::new(Some(module)),
- subclass: ImportDirectiveSubclass::ExternCrate,
+ parent_scope: self.parent_scope,
+ imported_module: Cell::new(Some(ModuleOrUniformRoot::Module(module))),
+ has_attributes: !item.attrs.is_empty(),
+ use_span_with_attributes: item.span_with_attributes(),
+ use_span: item.span,
+ root_span: item.span,
span: item.span,
module_path: Vec::new(),
vis: Cell::new(vis),
- expansion: expansion,
+ used: Cell::new(used),
});
- let imported_binding = self.import(binding, directive);
- self.define(parent, name, TypeNS, imported_binding);
- self.populate_module_if_necessary(module);
- self.process_legacy_macro_imports(item, module, expansion);
+ self.r.potentially_unused_imports.push(import);
+ let imported_binding = self.r.import(binding, import);
+ if ptr::eq(parent, self.r.graph_root) {
+ if let Some(entry) = self.r.extern_prelude.get(&ident.normalize_to_macros_2_0())
+ {
+ if expansion != ExpnId::root()
+ && orig_name.is_some()
+ && entry.extern_crate_item.is_none()
+ {
+ let msg = "macro-expanded `extern crate` items cannot \
+ shadow names passed with `--extern`";
+ self.r.session.span_err(item.span, msg);
+ }
+ }
+ let entry =
+ self.r.extern_prelude.entry(ident.normalize_to_macros_2_0()).or_insert(
+ ExternPreludeEntry {
+ extern_crate_item: None,
+ introduced_by_item: true,
+ },
+ );
+ entry.extern_crate_item = Some(imported_binding);
+ if orig_name.is_some() {
+ entry.introduced_by_item = true;
+ }
+ }
+ self.r.define(parent, ident, TypeNS, imported_binding);
}
- ItemKind::Mod(..) if item.ident == keywords::Invalid.ident() => {} // Crate root
+ ItemKind::Mod(..) if ident.name == kw::Invalid => {} // Crate root
ItemKind::Mod(..) => {
- let def = Def::Mod(self.definitions.local_def_id(item.id));
- let module = self.arenas.alloc_module(ModuleS {
+ let def_id = self.r.definitions.local_def_id(item.id);
+ let module_kind = ModuleKind::Def(DefKind::Mod, def_id.to_def_id(), ident.name);
+ let module = self.r.arenas.alloc_module(ModuleData {
no_implicit_prelude: parent.no_implicit_prelude || {
- attr::contains_name(&item.attrs, "no_implicit_prelude")
+ attr::contains_name(&item.attrs, sym::no_implicit_prelude)
},
- normal_ancestor_id: Some(item.id),
- ..ModuleS::new(Some(parent), ModuleKind::Def(def, name))
+ ..ModuleData::new(
+ Some(parent),
+ module_kind,
+ def_id.to_def_id(),
+ expansion,
+ item.span,
+ )
});
- self.define(parent, name, TypeNS, (module, vis, sp, expansion));
- self.module_map.insert(item.id, module);
+ self.r.define(parent, ident, TypeNS, (module, vis, sp, expansion));
+ self.r.module_map.insert(def_id, module);
// Descend into the module.
- self.current_module = module;
+ self.parent_scope.module = module;
}
- ItemKind::ForeignMod(..) => self.crate_loader.process_item(item, &self.definitions),
-
// These items live in the value namespace.
- ItemKind::Static(_, m, _) => {
- let mutbl = m == Mutability::Mutable;
- let def = Def::Static(self.definitions.local_def_id(item.id), mutbl);
- self.define(parent, name, ValueNS, (def, vis, sp, expansion));
+ ItemKind::Static(..) => {
+ let res =
+ Res::Def(DefKind::Static, self.r.definitions.local_def_id(item.id).to_def_id());
+ self.r.define(parent, ident, ValueNS, (res, vis, sp, expansion));
}
ItemKind::Const(..) => {
- let def = Def::Const(self.definitions.local_def_id(item.id));
- self.define(parent, name, ValueNS, (def, vis, sp, expansion));
+ let res =
+ Res::Def(DefKind::Const, self.r.definitions.local_def_id(item.id).to_def_id());
+ self.r.define(parent, ident, ValueNS, (res, vis, sp, expansion));
}
ItemKind::Fn(..) => {
- let def = Def::Fn(self.definitions.local_def_id(item.id));
- self.define(parent, name, ValueNS, (def, vis, sp, expansion));
+ let res =
+ Res::Def(DefKind::Fn, self.r.definitions.local_def_id(item.id).to_def_id());
+ self.r.define(parent, ident, ValueNS, (res, vis, sp, expansion));
+
+ // Functions introducing procedural macros reserve a slot
+ // in the macro namespace as well (see #52225).
+ self.define_macro(item);
}
// These items live in the type namespace.
- ItemKind::Ty(..) => {
- let def = Def::TyAlias(self.definitions.local_def_id(item.id));
- self.define(parent, name, TypeNS, (def, vis, sp, expansion));
+ ItemKind::TyAlias(_, _, _, ref ty) => {
+ let def_kind = match ty.as_deref().and_then(|ty| ty.kind.opaque_top_hack()) {
+ None => DefKind::TyAlias,
+ Some(_) => DefKind::OpaqueTy,
+ };
+ let res = Res::Def(def_kind, self.r.definitions.local_def_id(item.id).to_def_id());
+ self.r.define(parent, ident, TypeNS, (res, vis, sp, expansion));
}
- ItemKind::Enum(ref enum_definition, _) => {
- let def = Def::Enum(self.definitions.local_def_id(item.id));
- let module = self.new_module(parent, ModuleKind::Def(def, name), true);
- self.define(parent, name, TypeNS, (module, vis, sp, expansion));
+ ItemKind::Enum(_, _) => {
+ let def_id = self.r.definitions.local_def_id(item.id).to_def_id();
+ self.r.variant_vis.insert(def_id, vis);
+ let module_kind = ModuleKind::Def(DefKind::Enum, def_id, ident.name);
+ let module = self.r.new_module(
+ parent,
+ module_kind,
+ parent.normal_ancestor_id,
+ expansion,
+ item.span,
+ );
+ self.r.define(parent, ident, TypeNS, (module, vis, sp, expansion));
+ self.parent_scope.module = module;
+ }
- for variant in &(*enum_definition).variants {
- self.build_reduced_graph_for_variant(variant, module, vis, expansion);
- }
+ ItemKind::TraitAlias(..) => {
+ let res = Res::Def(
+ DefKind::TraitAlias,
+ self.r.definitions.local_def_id(item.id).to_def_id(),
+ );
+ self.r.define(parent, ident, TypeNS, (res, vis, sp, expansion));
}
// These items live in both the type and value namespaces.
- ItemKind::Struct(ref struct_def, _) => {
+ ItemKind::Struct(ref vdata, _) => {
// Define a name in the type namespace.
- let def = Def::Struct(self.definitions.local_def_id(item.id));
- self.define(parent, name, TypeNS, (def, vis, sp, expansion));
+ let def_id = self.r.definitions.local_def_id(item.id).to_def_id();
+ let res = Res::Def(DefKind::Struct, def_id);
+ self.r.define(parent, ident, TypeNS, (res, vis, sp, expansion));
+
+ // Record field names for error reporting.
+ self.insert_field_names_local(def_id, vdata);
// If this is a tuple or unit struct, define a name
// in the value namespace as well.
- if !struct_def.is_struct() {
- let ctor_def = Def::StructCtor(self.definitions.local_def_id(struct_def.id()),
- CtorKind::from_ast(struct_def));
- self.define(parent, name, ValueNS, (ctor_def, vis, sp, expansion));
+ if let Some(ctor_node_id) = vdata.ctor_id() {
+ // If the structure is marked as non_exhaustive then lower the visibility
+ // to within the crate.
+ let mut ctor_vis = if vis == ty::Visibility::Public
+ && attr::contains_name(&item.attrs, sym::non_exhaustive)
+ {
+ ty::Visibility::Restricted(DefId::local(CRATE_DEF_INDEX))
+ } else {
+ vis
+ };
+
+ for field in vdata.fields() {
+ // NOTE: The field may be an expansion placeholder, but expansion sets
+ // correct visibilities for unnamed field placeholders specifically, so the
+ // constructor visibility should still be determined correctly.
+ if let Ok(field_vis) = self.resolve_visibility_speculative(&field.vis, true)
+ {
+ if ctor_vis.is_at_least(field_vis, &*self.r) {
+ ctor_vis = field_vis;
+ }
+ }
+ }
+ let ctor_res = Res::Def(
+ DefKind::Ctor(CtorOf::Struct, CtorKind::from_ast(vdata)),
+ self.r.definitions.local_def_id(ctor_node_id).to_def_id(),
+ );
+ self.r.define(parent, ident, ValueNS, (ctor_res, ctor_vis, sp, expansion));
+ self.r.struct_constructors.insert(def_id, (ctor_res, ctor_vis));
}
-
- // Record field names for error reporting.
- let field_names = struct_def.fields().iter().filter_map(|field| {
- self.resolve_visibility(&field.vis);
- field.ident.map(|ident| ident.name)
- }).collect();
- let item_def_id = self.definitions.local_def_id(item.id);
- self.insert_field_names(item_def_id, field_names);
}
ItemKind::Union(ref vdata, _) => {
- let def = Def::Union(self.definitions.local_def_id(item.id));
- self.define(parent, name, TypeNS, (def, vis, sp, expansion));
+ let def_id = self.r.definitions.local_def_id(item.id).to_def_id();
+ let res = Res::Def(DefKind::Union, def_id);
+ self.r.define(parent, ident, TypeNS, (res, vis, sp, expansion));
// Record field names for error reporting.
- let field_names = vdata.fields().iter().filter_map(|field| {
- self.resolve_visibility(&field.vis);
- field.ident.map(|ident| ident.name)
- }).collect();
- let item_def_id = self.definitions.local_def_id(item.id);
- self.insert_field_names(item_def_id, field_names);
+ self.insert_field_names_local(def_id, vdata);
}
- ItemKind::DefaultImpl(..) | ItemKind::Impl(..) => {}
-
ItemKind::Trait(..) => {
- let def_id = self.definitions.local_def_id(item.id);
+ let def_id = self.r.definitions.local_def_id(item.id).to_def_id();
// Add all the items within to a new module.
- let module =
- self.new_module(parent, ModuleKind::Def(Def::Trait(def_id), name), true);
- self.define(parent, name, TypeNS, (module, vis, sp, expansion));
- self.current_module = module;
+ let module_kind = ModuleKind::Def(DefKind::Trait, def_id, ident.name);
+ let module = self.r.new_module(
+ parent,
+ module_kind,
+ parent.normal_ancestor_id,
+ expansion,
+ item.span,
+ );
+ self.r.define(parent, ident, TypeNS, (module, vis, sp, expansion));
+ self.parent_scope.module = module;
}
- ItemKind::Mac(_) => panic!("unexpanded macro in resolve!"),
- }
- }
-
- // Constructs the reduced graph for one variant. Variants exist in the
- // type and value namespaces.
- fn build_reduced_graph_for_variant(&mut self,
- variant: &Variant,
- parent: Module<'b>,
- vis: ty::Visibility,
- expansion: Mark) {
- let name = variant.node.name.name;
- let def_id = self.definitions.local_def_id(variant.node.data.id());
- // Define a name in the type namespace.
- let def = Def::Variant(def_id);
- self.define(parent, name, TypeNS, (def, vis, variant.span, expansion));
+ // These items do not add names to modules.
+ ItemKind::Impl { .. } | ItemKind::ForeignMod(..) | ItemKind::GlobalAsm(..) => {}
- // Define a constructor name in the value namespace.
- // Braced variants, unlike structs, generate unusable names in
- // value namespace, they are reserved for possible future use.
- let ctor_kind = CtorKind::from_ast(&variant.node.data);
- let ctor_def = Def::VariantCtor(def_id, ctor_kind);
- self.define(parent, name, ValueNS, (ctor_def, vis, variant.span, expansion));
+ ItemKind::MacroDef(..) | ItemKind::MacCall(_) => unreachable!(),
+ }
}
/// Constructs the reduced graph for one foreign item.
- fn build_reduced_graph_for_foreign_item(&mut self, item: &ForeignItem, expansion: Mark) {
- let parent = self.current_module;
- let name = item.ident.name;
-
- let def = match item.node {
- ForeignItemKind::Fn(..) => {
- Def::Fn(self.definitions.local_def_id(item.id))
- }
- ForeignItemKind::Static(_, m) => {
- Def::Static(self.definitions.local_def_id(item.id), m)
- }
+ fn build_reduced_graph_for_foreign_item(&mut self, item: &ForeignItem) {
+ let (res, ns) = match item.kind {
+ ForeignItemKind::Fn(..) => (
+ Res::Def(DefKind::Fn, self.r.definitions.local_def_id(item.id).to_def_id()),
+ ValueNS,
+ ),
+ ForeignItemKind::Static(..) => (
+ Res::Def(DefKind::Static, self.r.definitions.local_def_id(item.id).to_def_id()),
+ ValueNS,
+ ),
+ ForeignItemKind::TyAlias(..) => (
+ Res::Def(DefKind::ForeignTy, self.r.definitions.local_def_id(item.id).to_def_id()),
+ TypeNS,
+ ),
+ ForeignItemKind::MacCall(_) => unreachable!(),
};
+ let parent = self.parent_scope.module;
+ let expansion = self.parent_scope.expansion;
let vis = self.resolve_visibility(&item.vis);
- self.define(parent, name, ValueNS, (def, vis, item.span, expansion));
+ self.r.define(parent, item.ident, ns, (res, vis, item.span, expansion));
}
fn build_reduced_graph_for_block(&mut self, block: &Block) {
- let parent = self.current_module;
+ let parent = self.parent_scope.module;
+ let expansion = self.parent_scope.expansion;
if self.block_needs_anonymous_module(block) {
- let block_id = block.id;
-
- debug!("(building reduced graph for block) creating a new anonymous module for block \
- {}",
- block_id);
-
- let new_module = self.new_module(parent, ModuleKind::Block(block_id), true);
- self.module_map.insert(block_id, new_module);
- self.current_module = new_module; // Descend into the block.
+ let module = self.r.new_module(
+ parent,
+ ModuleKind::Block(block.id),
+ parent.normal_ancestor_id,
+ expansion,
+ block.span,
+ );
+ self.r.block_map.insert(block.id, module);
+ self.parent_scope.module = module; // Descend into the block.
}
}
/// Builds the reduced graph for a single item in an external crate.
- fn build_reduced_graph_for_external_crate_def(&mut self, parent: Module<'b>, child: Export) {
- let name = child.name;
- let def = child.def;
- let def_id = def.def_id();
- let vis = match def {
- Def::Macro(..) => ty::Visibility::Public,
- _ if parent.is_trait() => ty::Visibility::Public,
- _ => self.session.cstore.visibility(def_id),
- };
-
- match def {
- Def::Mod(..) | Def::Enum(..) => {
- let module = self.new_module(parent, ModuleKind::Def(def, name), false);
- self.define(parent, name, TypeNS, (module, vis, DUMMY_SP, Mark::root()));
- }
- Def::Variant(..) => {
- self.define(parent, name, TypeNS, (def, vis, DUMMY_SP, Mark::root()));
- }
- Def::VariantCtor(..) => {
- self.define(parent, name, ValueNS, (def, vis, DUMMY_SP, Mark::root()));
- }
- Def::Fn(..) |
- Def::Static(..) |
- Def::Const(..) |
- Def::AssociatedConst(..) |
- Def::Method(..) => {
- self.define(parent, name, ValueNS, (def, vis, DUMMY_SP, Mark::root()));
- }
- Def::Trait(..) => {
- let module = self.new_module(parent, ModuleKind::Def(def, name), false);
- self.define(parent, name, TypeNS, (module, vis, DUMMY_SP, Mark::root()));
-
- // If this is a trait, add all the trait item names to the trait info.
- let trait_item_def_ids = self.session.cstore.associated_item_def_ids(def_id);
- for trait_item_def_id in trait_item_def_ids {
- let trait_item_name = self.session.cstore.def_key(trait_item_def_id)
- .disambiguated_data.data.get_opt_name()
- .expect("opt_item_name returned None for trait");
- self.trait_item_map.insert((trait_item_name, def_id), false);
- }
- }
- Def::TyAlias(..) | Def::AssociatedTy(..) => {
- self.define(parent, name, TypeNS, (def, vis, DUMMY_SP, Mark::root()));
+ fn build_reduced_graph_for_external_crate_res(&mut self, child: Export<NodeId>) {
+ let parent = self.parent_scope.module;
+ let Export { ident, res, vis, span } = child;
+ let expansion = ExpnId::root(); // FIXME(jseyfried) intercrate hygiene
+ // Record primary definitions.
+ match res {
+ Res::Def(kind @ (DefKind::Mod | DefKind::Enum | DefKind::Trait), def_id) => {
+ let module = self.r.new_module(
+ parent,
+ ModuleKind::Def(kind, def_id, ident.name),
+ def_id,
+ expansion,
+ span,
+ );
+ self.r.define(parent, ident, TypeNS, (module, vis, span, expansion));
}
- Def::Struct(..) => {
- self.define(parent, name, TypeNS, (def, vis, DUMMY_SP, Mark::root()));
-
- // Record field names for error reporting.
- let field_names = self.session.cstore.struct_field_names(def_id);
- self.insert_field_names(def_id, field_names);
+ Res::Def(
+ DefKind::Struct
+ | DefKind::Union
+ | DefKind::Variant
+ | DefKind::TyAlias
+ | DefKind::ForeignTy
+ | DefKind::OpaqueTy
+ | DefKind::TraitAlias
+ | DefKind::AssocTy
+ | DefKind::AssocOpaqueTy,
+ _,
+ )
+ | Res::PrimTy(..)
+ | Res::ToolMod => self.r.define(parent, ident, TypeNS, (res, vis, span, expansion)),
+ Res::Def(
+ DefKind::Fn
+ | DefKind::AssocFn
+ | DefKind::Static
+ | DefKind::Const
+ | DefKind::AssocConst
+ | DefKind::Ctor(..),
+ _,
+ ) => self.r.define(parent, ident, ValueNS, (res, vis, span, expansion)),
+ Res::Def(DefKind::Macro(..), _) | Res::NonMacroAttr(..) => {
+ self.r.define(parent, ident, MacroNS, (res, vis, span, expansion))
}
- Def::StructCtor(..) => {
- self.define(parent, name, ValueNS, (def, vis, DUMMY_SP, Mark::root()));
- }
- Def::Union(..) => {
- self.define(parent, name, TypeNS, (def, vis, DUMMY_SP, Mark::root()));
-
- // Record field names for error reporting.
- let field_names = self.session.cstore.struct_field_names(def_id);
+ Res::Def(
+ DefKind::TyParam
+ | DefKind::ConstParam
+ | DefKind::ExternCrate
+ | DefKind::Use
+ | DefKind::ForeignMod
+ | DefKind::AnonConst
+ | DefKind::Field
+ | DefKind::LifetimeParam
+ | DefKind::GlobalAsm
+ | DefKind::Closure
+ | DefKind::Impl
+ | DefKind::Generator,
+ _,
+ )
+ | Res::Local(..)
+ | Res::SelfTy(..)
+ | Res::SelfCtor(..)
+ | Res::Err => bug!("unexpected resolution: {:?}", res),
+ }
+ // Record some extra data for better diagnostics.
+ let cstore = self.r.cstore();
+ match res {
+ Res::Def(DefKind::Struct | DefKind::Union, def_id) => {
+ let field_names = cstore.struct_field_names_untracked(def_id, self.r.session);
self.insert_field_names(def_id, field_names);
}
- Def::Macro(..) => {
- self.define(parent, name, MacroNS, (def, vis, DUMMY_SP, Mark::root()));
+ Res::Def(DefKind::AssocFn, def_id) => {
+ if cstore
+ .associated_item_cloned_untracked(def_id, self.r.session)
+ .fn_has_self_parameter
+ {
+ self.r.has_self.insert(def_id);
+ }
}
- Def::Local(..) |
- Def::PrimTy(..) |
- Def::TyParam(..) |
- Def::Upvar(..) |
- Def::Label(..) |
- Def::SelfTy(..) |
- Def::Err => {
- bug!("unexpected definition: {:?}", def);
+ Res::Def(DefKind::Ctor(CtorOf::Struct, ..), def_id) => {
+ let parent = cstore.def_key(def_id).parent;
+ if let Some(struct_def_id) = parent.map(|index| DefId { index, ..def_id }) {
+ self.r.struct_constructors.insert(struct_def_id, (res, vis));
+ }
}
+ _ => {}
}
}
- fn get_extern_crate_root(&mut self, cnum: CrateNum) -> Module<'b> {
- let def_id = DefId { krate: cnum, index: CRATE_DEF_INDEX };
- let name = self.session.cstore.crate_name(cnum);
- let macros_only = self.session.cstore.dep_kind(cnum).macros_only();
- let arenas = self.arenas;
- *self.extern_crate_roots.entry((cnum, macros_only)).or_insert_with(|| {
- arenas.alloc_module(ModuleS {
- populated: Cell::new(false),
- ..ModuleS::new(None, ModuleKind::Def(Def::Mod(def_id), name))
- })
- })
- }
-
- pub fn get_macro(&mut self, def: Def) -> Rc<SyntaxExtension> {
- let def_id = match def {
- Def::Macro(def_id) => def_id,
- _ => panic!("Expected Def::Macro(..)"),
- };
- if let Some(ext) = self.macro_map.get(&def_id) {
- return ext.clone();
- }
-
- let mut macro_rules = match self.session.cstore.load_macro(def_id, &self.session) {
- LoadedMacro::MacroRules(macro_rules) => macro_rules,
- LoadedMacro::ProcMacro(ext) => return ext,
- };
-
- let mark = Mark::fresh();
- let invocation = self.arenas.alloc_invocation_data(InvocationData {
- module: Cell::new(self.get_extern_crate_root(def_id.krate)),
- def_index: CRATE_DEF_INDEX,
- const_integer: false,
- legacy_scope: Cell::new(LegacyScope::Empty),
- expansion: Cell::new(LegacyScope::Empty),
- });
- self.invocations.insert(mark, invocation);
- macro_rules.body = mark_tts(¯o_rules.body, mark);
- let ext = Rc::new(macro_rules::compile(&self.session.parse_sess, ¯o_rules));
- self.macro_map.insert(def_id, ext.clone());
- ext
- }
-
- /// Ensures that the reduced graph rooted at the given external module
- /// is built, building it if it is not.
- pub fn populate_module_if_necessary(&mut self, module: Module<'b>) {
- if module.populated.get() { return }
- for child in self.session.cstore.item_children(module.def_id().unwrap()) {
- self.build_reduced_graph_for_external_crate_def(module, child);
- }
- module.populated.set(true)
- }
-
- fn legacy_import_macro(&mut self,
- name: Name,
- binding: &'b NameBinding<'b>,
- span: Span,
- allow_shadowing: bool) {
- self.used_crates.insert(binding.def().def_id().krate);
- self.macro_names.insert(name);
- if self.builtin_macros.insert(name, binding).is_some() && !allow_shadowing {
+ fn add_macro_use_binding(
+ &mut self,
+ name: Symbol,
+ binding: &'a NameBinding<'a>,
+ span: Span,
+ allow_shadowing: bool,
+ ) {
+ if self.r.macro_use_prelude.insert(name, binding).is_some() && !allow_shadowing {
let msg = format!("`{}` is already in scope", name);
let note =
"macro-expanded `#[macro_use]`s may not shadow existing macros (see RFC 1560)";
- self.session.struct_span_err(span, &msg).note(note).emit();
+ self.r.session.struct_span_err(span, &msg).note(note).emit();
}
}
- fn process_legacy_macro_imports(&mut self, item: &Item, module: Module<'b>, expansion: Mark) {
- let allow_shadowing = expansion == Mark::root();
- let legacy_imports = self.legacy_macro_imports(&item.attrs);
- let cnum = module.def_id().unwrap().krate;
-
- // `#[macro_use]` and `#[macro_reexport]` are only allowed at the crate root.
- if self.current_module.parent.is_some() && legacy_imports != LegacyMacroImports::default() {
- span_err!(self.session, item.span, E0468,
- "an `extern crate` loading macros must be at the crate root");
- } else if !self.use_extern_macros &&
- self.session.cstore.dep_kind(cnum).macros_only() &&
- legacy_imports == LegacyMacroImports::default() {
- let msg = "custom derive crates and `#[no_link]` crates have no effect without \
- `#[macro_use]`";
- self.session.span_warn(item.span, msg);
- self.used_crates.insert(cnum); // Avoid the normal unused extern crate warning
+ /// Returns `true` if we should consider the underlying `extern crate` to be used.
+ fn process_macro_use_imports(&mut self, item: &Item, module: Module<'a>) -> bool {
+ let mut import_all = None;
+ let mut single_imports = Vec::new();
+ for attr in &item.attrs {
+ if attr.check_name(sym::macro_use) {
+ if self.parent_scope.module.parent.is_some() {
+ struct_span_err!(
+ self.r.session,
+ item.span,
+ E0468,
+ "an `extern crate` loading macros must be at the crate root"
+ )
+ .emit();
+ }
+ if let ItemKind::ExternCrate(Some(orig_name)) = item.kind {
+ if orig_name == kw::SelfLower {
+ self.r
+ .session
+ .struct_span_err(
+ attr.span,
+ "`#[macro_use]` is not supported on `extern crate self`",
+ )
+ .emit();
+ }
+ }
+ let ill_formed =
+ |span| struct_span_err!(self.r.session, span, E0466, "bad macro import").emit();
+ match attr.meta() {
+ Some(meta) => match meta.kind {
+ MetaItemKind::Word => {
+ import_all = Some(meta.span);
+ break;
+ }
+ MetaItemKind::List(nested_metas) => {
+ for nested_meta in nested_metas {
+ match nested_meta.ident() {
+ Some(ident) if nested_meta.is_word() => {
+ single_imports.push(ident)
+ }
+ _ => ill_formed(nested_meta.span()),
+ }
+ }
+ }
+ MetaItemKind::NameValue(..) => ill_formed(meta.span),
+ },
+ None => ill_formed(attr.span),
+ }
+ }
}
- if let Some(span) = legacy_imports.import_all {
- module.for_each_child(|name, ns, binding| if ns == MacroNS {
- self.legacy_import_macro(name, binding, span, allow_shadowing);
+ let macro_use_import = |this: &Self, span| {
+ this.r.arenas.alloc_import(Import {
+ kind: ImportKind::MacroUse,
+ root_id: item.id,
+ id: item.id,
+ parent_scope: this.parent_scope,
+ imported_module: Cell::new(Some(ModuleOrUniformRoot::Module(module))),
+ use_span_with_attributes: item.span_with_attributes(),
+ has_attributes: !item.attrs.is_empty(),
+ use_span: item.span,
+ root_span: span,
+ span,
+ module_path: Vec::new(),
+ vis: Cell::new(ty::Visibility::Restricted(DefId::local(CRATE_DEF_INDEX))),
+ used: Cell::new(false),
+ })
+ };
+
+ let allow_shadowing = self.parent_scope.expansion == ExpnId::root();
+ if let Some(span) = import_all {
+ let import = macro_use_import(self, span);
+ self.r.potentially_unused_imports.push(import);
+ module.for_each_child(self, |this, ident, ns, binding| {
+ if ns == MacroNS {
+ let imported_binding = this.r.import(binding, import);
+ this.add_macro_use_binding(ident.name, imported_binding, span, allow_shadowing);
+ }
});
} else {
- for (name, span) in legacy_imports.imports {
- let result = self.resolve_name_in_module(module, name, MacroNS, false, None);
+ for ident in single_imports.iter().cloned() {
+ let result = self.r.resolve_ident_in_module(
+ ModuleOrUniformRoot::Module(module),
+ ident,
+ MacroNS,
+ &self.parent_scope,
+ false,
+ ident.span,
+ );
if let Ok(binding) = result {
- self.legacy_import_macro(name, binding, span, allow_shadowing);
+ let import = macro_use_import(self, ident.span);
+ self.r.potentially_unused_imports.push(import);
+ let imported_binding = self.r.import(binding, import);
+ self.add_macro_use_binding(
+ ident.name,
+ imported_binding,
+ ident.span,
+ allow_shadowing,
+ );
} else {
- span_err!(self.session, span, E0469, "imported macro not found");
+ struct_span_err!(self.r.session, ident.span, E0469, "imported macro not found")
+ .emit();
}
}
}
- for (name, span) in legacy_imports.reexports {
- let krate = module.def_id().unwrap().krate;
- self.used_crates.insert(krate);
- self.session.cstore.export_macros(krate);
- let result = self.resolve_name_in_module(module, name, MacroNS, false, None);
- if let Ok(binding) = result {
- self.macro_exports.push(Export { name: name, def: binding.def() });
- } else {
- span_err!(self.session, span, E0470, "reexported macro not found");
- }
- }
+ import_all.is_some() || !single_imports.is_empty()
}
- // does this attribute list contain "macro_use"?
+ /// Returns `true` if this attribute list contains `macro_use`.
fn contains_macro_use(&mut self, attrs: &[ast::Attribute]) -> bool {
for attr in attrs {
- if attr.check_name("macro_escape") {
- let msg = "macro_escape is a deprecated synonym for macro_use";
- let mut err = self.session.struct_span_warn(attr.span, msg);
+ if attr.check_name(sym::macro_escape) {
+ let msg = "`#[macro_escape]` is a deprecated synonym for `#[macro_use]`";
+ let mut err = self.r.session.struct_span_warn(attr.span, msg);
if let ast::AttrStyle::Inner = attr.style {
- err.help("consider an outer attribute, #[macro_use] mod ...").emit();
+ err.help("try an outer attribute: `#[macro_use]`").emit();
} else {
err.emit();
}
- } else if !attr.check_name("macro_use") {
+ } else if !attr.check_name(sym::macro_use) {
continue;
}
if !attr.is_word() {
- self.session.span_err(attr.span, "arguments to macro_use are not allowed here");
+ self.r.session.span_err(attr.span, "arguments to `macro_use` are not allowed here");
}
return true;
}
false
}
- fn legacy_macro_imports(&mut self, attrs: &[ast::Attribute]) -> LegacyMacroImports {
- let mut imports = LegacyMacroImports::default();
- for attr in attrs {
- if attr.check_name("macro_use") {
- match attr.meta_item_list() {
- Some(names) => for attr in names {
- if let Some(word) = attr.word() {
- imports.imports.push((word.name(), attr.span()));
- } else {
- span_err!(self.session, attr.span(), E0466, "bad macro import");
- }
- },
- None => imports.import_all = Some(attr.span),
- }
- } else if attr.check_name("macro_reexport") {
- let bad_macro_reexport = |this: &mut Self, span| {
- span_err!(this.session, span, E0467, "bad macro reexport");
- };
- if let Some(names) = attr.meta_item_list() {
- for attr in names {
- if let Some(word) = attr.word() {
- imports.reexports.push((word.name(), attr.span()));
- } else {
- bad_macro_reexport(self, attr.span());
- }
- }
- } else {
- bad_macro_reexport(self, attr.span());
+ fn visit_invoc(&mut self, id: NodeId) -> MacroRulesScope<'a> {
+ let invoc_id = id.placeholder_to_expn_id();
+
+ self.parent_scope.module.unexpanded_invocations.borrow_mut().insert(invoc_id);
+
+ let old_parent_scope = self.r.invocation_parent_scopes.insert(invoc_id, self.parent_scope);
+ assert!(old_parent_scope.is_none(), "invocation data is reset for an invocation");
+
+ MacroRulesScope::Invocation(invoc_id)
+ }
+
+ fn proc_macro_stub(item: &ast::Item) -> Option<(MacroKind, Ident, Span)> {
+ if attr::contains_name(&item.attrs, sym::proc_macro) {
+ return Some((MacroKind::Bang, item.ident, item.span));
+ } else if attr::contains_name(&item.attrs, sym::proc_macro_attribute) {
+ return Some((MacroKind::Attr, item.ident, item.span));
+ } else if let Some(attr) = attr::find_by_name(&item.attrs, sym::proc_macro_derive) {
+ if let Some(nested_meta) = attr.meta_item_list().and_then(|list| list.get(0).cloned()) {
+ if let Some(ident) = nested_meta.ident() {
+ return Some((MacroKind::Derive, ident, ident.span));
}
}
}
- imports
+ None
}
-}
-pub struct BuildReducedGraphVisitor<'a, 'b: 'a> {
- pub resolver: &'a mut Resolver<'b>,
- pub legacy_scope: LegacyScope<'b>,
- pub expansion: Mark,
-}
+ // Mark the given macro as unused unless its name starts with `_`.
+ // Macro uses will remove items from this set, and the remaining
+ // items will be reported as `unused_macros`.
+ fn insert_unused_macro(
+ &mut self,
+ ident: Ident,
+ def_id: LocalDefId,
+ node_id: NodeId,
+ span: Span,
+ ) {
+ if !ident.as_str().starts_with('_') {
+ self.r.unused_macros.insert(def_id, (node_id, span));
+ }
+ }
-impl<'a, 'b> BuildReducedGraphVisitor<'a, 'b> {
- fn visit_invoc(&mut self, id: ast::NodeId) -> &'b InvocationData<'b> {
- let mark = Mark::from_placeholder_id(id);
- self.resolver.current_module.unresolved_invocations.borrow_mut().insert(mark);
- let invocation = self.resolver.invocations[&mark];
- invocation.module.set(self.resolver.current_module);
- invocation.legacy_scope.set(self.legacy_scope);
- invocation
+ fn define_macro(&mut self, item: &ast::Item) -> MacroRulesScope<'a> {
+ let parent_scope = self.parent_scope;
+ let expansion = parent_scope.expansion;
+ let def_id = self.r.definitions.local_def_id(item.id);
+ let (ext, ident, span, macro_rules) = match &item.kind {
+ ItemKind::MacroDef(def) => {
+ let ext = Lrc::new(self.r.compile_macro(item, self.r.session.edition()));
+ (ext, item.ident, item.span, def.macro_rules)
+ }
+ ItemKind::Fn(..) => match Self::proc_macro_stub(item) {
+ Some((macro_kind, ident, span)) => {
+ self.r.proc_macro_stubs.insert(def_id);
+ (self.r.dummy_ext(macro_kind), ident, span, false)
+ }
+ None => return parent_scope.macro_rules,
+ },
+ _ => unreachable!(),
+ };
+
+ let res = Res::Def(DefKind::Macro(ext.macro_kind()), def_id.to_def_id());
+ self.r.macro_map.insert(def_id.to_def_id(), ext);
+ self.r.local_macro_def_scopes.insert(def_id, parent_scope.module);
+
+ if macro_rules {
+ let ident = ident.normalize_to_macros_2_0();
+ self.r.macro_names.insert(ident);
+ let is_macro_export = attr::contains_name(&item.attrs, sym::macro_export);
+ let vis = if is_macro_export {
+ ty::Visibility::Public
+ } else {
+ ty::Visibility::Restricted(DefId::local(CRATE_DEF_INDEX))
+ };
+ let binding = (res, vis, span, expansion).to_name_binding(self.r.arenas);
+ self.r.set_binding_parent_module(binding, parent_scope.module);
+ self.r.all_macros.insert(ident.name, res);
+ if is_macro_export {
+ let module = self.r.graph_root;
+ self.r.define(module, ident, MacroNS, (res, vis, span, expansion, IsMacroExport));
+ } else {
+ self.r.check_reserved_macro_name(ident, res);
+ self.insert_unused_macro(ident, def_id, item.id, span);
+ }
+ MacroRulesScope::Binding(self.r.arenas.alloc_macro_rules_binding(MacroRulesBinding {
+ parent_macro_rules_scope: parent_scope.macro_rules,
+ binding,
+ ident,
+ }))
+ } else {
+ let module = parent_scope.module;
+ let vis = match item.kind {
+ // Visibilities must not be resolved non-speculatively twice
+ // and we already resolved this one as a `fn` item visibility.
+ ItemKind::Fn(..) => self
+ .resolve_visibility_speculative(&item.vis, true)
+ .unwrap_or(ty::Visibility::Public),
+ _ => self.resolve_visibility(&item.vis),
+ };
+ if vis != ty::Visibility::Public {
+ self.insert_unused_macro(ident, def_id, item.id, span);
+ }
+ self.r.define(module, ident, MacroNS, (res, vis, span, expansion));
+ self.parent_scope.macro_rules
+ }
}
}
macro_rules! method {
($visit:ident: $ty:ty, $invoc:path, $walk:ident) => {
- fn $visit(&mut self, node: &'a $ty) {
- if let $invoc(..) = node.node {
+ fn $visit(&mut self, node: &'b $ty) {
+ if let $invoc(..) = node.kind {
self.visit_invoc(node.id);
} else {
visit::$walk(self, node);
}
}
- }
+ };
}
-impl<'a, 'b> Visitor<'a> for BuildReducedGraphVisitor<'a, 'b> {
- method!(visit_impl_item: ast::ImplItem, ast::ImplItemKind::Macro, walk_impl_item);
- method!(visit_expr: ast::Expr, ast::ExprKind::Mac, walk_expr);
- method!(visit_pat: ast::Pat, ast::PatKind::Mac, walk_pat);
- method!(visit_ty: ast::Ty, ast::TyKind::Mac, walk_ty);
+impl<'a, 'b> Visitor<'b> for BuildReducedGraphVisitor<'a, 'b> {
+ method!(visit_expr: ast::Expr, ast::ExprKind::MacCall, walk_expr);
+ method!(visit_pat: ast::Pat, ast::PatKind::MacCall, walk_pat);
+ method!(visit_ty: ast::Ty, ast::TyKind::MacCall, walk_ty);
- fn visit_item(&mut self, item: &'a Item) {
- let macro_use = match item.node {
- ItemKind::Mac(..) if item.id == ast::DUMMY_NODE_ID => return, // Scope placeholder
- ItemKind::Mac(..) => {
- return self.legacy_scope = LegacyScope::Expansion(self.visit_invoc(item.id));
+ fn visit_item(&mut self, item: &'b Item) {
+ let macro_use = match item.kind {
+ ItemKind::MacroDef(..) => {
+ self.parent_scope.macro_rules = self.define_macro(item);
+ return;
}
- ItemKind::Mod(..) => self.resolver.contains_macro_use(&item.attrs),
+ ItemKind::MacCall(..) => {
+ self.parent_scope.macro_rules = self.visit_invoc(item.id);
+ return;
+ }
+ ItemKind::Mod(..) => self.contains_macro_use(&item.attrs),
_ => false,
};
-
- let (parent, legacy_scope) = (self.resolver.current_module, self.legacy_scope);
- self.resolver.build_reduced_graph_for_item(item, self.expansion);
+ let orig_current_module = self.parent_scope.module;
+ let orig_current_macro_rules_scope = self.parent_scope.macro_rules;
+ self.build_reduced_graph_for_item(item);
visit::walk_item(self, item);
- self.resolver.current_module = parent;
+ self.parent_scope.module = orig_current_module;
if !macro_use {
- self.legacy_scope = legacy_scope;
+ self.parent_scope.macro_rules = orig_current_macro_rules_scope;
}
}
- fn visit_stmt(&mut self, stmt: &'a ast::Stmt) {
- if let ast::StmtKind::Mac(..) = stmt.node {
- self.legacy_scope = LegacyScope::Expansion(self.visit_invoc(stmt.id));
+ fn visit_stmt(&mut self, stmt: &'b ast::Stmt) {
+ if let ast::StmtKind::MacCall(..) = stmt.kind {
+ self.parent_scope.macro_rules = self.visit_invoc(stmt.id);
} else {
visit::walk_stmt(self, stmt);
}
}
- fn visit_foreign_item(&mut self, foreign_item: &'a ForeignItem) {
- self.resolver.build_reduced_graph_for_foreign_item(foreign_item, self.expansion);
+ fn visit_foreign_item(&mut self, foreign_item: &'b ForeignItem) {
+ if let ForeignItemKind::MacCall(_) = foreign_item.kind {
+ self.visit_invoc(foreign_item.id);
+ return;
+ }
+
+ self.build_reduced_graph_for_foreign_item(foreign_item);
visit::walk_foreign_item(self, foreign_item);
}
- fn visit_block(&mut self, block: &'a Block) {
- let (parent, legacy_scope) = (self.resolver.current_module, self.legacy_scope);
- self.resolver.build_reduced_graph_for_block(block);
+ fn visit_block(&mut self, block: &'b Block) {
+ let orig_current_module = self.parent_scope.module;
+ let orig_current_macro_rules_scope = self.parent_scope.macro_rules;
+ self.build_reduced_graph_for_block(block);
visit::walk_block(self, block);
- self.resolver.current_module = parent;
- self.legacy_scope = legacy_scope;
+ self.parent_scope.module = orig_current_module;
+ self.parent_scope.macro_rules = orig_current_macro_rules_scope;
}
- fn visit_trait_item(&mut self, item: &'a TraitItem) {
- let parent = self.resolver.current_module;
- let def_id = parent.def_id().unwrap();
+ fn visit_assoc_item(&mut self, item: &'b AssocItem, ctxt: AssocCtxt) {
+ let parent = self.parent_scope.module;
- if let TraitItemKind::Macro(_) = item.node {
+ if let AssocItemKind::MacCall(_) = item.kind {
self.visit_invoc(item.id);
- return
+ return;
+ }
+
+ if let AssocCtxt::Impl = ctxt {
+ self.resolve_visibility(&item.vis);
+ visit::walk_assoc_item(self, item, ctxt);
+ return;
}
// Add the item to the trait info.
- let item_def_id = self.resolver.definitions.local_def_id(item.id);
- let mut is_static_method = false;
- let (def, ns) = match item.node {
- TraitItemKind::Const(..) => (Def::AssociatedConst(item_def_id), ValueNS),
- TraitItemKind::Method(ref sig, _) => {
- is_static_method = !sig.decl.has_self();
- (Def::Method(item_def_id), ValueNS)
- }
- TraitItemKind::Type(..) => (Def::AssociatedTy(item_def_id), TypeNS),
- TraitItemKind::Macro(_) => bug!(), // handled above
+ let item_def_id = self.r.definitions.local_def_id(item.id).to_def_id();
+ let (res, ns) = match item.kind {
+ AssocItemKind::Const(..) => (Res::Def(DefKind::AssocConst, item_def_id), ValueNS),
+ AssocItemKind::Fn(_, ref sig, _, _) => {
+ if sig.decl.has_self() {
+ self.r.has_self.insert(item_def_id);
+ }
+ (Res::Def(DefKind::AssocFn, item_def_id), ValueNS)
+ }
+ AssocItemKind::TyAlias(..) => (Res::Def(DefKind::AssocTy, item_def_id), TypeNS),
+ AssocItemKind::MacCall(_) => bug!(), // handled above
};
- self.resolver.trait_item_map.insert((item.ident.name, def_id), is_static_method);
-
let vis = ty::Visibility::Public;
- self.resolver.define(parent, item.ident.name, ns, (def, vis, item.span, self.expansion));
+ let expansion = self.parent_scope.expansion;
+ self.r.define(parent, item.ident, ns, (res, vis, item.span, expansion));
+
+ visit::walk_assoc_item(self, item, ctxt);
+ }
+
+ fn visit_token(&mut self, t: Token) {
+ if let token::Interpolated(nt) = t.kind {
+ if let token::NtExpr(ref expr) = *nt {
+ if let ast::ExprKind::MacCall(..) = expr.kind {
+ self.visit_invoc(expr.id);
+ }
+ }
+ }
+ }
- self.resolver.current_module = parent.parent.unwrap(); // nearest normal ancestor
- visit::walk_trait_item(self, item);
- self.resolver.current_module = parent;
+ fn visit_attribute(&mut self, attr: &'b ast::Attribute) {
+ if !attr.is_doc_comment() && attr::is_builtin_attr(attr) {
+ self.r
+ .builtin_attrs
+ .push((attr.get_normal_item().path.segments[0].ident, self.parent_scope));
+ }
+ visit::walk_attribute(self, attr);
+ }
+
+ fn visit_arm(&mut self, arm: &'b ast::Arm) {
+ if arm.is_placeholder {
+ self.visit_invoc(arm.id);
+ } else {
+ visit::walk_arm(self, arm);
+ }
+ }
+
+ fn visit_field(&mut self, f: &'b ast::Field) {
+ if f.is_placeholder {
+ self.visit_invoc(f.id);
+ } else {
+ visit::walk_field(self, f);
+ }
+ }
+
+ fn visit_field_pattern(&mut self, fp: &'b ast::FieldPat) {
+ if fp.is_placeholder {
+ self.visit_invoc(fp.id);
+ } else {
+ visit::walk_field_pattern(self, fp);
+ }
+ }
+
+ fn visit_generic_param(&mut self, param: &'b ast::GenericParam) {
+ if param.is_placeholder {
+ self.visit_invoc(param.id);
+ } else {
+ visit::walk_generic_param(self, param);
+ }
+ }
+
+ fn visit_param(&mut self, p: &'b ast::Param) {
+ if p.is_placeholder {
+ self.visit_invoc(p.id);
+ } else {
+ visit::walk_param(self, p);
+ }
+ }
+
+ fn visit_struct_field(&mut self, sf: &'b ast::StructField) {
+ if sf.is_placeholder {
+ self.visit_invoc(sf.id);
+ } else {
+ self.resolve_visibility(&sf.vis);
+ visit::walk_struct_field(self, sf);
+ }
+ }
+
+ // Constructs the reduced graph for one variant. Variants exist in the
+ // type and value namespaces.
+ fn visit_variant(&mut self, variant: &'b ast::Variant) {
+ if variant.is_placeholder {
+ self.visit_invoc(variant.id);
+ return;
+ }
+
+ let parent = self.parent_scope.module;
+ let vis = self.r.variant_vis[&parent.def_id().expect("enum without def-id")];
+ let expn_id = self.parent_scope.expansion;
+ let ident = variant.ident;
+
+ // Define a name in the type namespace.
+ let def_id = self.r.definitions.local_def_id(variant.id).to_def_id();
+ let res = Res::Def(DefKind::Variant, def_id);
+ self.r.define(parent, ident, TypeNS, (res, vis, variant.span, expn_id));
+
+ // If the variant is marked as non_exhaustive then lower the visibility to within the
+ // crate.
+ let mut ctor_vis = vis;
+ let has_non_exhaustive = attr::contains_name(&variant.attrs, sym::non_exhaustive);
+ if has_non_exhaustive && vis == ty::Visibility::Public {
+ ctor_vis = ty::Visibility::Restricted(DefId::local(CRATE_DEF_INDEX));
+ }
+
+ // Define a constructor name in the value namespace.
+ // Braced variants, unlike structs, generate unusable names in
+ // value namespace, they are reserved for possible future use.
+ // It's ok to use the variant's id as a ctor id since an
+ // error will be reported on any use of such resolution anyway.
+ let ctor_node_id = variant.data.ctor_id().unwrap_or(variant.id);
+ let ctor_def_id = self.r.definitions.local_def_id(ctor_node_id).to_def_id();
+ let ctor_kind = CtorKind::from_ast(&variant.data);
+ let ctor_res = Res::Def(DefKind::Ctor(CtorOf::Variant, ctor_kind), ctor_def_id);
+ self.r.define(parent, ident, ValueNS, (ctor_res, ctor_vis, variant.span, expn_id));
+
+ visit::walk_variant(self, variant);
}
}
projects / rustc.git / blobdiff