-
Notifications
You must be signed in to change notification settings - Fork 13k
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
resolve: Scope visiting doesn't need an Ident
#80782
Changes from all commits
File filter
Filter by extension
Conversations
Jump to
Diff view
Diff view
There are no files selected for viewing
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -262,52 +262,60 @@ impl<'a> PathSource<'a> { | |
|
||
crate fn is_expected(self, res: Res) -> bool { | ||
match self { | ||
PathSource::Type => matches!(res, Res::Def( | ||
PathSource::Type => matches!( | ||
res, | ||
Res::Def( | ||
DefKind::Struct | ||
| DefKind::Union | ||
| DefKind::Enum | ||
| DefKind::Trait | ||
| DefKind::TraitAlias | ||
| DefKind::TyAlias | ||
| DefKind::AssocTy | ||
| DefKind::TyParam | ||
| DefKind::OpaqueTy | ||
| DefKind::ForeignTy, | ||
| DefKind::Union | ||
| DefKind::Enum | ||
| DefKind::Trait | ||
| DefKind::TraitAlias | ||
| DefKind::TyAlias | ||
| DefKind::AssocTy | ||
| DefKind::TyParam | ||
| DefKind::OpaqueTy | ||
| DefKind::ForeignTy, | ||
_, | ||
) | ||
| Res::PrimTy(..) | ||
| Res::SelfTy(..)), | ||
) | Res::PrimTy(..) | ||
| Res::SelfTy(..) | ||
), | ||
PathSource::Trait(AliasPossibility::No) => matches!(res, Res::Def(DefKind::Trait, _)), | ||
PathSource::Trait(AliasPossibility::Maybe) => { | ||
matches!(res, Res::Def(DefKind::Trait | DefKind::TraitAlias, _)) | ||
} | ||
PathSource::Expr(..) => matches!(res, Res::Def( | ||
PathSource::Expr(..) => matches!( | ||
res, | ||
Res::Def( | ||
DefKind::Ctor(_, CtorKind::Const | CtorKind::Fn) | ||
| DefKind::Const | ||
| DefKind::Static | ||
| DefKind::Fn | ||
| DefKind::AssocFn | ||
| DefKind::AssocConst | ||
| DefKind::ConstParam, | ||
| DefKind::Const | ||
| DefKind::Static | ||
| DefKind::Fn | ||
| DefKind::AssocFn | ||
| DefKind::AssocConst | ||
| DefKind::ConstParam, | ||
_, | ||
) | ||
| Res::Local(..) | ||
| Res::SelfCtor(..)), | ||
PathSource::Pat => matches!(res, Res::Def( | ||
) | Res::Local(..) | ||
| Res::SelfCtor(..) | ||
), | ||
PathSource::Pat => matches!( | ||
res, | ||
Res::Def( | ||
DefKind::Ctor(_, CtorKind::Const) | DefKind::Const | DefKind::AssocConst, | ||
_, | ||
) | ||
| Res::SelfCtor(..)), | ||
) | Res::SelfCtor(..) | ||
), | ||
PathSource::TupleStruct(..) => res.expected_in_tuple_struct_pat(), | ||
PathSource::Struct => matches!(res, Res::Def( | ||
PathSource::Struct => matches!( | ||
res, | ||
Res::Def( | ||
DefKind::Struct | ||
| DefKind::Union | ||
| DefKind::Variant | ||
| DefKind::TyAlias | ||
| DefKind::AssocTy, | ||
| DefKind::Union | ||
| DefKind::Variant | ||
| DefKind::TyAlias | ||
| DefKind::AssocTy, | ||
_, | ||
) | ||
| Res::SelfTy(..)), | ||
) | Res::SelfTy(..) | ||
), | ||
PathSource::TraitItem(ns) => match res { | ||
Res::Def(DefKind::AssocConst | DefKind::AssocFn, _) if ns == ValueNS => true, | ||
Res::Def(DefKind::AssocTy, _) if ns == TypeNS => true, | ||
|
@@ -2397,8 +2405,12 @@ impl<'a: 'ast, 'b, 'ast> LateResolutionVisitor<'a, 'b, 'ast> { | |
&mut found_traits, | ||
&self.parent_scope, | ||
); | ||
search_module = | ||
unwrap_or!(self.r.hygienic_lexical_parent(search_module, &mut ident.span), break); | ||
let mut span_data = ident.span.data(); | ||
search_module = unwrap_or!( | ||
self.r.hygienic_lexical_parent(search_module, &mut span_data.ctxt), | ||
break | ||
); | ||
ident.span = span_data.span(); | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. This will go away in #80765 which reuses |
||
} | ||
|
||
if let Some(prelude) = self.r.prelude { | ||
|
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -50,6 +50,7 @@ use rustc_middle::{bug, span_bug}; | |
use rustc_session::lint; | ||
use rustc_session::lint::{BuiltinLintDiagnostics, LintBuffer}; | ||
use rustc_session::Session; | ||
use rustc_span::edition::Edition; | ||
use rustc_span::hygiene::{ExpnId, ExpnKind, MacroKind, SyntaxContext, Transparency}; | ||
use rustc_span::source_map::Spanned; | ||
use rustc_span::symbol::{kw, sym, Ident, Symbol}; | ||
|
@@ -759,10 +760,13 @@ impl<'a> NameBinding<'a> { | |
} | ||
|
||
fn is_variant(&self) -> bool { | ||
matches!(self.kind, NameBindingKind::Res( | ||
matches!( | ||
self.kind, | ||
NameBindingKind::Res( | ||
Res::Def(DefKind::Variant | DefKind::Ctor(CtorOf::Variant, ..), _), | ||
_, | ||
)) | ||
) | ||
) | ||
} | ||
|
||
fn is_extern_crate(&self) -> bool { | ||
|
@@ -1626,8 +1630,13 @@ impl<'a> Resolver<'a> { | |
&mut self, | ||
scope_set: ScopeSet, | ||
parent_scope: &ParentScope<'a>, | ||
ident: Ident, | ||
mut visitor: impl FnMut(&mut Self, Scope<'a>, /*use_prelude*/ bool, Ident) -> Option<T>, | ||
ctxt: SyntaxContext, | ||
mut visitor: impl FnMut( | ||
&mut Self, | ||
Scope<'a>, | ||
/*use_prelude*/ bool, | ||
SyntaxContext, | ||
) -> Option<T>, | ||
) -> Option<T> { | ||
// General principles: | ||
// 1. Not controlled (user-defined) names should have higher priority than controlled names | ||
|
@@ -1670,7 +1679,7 @@ impl<'a> Resolver<'a> { | |
// 4c. Standard library prelude (de-facto closed, controlled). | ||
// 6. Language prelude: builtin attributes (closed, controlled). | ||
|
||
let rust_2015 = ident.span.rust_2015(); | ||
let rust_2015 = ctxt.edition() == Edition::Edition2015; | ||
let (ns, macro_kind, is_absolute_path) = match scope_set { | ||
ScopeSet::All(ns, _) => (ns, None, false), | ||
ScopeSet::AbsolutePath(ns) => (ns, None, true), | ||
|
@@ -1683,7 +1692,7 @@ impl<'a> Resolver<'a> { | |
TypeNS | ValueNS => Scope::Module(module), | ||
MacroNS => Scope::DeriveHelpers(parent_scope.expansion), | ||
}; | ||
let mut ident = ident.normalize_to_macros_2_0(); | ||
let mut ctxt = ctxt.normalize_to_macros_2_0(); | ||
let mut use_prelude = !module.no_implicit_prelude; | ||
|
||
loop { | ||
|
@@ -1719,7 +1728,7 @@ impl<'a> Resolver<'a> { | |
}; | ||
|
||
if visit { | ||
if let break_result @ Some(..) = visitor(self, scope, use_prelude, ident) { | ||
if let break_result @ Some(..) = visitor(self, scope, use_prelude, ctxt) { | ||
return break_result; | ||
} | ||
} | ||
|
@@ -1749,17 +1758,17 @@ impl<'a> Resolver<'a> { | |
}, | ||
Scope::CrateRoot => match ns { | ||
TypeNS => { | ||
ident.span.adjust(ExpnId::root()); | ||
ctxt.adjust(ExpnId::root()); | ||
Scope::ExternPrelude | ||
} | ||
ValueNS | MacroNS => break, | ||
}, | ||
Scope::Module(module) => { | ||
use_prelude = !module.no_implicit_prelude; | ||
match self.hygienic_lexical_parent(module, &mut ident.span) { | ||
match self.hygienic_lexical_parent(module, &mut ctxt) { | ||
Some(parent_module) => Scope::Module(parent_module), | ||
None => { | ||
ident.span.adjust(ExpnId::root()); | ||
ctxt.adjust(ExpnId::root()); | ||
match ns { | ||
TypeNS => Scope::ExternPrelude, | ||
ValueNS => Scope::StdLibPrelude, | ||
|
@@ -1882,16 +1891,18 @@ impl<'a> Resolver<'a> { | |
ident = normalized_ident; | ||
let mut poisoned = None; | ||
loop { | ||
let mut span_data = ident.span.data(); | ||
let opt_module = if let Some(node_id) = record_used_id { | ||
self.hygienic_lexical_parent_with_compatibility_fallback( | ||
module, | ||
&mut ident.span, | ||
&mut span_data.ctxt, | ||
node_id, | ||
&mut poisoned, | ||
) | ||
} else { | ||
self.hygienic_lexical_parent(module, &mut ident.span) | ||
self.hygienic_lexical_parent(module, &mut span_data.ctxt) | ||
}; | ||
ident.span = span_data.span(); | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. This code is not yet refactored to use |
||
module = unwrap_or!(opt_module, break); | ||
let adjusted_parent_scope = &ParentScope { module, ..*parent_scope }; | ||
let result = self.resolve_ident_in_module_unadjusted( | ||
|
@@ -1965,10 +1976,10 @@ impl<'a> Resolver<'a> { | |
fn hygienic_lexical_parent( | ||
&mut self, | ||
module: Module<'a>, | ||
span: &mut Span, | ||
ctxt: &mut SyntaxContext, | ||
) -> Option<Module<'a>> { | ||
if !module.expansion.outer_expn_is_descendant_of(span.ctxt()) { | ||
return Some(self.macro_def_scope(span.remove_mark())); | ||
if !module.expansion.outer_expn_is_descendant_of(*ctxt) { | ||
return Some(self.macro_def_scope(ctxt.remove_mark())); | ||
} | ||
|
||
if let ModuleKind::Block(..) = module.kind { | ||
|
@@ -1981,11 +1992,11 @@ impl<'a> Resolver<'a> { | |
fn hygienic_lexical_parent_with_compatibility_fallback( | ||
&mut self, | ||
module: Module<'a>, | ||
span: &mut Span, | ||
ctxt: &mut SyntaxContext, | ||
node_id: NodeId, | ||
poisoned: &mut Option<NodeId>, | ||
) -> Option<Module<'a>> { | ||
if let module @ Some(..) = self.hygienic_lexical_parent(module, span) { | ||
if let module @ Some(..) = self.hygienic_lexical_parent(module, ctxt) { | ||
return module; | ||
} | ||
|
||
|
@@ -2010,7 +2021,7 @@ impl<'a> Resolver<'a> { | |
let ext = self.get_macro_by_def_id(def_id); | ||
if !ext.is_builtin | ||
&& ext.macro_kind() == MacroKind::Derive | ||
&& parent.expansion.outer_expn_is_descendant_of(span.ctxt()) | ||
&& parent.expansion.outer_expn_is_descendant_of(*ctxt) | ||
{ | ||
*poisoned = Some(node_id); | ||
return module.parent; | ||
|
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
#80765 (comment)