mirror of
https://github.com/rust-lang/rust.git
synced 2024-11-27 01:04:03 +00:00
resolve: Avoid "self-confirming" import resolutions in one more case
This commit is contained in:
parent
7900b2bc13
commit
e543e3187c
@ -874,6 +874,12 @@ impl<'a, 'b> ImportResolver<'a, 'b> {
|
||||
/// consolidate multiple unresolved import errors into a single diagnostic.
|
||||
fn finalize_import(&mut self, import: &'b Import<'b>) -> Option<UnresolvedImportError> {
|
||||
let orig_vis = import.vis.replace(ty::Visibility::Invisible);
|
||||
let orig_blacklisted_binding = match &import.kind {
|
||||
ImportKind::Single { target_bindings, .. } => {
|
||||
Some(mem::replace(&mut self.r.blacklisted_binding, target_bindings[TypeNS].get()))
|
||||
}
|
||||
_ => None,
|
||||
};
|
||||
let prev_ambiguity_errors_len = self.r.ambiguity_errors.len();
|
||||
let path_res = self.r.resolve_path(
|
||||
&import.module_path,
|
||||
@ -884,6 +890,9 @@ impl<'a, 'b> ImportResolver<'a, 'b> {
|
||||
import.crate_lint(),
|
||||
);
|
||||
let no_ambiguity = self.r.ambiguity_errors.len() == prev_ambiguity_errors_len;
|
||||
if let Some(orig_blacklisted_binding) = orig_blacklisted_binding {
|
||||
self.r.blacklisted_binding = orig_blacklisted_binding;
|
||||
}
|
||||
import.vis.set(orig_vis);
|
||||
if let PathResult::Failed { .. } | PathResult::NonModule(..) = path_res {
|
||||
// Consider erroneous imports used to avoid duplicate diagnostics.
|
||||
|
15
src/test/ui/imports/issue-62767.rs
Normal file
15
src/test/ui/imports/issue-62767.rs
Normal file
@ -0,0 +1,15 @@
|
||||
// check-pass
|
||||
|
||||
mod m {
|
||||
pub enum Same {
|
||||
Same,
|
||||
}
|
||||
}
|
||||
|
||||
use m::*;
|
||||
|
||||
// The variant `Same` introduced by this import is not considered when resolving the prefix
|
||||
// `Same::` during import validation (issue #62767).
|
||||
use Same::Same;
|
||||
|
||||
fn main() {}
|
Loading…
Reference in New Issue
Block a user