Skip to content

Commit

Permalink
Fix import suggestion ice
Browse files Browse the repository at this point in the history
  • Loading branch information
chenyukang committed Jul 4, 2024
1 parent f6fa358 commit fe5581d
Show file tree
Hide file tree
Showing 7 changed files with 125 additions and 6 deletions.
10 changes: 5 additions & 5 deletions compiler/rustc_resolve/src/diagnostics.rs
Original file line number Diff line number Diff line change
Expand Up @@ -1989,12 +1989,12 @@ impl<'a, 'tcx> Resolver<'a, 'tcx> {
if let Some(candidate) = candidates.get(0) {
let path = {
// remove the possible common prefix of the path
let start_index = (0..failed_segment_idx)
.find(|&i| path[i].ident != candidate.path.segments[i].ident)
let len = candidate.path.segments.len();
let start_index = (0..=failed_segment_idx.min(len - 1))
.find(|&i| path[i].ident.name != candidate.path.segments[i].ident.name)
.unwrap_or_default();
let segments = (start_index..=failed_segment_idx)
.map(|s| candidate.path.segments[s].clone())
.collect();
let segments =
(start_index..len).map(|s| candidate.path.segments[s].clone()).collect();
Path { segments, span: Span::default(), tokens: None }
};
(
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,41 @@
error[E0583]: file not found for module `config`
--> $DIR/suggest-import-ice-issue-127302.rs:3:1
|
LL | mod config;
| ^^^^^^^^^^^
|
= help: to create the module `config`, create file "$DIR/config.rs" or "$DIR/config/mod.rs"
= note: if there is a `mod config` elsewhere in the crate already, import it with `use crate::...` instead

error: format argument must be a string literal
--> $DIR/suggest-import-ice-issue-127302.rs:10:14
|
LL | println!(args.ctx.compiler.display());
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^
|
help: you might be missing a string literal to format with
|
LL | println!("{}", args.ctx.compiler.display());
| +++++

error[E0425]: cannot find value `args` in this scope
--> $DIR/suggest-import-ice-issue-127302.rs:6:12
|
LL | match &args.cmd {
| ^^^^ not found in this scope
|
help: consider importing this function
|
LL + use std::env::args;
|

error[E0532]: expected unit struct, unit variant or constant, found module `crate::config`
--> $DIR/suggest-import-ice-issue-127302.rs:7:9
|
LL | crate::config => {}
| ^^^^^^^^^^^^^ not a unit struct, unit variant or constant

error: aborting due to 4 previous errors

Some errors have detailed explanations: E0425, E0532, E0583.
For more information about an error, try `rustc --explain E0425`.
Original file line number Diff line number Diff line change
@@ -0,0 +1,41 @@
error[E0583]: file not found for module `config`
--> $DIR/suggest-import-ice-issue-127302.rs:3:1
|
LL | mod config;
| ^^^^^^^^^^^
|
= help: to create the module `config`, create file "$DIR/config.rs" or "$DIR/config/mod.rs"
= note: if there is a `mod config` elsewhere in the crate already, import it with `use crate::...` instead

error: format argument must be a string literal
--> $DIR/suggest-import-ice-issue-127302.rs:10:14
|
LL | println!(args.ctx.compiler.display());
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^
|
help: you might be missing a string literal to format with
|
LL | println!("{}", args.ctx.compiler.display());
| +++++

error[E0425]: cannot find value `args` in this scope
--> $DIR/suggest-import-ice-issue-127302.rs:6:12
|
LL | match &args.cmd {
| ^^^^ not found in this scope
|
help: consider importing this function
|
LL + use std::env::args;
|

error[E0532]: expected unit struct, unit variant or constant, found module `crate::config`
--> $DIR/suggest-import-ice-issue-127302.rs:7:9
|
LL | crate::config => {}
| ^^^^^^^^^^^^^ not a unit struct, unit variant or constant

error: aborting due to 4 previous errors

Some errors have detailed explanations: E0425, E0532, E0583.
For more information about an error, try `rustc --explain E0425`.
12 changes: 12 additions & 0 deletions tests/ui/imports/suggest-import-ice-issue-127302.rs
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
//@ revisions: edition2015 edition2021

mod config; //~ ERROR file not found for module

fn main() {
match &args.cmd { //~ ERROR cannot find value `args` in this scope
crate::config => {} //~ ERROR expected unit struct, unit variant or constant, found module `crate::config`
}

println!(args.ctx.compiler.display());
//~^ ERROR format argument must be a string literal
}
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
error[E0433]: failed to resolve: unresolved import
--> $DIR/suggest-import-issue-120074.rs:10:35
--> $DIR/suggest-import-issue-120074.rs:12:35
|
LL | println!("Hello, {}!", crate::bar::do_the_thing);
| ^^^ unresolved import
Expand Down
23 changes: 23 additions & 0 deletions tests/ui/imports/suggest-import-issue-120074.edition2021.stderr
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
error[E0433]: failed to resolve: unresolved import
--> $DIR/suggest-import-issue-120074.rs:12:35
|
LL | println!("Hello, {}!", crate::bar::do_the_thing);
| ^^^ unresolved import
|
help: a similar path exists
|
LL | println!("Hello, {}!", crate::foo::bar::do_the_thing);
| ~~~~~~~~
help: consider importing this module
|
LL + use foo::bar;
|
help: if you import `bar`, refer to it directly
|
LL - println!("Hello, {}!", crate::bar::do_the_thing);
LL + println!("Hello, {}!", bar::do_the_thing);
|

error: aborting due to 1 previous error

For more information about this error, try `rustc --explain E0433`.
2 changes: 2 additions & 0 deletions tests/ui/imports/suggest-import-issue-120074.rs
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
//@ revisions: edition2015 edition2021

pub mod foo {
pub mod bar {
pub fn do_the_thing() -> usize {
Expand Down

0 comments on commit fe5581d

Please sign in to comment.