rust-lang/rust
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Auto merge of #112917 - chenyukang:yukang-fix-112590, r=estebank

Browse Source 
Suggest importing for partial mod path matching in name resolving

Fixes #112590
This commit is contained in:
bors
2023-07-04 02:01:24 +00:00
parent 0ab38e95bb b26701ea79
commit e728b5b98d
10 changed files with 174 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
compiler/rustc_resolve/src/late.rs
View File

@@ -3503,7 +3503,7 @@ impl<'a: 'ast, 'b, 'ast, 'tcx> LateResolutionVisitor<'a, 'b, 'ast, 'tcx> {
let report_errors = |this: &mut Self, res: Option<Res>| {
if this.should_report_errs() {
let (err, candidates) =
this.smart_resolve_report_errors(path, path_span, source, res);
this.smart_resolve_report_errors(path, path, path_span, source, res);
let def_id = this.parent_scope.module.nearest_parent_mod();
let instead = res.is_some();
@@ -3560,8 +3560,13 @@ impl<'a: 'ast, 'b, 'ast, 'tcx> LateResolutionVisitor<'a, 'b, 'ast, 'tcx> {
_ => return Some(parent_err),
};
let (mut err, candidates) =
this.smart_resolve_report_errors(prefix_path, path_span, PathSource::Type, None);
let (mut err, candidates) = this.smart_resolve_report_errors(
prefix_path,
path,
path_span,
PathSource::Type,
None,
);
// There are two different error messages user might receive at
// this point: