When using existing fn as module, don't claim it doesn't exist

Tweak wording of module not found in resolve, when the name exists but
belongs to a non-`mod` item.

Fix #81232.
This commit is contained in:
Esteban Küber 2023-11-16 06:07:33 +00:00
parent 6d069a0ac7
commit 890ce26213
3 changed files with 16 additions and 4 deletions

View File

@ -2028,7 +2028,19 @@ pub(crate) fn report_path_resolution_error(
},
)
});
(format!("use of undeclared crate or module `{ident}`"), suggestion)
if let Ok(binding) = self.early_resolve_ident_in_lexical_scope(
ident,
ScopeSet::All(ValueNS),
parent_scope,
None,
false,
ignore_binding,
) {
let descr = binding.res().descr();
(format!("{descr} `{ident}` is not a crate or module"), suggestion)
} else {
(format!("use of undeclared crate or module `{ident}`"), suggestion)
}
}
}

View File

@ -3,7 +3,7 @@
use st::cell::Cell; //~ ERROR failed to resolve: use of undeclared crate or module `st`
mod bar {
pub fn bar() { bar::baz(); } //~ ERROR failed to resolve: use of undeclared crate or module `bar`
pub fn bar() { bar::baz(); } //~ ERROR failed to resolve: function `bar` is not a crate or module
fn baz() {}
}

View File

@ -42,11 +42,11 @@ LL - bar: st::cell::Cell<bool>
LL + bar: cell::Cell<bool>
|
error[E0433]: failed to resolve: use of undeclared crate or module `bar`
error[E0433]: failed to resolve: function `bar` is not a crate or module
--> $DIR/crate-or-module-typo.rs:6:20
|
LL | pub fn bar() { bar::baz(); }
| ^^^ use of undeclared crate or module `bar`
| ^^^ function `bar` is not a crate or module
error: aborting due to 4 previous errors