Rollup merge of #83336 - camelid:tool-mod-ice, r=petrochenkov
Fix ICE with `use clippy:🅰️:b;` Fixes #83317.
This commit is contained in:
commit
ea5ba76d1c
@ -955,14 +955,14 @@ fn finalize_import(&mut self, import: &'b Import<'b>) -> Option<UnresolvedImport
|
||||
}
|
||||
return None;
|
||||
}
|
||||
PathResult::NonModule(path_res) if path_res.base_res() == Res::Err => {
|
||||
PathResult::NonModule(_) => {
|
||||
if no_ambiguity {
|
||||
assert!(import.imported_module.get().is_none());
|
||||
}
|
||||
// The error was already reported earlier.
|
||||
return None;
|
||||
}
|
||||
PathResult::Indeterminate | PathResult::NonModule(..) => unreachable!(),
|
||||
PathResult::Indeterminate => unreachable!(),
|
||||
};
|
||||
|
||||
let (ident, target, source_bindings, target_bindings, type_ns_only) = match import.kind {
|
||||
|
7
src/test/ui/imports/tool-mod-child.rs
Normal file
7
src/test/ui/imports/tool-mod-child.rs
Normal file
@ -0,0 +1,7 @@
|
||||
use clippy::a; //~ ERROR unresolved import `clippy`
|
||||
use clippy::a::b; //~ ERROR failed to resolve: maybe a missing crate `clippy`?
|
||||
|
||||
use rustdoc::a; //~ ERROR unresolved import `rustdoc`
|
||||
use rustdoc::a::b; //~ ERROR failed to resolve: maybe a missing crate `rustdoc`?
|
||||
|
||||
fn main() {}
|
28
src/test/ui/imports/tool-mod-child.stderr
Normal file
28
src/test/ui/imports/tool-mod-child.stderr
Normal file
@ -0,0 +1,28 @@
|
||||
error[E0433]: failed to resolve: maybe a missing crate `clippy`?
|
||||
--> $DIR/tool-mod-child.rs:2:5
|
||||
|
|
||||
LL | use clippy::a::b;
|
||||
| ^^^^^^ maybe a missing crate `clippy`?
|
||||
|
||||
error[E0432]: unresolved import `clippy`
|
||||
--> $DIR/tool-mod-child.rs:1:5
|
||||
|
|
||||
LL | use clippy::a;
|
||||
| ^^^^^^ maybe a missing crate `clippy`?
|
||||
|
||||
error[E0433]: failed to resolve: maybe a missing crate `rustdoc`?
|
||||
--> $DIR/tool-mod-child.rs:5:5
|
||||
|
|
||||
LL | use rustdoc::a::b;
|
||||
| ^^^^^^^ maybe a missing crate `rustdoc`?
|
||||
|
||||
error[E0432]: unresolved import `rustdoc`
|
||||
--> $DIR/tool-mod-child.rs:4:5
|
||||
|
|
||||
LL | use rustdoc::a;
|
||||
| ^^^^^^^ maybe a missing crate `rustdoc`?
|
||||
|
||||
error: aborting due to 4 previous errors
|
||||
|
||||
Some errors have detailed explanations: E0432, E0433.
|
||||
For more information about an error, try `rustc --explain E0432`.
|
Loading…
Reference in New Issue
Block a user