mikros/rust
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Rollup merge of #127310 - chenyukang:yukang-fix-suggest-import-ice, r=estebank

Browse Source 
Fix import suggestion ice

Fixes #127302

#127302 only crash in edition 2015
#120074 can only reproduced in edition 2021
so I added revisions in test file.
This commit is contained in:
Jubilee 2024-07-12 13:47:07 -07:00 committed by GitHub
commit afb2fbf692
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
7 changed files with 125 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
compiler/rustc_resolve/src/diagnostics.rs
View File

@ -1992,12 +1992,12 @@ pub(crate) fn report_path_resolution_error(
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 }
};
(

41
tests/ui/imports/suggest-import-ice-issue-127302.edition2015.stderr Normal file
View File

@ -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`.

41
tests/ui/imports/suggest-import-ice-issue-127302.edition2021.stderr Normal file
View File

@ -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
tests/ui/imports/suggest-import-ice-issue-127302.rs Normal file
View File

@ -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
}

2
tests/ui/imports/suggest-import-issue-120074.stderr → tests/ui/imports/suggest-import-issue-120074.edition2015.stderr
View File

@ -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

23
tests/ui/imports/suggest-import-issue-120074.edition2021.stderr Normal file
View File

@ -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
tests/ui/imports/suggest-import-issue-120074.rs
View File

@ -1,3 +1,5 @@
//@ revisions: edition2015 edition2021
pub mod foo {
pub mod bar {
pub fn do_the_thing() -> usize {