Skip to content

Commit

Permalink
Added additional comments and minor edits
Browse files Browse the repository at this point in the history
  • Loading branch information
@kwj2104
kwj2104 committed Apr 7, 2021
1 parent e433f55 commit f51f25a
Show file tree
Hide file tree
Showing 3 changed files with 64 additions and 46 deletions.
2 changes: 1 addition & 1 deletion compiler/rustc_resolve/src/late.rs
View file
Expand Up @@ -1596,7 +1596,7 @@ impl<'a: 'ast, 'b, 'ast> LateResolutionVisitor<'a, 'b, 'ast> {
.try_resolve_as_non_binding(pat_src, pat, bmode, ident, has_sub)
.unwrap_or_else(|| self.fresh_binding(ident, pat.id, pat_src, bindings));
self.r.record_partial_res(pat.id, PartialRes::new(res));
self.r.record_local_span(pat.id, pat.span);
self.r.record_pat_span(pat.id, pat.span);
}
PatKind::TupleStruct(ref path, ref sub_patterns) => {
self.smart_resolve_path(
Expand Down
104 changes: 61 additions & 43 deletions compiler/rustc_resolve/src/lib.rs
View file
Expand Up @@ -884,9 +884,9 @@ pub struct Resolver<'a> {
/// "self-confirming" import resolutions during import validation.
unusable_binding: Option<&'a NameBinding<'a>>,

// Spans for local variables found during resolution
// Used for suggestions during error reporting
local_span_map: NodeMap<Span>,
// Spans for local variables found during pattern resolution.
// Used for suggestions during error reporting.
pat_span_map: NodeMap<Span>,

/// Resolutions for nodes that have a single resolution.
partial_res_map: NodeMap<PartialRes>,
Expand Down Expand Up @@ -1266,7 +1266,7 @@ impl<'a> Resolver<'a> {
last_import_segment: false,
unusable_binding: None,

local_span_map: Default::default(),
pat_span_map: Default::default(),
partial_res_map: Default::default(),
import_res_map: Default::default(),
label_res_map: Default::default(),
Expand Down Expand Up @@ -1884,6 +1884,7 @@ impl<'a> Resolver<'a> {
ribs,
)));
}

module = match ribs[i].kind {
ModuleRibKind(module) => module,
MacroDefinition(def) if def == self.macro_def(ident.span.ctxt()) => {
Expand All @@ -1894,6 +1895,7 @@ impl<'a> Resolver<'a> {
}
_ => continue,
};

match module.kind {
ModuleKind::Block(..) => {} // We can see through blocks
_ => break,
Expand All @@ -1912,19 +1914,16 @@ impl<'a> Resolver<'a> {
return Some(LexicalScopeBinding::Item(binding));
}
}
let returned_item = self
.early_resolve_ident_in_lexical_scope(
orig_ident,
ScopeSet::Late(ns, module, record_used_id),
parent_scope,
record_used,
record_used,
path_span,
)
.ok()
.map(LexicalScopeBinding::Item);

returned_item
self.early_resolve_ident_in_lexical_scope(
orig_ident,
ScopeSet::Late(ns, module, record_used_id),
parent_scope,
record_used,
record_used,
path_span,
)
.ok()
.map(LexicalScopeBinding::Item)
}

fn hygienic_lexical_parent(
Expand Down Expand Up @@ -2391,38 +2390,57 @@ impl<'a> Resolver<'a> {
.next()
.map_or(false, |c| c.is_ascii_uppercase())
{
// Add check case for similarly named item in alternative namespace
let mut suggestion = None;

if ribs.is_some() {
if let Some(res) = self.resolve_ident_in_lexical_scope(
// Check whether the name refers to an item in the value namespace.
let suggestion = if ribs.is_some() {
let match_span = match self.resolve_ident_in_lexical_scope(
ident,
ValueNS,
parent_scope,
None,
path_span,
&ribs.unwrap()[ValueNS],
) {
let mut match_span: Option<Span> = None;
match res {
LexicalScopeBinding::Res(Res::Local(id)) => {
match_span =
Some(*self.local_span_map.get(&id).unwrap());
}
LexicalScopeBinding::Item(name_binding) => {
match_span = Some(name_binding.span);
}
_ => (),
};
if let Some(span) = match_span {
suggestion = Some((
vec![(span, String::from(""))],
format!("{} is defined here, but is not a type", ident),
Applicability::MaybeIncorrect,
));
// Name matches a local variable. For example:
// ```
// fn f() {
// let Foo: &str = "";
// println!("{}", Foo::Bar); // Name refers to local
// // variable `Foo`.
// }
// ```
Some(LexicalScopeBinding::Res(Res::Local(id))) => {
Some(*self.pat_span_map.get(&id).unwrap())
}

// Name matches item from a local name binding
// created by `use` declaration. For example:
// ```
// pub Foo: &str = "";
//
// mod submod {
// use super::Foo;
// println!("{}", Foo::Bar); // Name refers to local
// // binding `Foo`.
// }
// ```
Some(LexicalScopeBinding::Item(name_binding)) => {
Some(name_binding.span)
}
_ => None,
};

if let Some(span) = match_span {
Some((
vec![(span, String::from(""))],
format!("`{}` is defined here, but is not a type", ident),
Applicability::MaybeIncorrect,
))
} else {
None
}
}
} else {
None
};

(format!("use of undeclared type `{}`", ident), suggestion)
} else {
Expand Down Expand Up @@ -2835,9 +2853,9 @@ impl<'a> Resolver<'a> {
}
}

fn record_local_span(&mut self, node: NodeId, span: Span) {
debug!("(recording local) recording {:?} for {:?}", node, span);
self.local_span_map.insert(node, span);
fn record_pat_span(&mut self, node: NodeId, span: Span) {
debug!("(recording pat) recording {:?} for {:?}", node, span);
self.pat_span_map.insert(node, span);
}

fn is_accessible_from(&self, vis: ty::Visibility, module: Module<'a>) -> bool {
Expand Down
4 changes: 2 additions & 2 deletions src/test/ui/resolve/issue-81508.stderr
View file
Expand Up @@ -2,7 +2,7 @@ error[E0433]: failed to resolve: use of undeclared type `Baz`
--> $DIR/issue-81508.rs:11:20
|
LL | let Baz: &str = "";
| --- help: Baz is defined here, but is not a type
| --- help: `Baz` is defined here, but is not a type
LL |
LL | println!("{}", Baz::Bar);
| ^^^ use of undeclared type `Baz`
Expand All @@ -11,7 +11,7 @@ error[E0433]: failed to resolve: use of undeclared type `Foo`
--> $DIR/issue-81508.rs:20:24
|
LL | use super::Foo;
| ---------- help: Foo is defined here, but is not a type
| ---------- help: `Foo` is defined here, but is not a type
LL | fn function() {
LL | println!("{}", Foo::Bar);
| ^^^ use of undeclared type `Foo`
Expand Down

0 comments on commit f51f25a

Please sign in to comment.