Skip to content

Move name resolution logic to a dedicated file #95405

New issue

Have a question about this project? # for a free GitHub account to open an issue and contact its maintainers and the community.

#

By clicking “#”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? # to your account

Merged
merged 11 commits into from
Apr 13, 2022
Merged

Move name resolution logic to a dedicated file #95405

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
e9a52c2
Move ident resolution to a dedicated module.
cjgillot Mar 26, 2022
eb7f567
Simplify binding finalization.
cjgillot Apr 8, 2022
24b37a7
Pass last_import_segment and unusable_binding as parameters.
cjgillot Apr 8, 2022
55ca03c
Insert error after checking for binding usability.
cjgillot Apr 8, 2022
3ee6f6e
Do not record Res when builing a suggestion.
cjgillot Apr 8, 2022
886613c
Make the logic more explicit with let chains.
cjgillot Apr 8, 2022
d1c1bbe
Move path resolution error to rustc_resolve::diagnostics.
cjgillot Apr 8, 2022
944d852
Simplify error reporting.
cjgillot Apr 8, 2022
abbd0b8
Move diagnostic methods to the dedicated module.
cjgillot Apr 8, 2022
b796d92
Fix imports.
cjgillot Apr 12, 2022
276b946
Handle `unusable_binding` more compactly.
petrochenkov Apr 12, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions compiler/rustc_resolve/src/build_reduced_graph.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -297,6 +297,7 @@ impl<'a, 'b> BuildReducedGraphVisitor<'a, 'b> {
Some(TypeNS),
parent_scope,
if finalize { Finalize::SimplePath(id, path.span) } else { Finalize::No },
None,
) {
PathResult::Module(ModuleOrUniformRoot::Module(module)) => {
let res = module.res().expect("visibility resolved to unnamed block");
Expand Down Expand Up @@ -1124,12 +1125,11 @@ impl<'a, 'b> BuildReducedGraphVisitor<'a, 'b> {
});
} else {
for ident in single_imports.iter().cloned() {
let result = self.r.resolve_ident_in_module(
let result = self.r.maybe_resolve_ident_in_module(
ModuleOrUniformRoot::Module(module),
ident,
MacroNS,
&self.parent_scope,
None,
);
if let Ok(binding) = result {
let import = macro_use_import(self, ident.span);
Expand Down
Loading