Skip to content

Fix unwrap on None #114461

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Aug 4, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 1 addition & 2 deletions compiler/rustc_hir_typeck/src/fn_ctxt/suggestions.rs
Original file line number Diff line number Diff line change
Expand Up @@ -1620,8 +1620,7 @@ impl<'a, 'tcx> FnCtxt<'a, 'tcx> {
.iter()
.enumerate()
.filter(|x| x.1.hir_id == *hir_id)
.map(|(i, _)| init_tup.get(i).unwrap())
.next()
.find_map(|(i, _)| init_tup.get(i))
{
self.note_type_is_not_clone_inner_expr(init)
} else {
Expand Down
15 changes: 15 additions & 0 deletions tests/ui/typeck/issue-114423.rs
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
struct RGB {
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Just realized the file name. We're moving away from having no context beyond the issue number in test names. Would you mind changing it to something like issue-114423-ice-regression-in-suggestion.rs?

g: f64,
b: f64,
}

fn main() {
let (r, alone_in_path, b): (f32, f32, f32) = (e.clone(), e.clone());
//~^ ERROR cannot find value `e` in this scope
//~| ERROR cannot find value `e` in this scope
//~| ERROR mismatched types
let _ = RGB { r, g, b };
//~^ ERROR cannot find value `g` in this scope
//~| ERROR struct `RGB` has no field named `r`
//~| ERROR mismatched types
}
52 changes: 52 additions & 0 deletions tests/ui/typeck/issue-114423.stderr
Original file line number Diff line number Diff line change
@@ -0,0 +1,52 @@
error[E0425]: cannot find value `e` in this scope
--> $DIR/issue-114423.rs:7:51
|
LL | let (r, alone_in_path, b): (f32, f32, f32) = (e.clone(), e.clone());
| ^ not found in this scope

error[E0425]: cannot find value `e` in this scope
--> $DIR/issue-114423.rs:7:62
|
LL | let (r, alone_in_path, b): (f32, f32, f32) = (e.clone(), e.clone());
| ^ not found in this scope

error[E0425]: cannot find value `g` in this scope
--> $DIR/issue-114423.rs:11:22
|
LL | let _ = RGB { r, g, b };
| ^ help: a local variable with a similar name exists: `b`

error[E0308]: mismatched types
--> $DIR/issue-114423.rs:7:50
|
LL | let (r, alone_in_path, b): (f32, f32, f32) = (e.clone(), e.clone());
| --------------- ^^^^^^^^^^^^^^^^^^^^^^ expected a tuple with 3 elements, found one with 2 elements
| |
| expected due to this
|
= note: expected tuple `(f32, f32, f32)`
found tuple `(f32, f32)`

error[E0560]: struct `RGB` has no field named `r`
--> $DIR/issue-114423.rs:11:19
|
LL | let _ = RGB { r, g, b };
| ^ `RGB` does not have this field
|
= note: all struct fields are already assigned

error[E0308]: mismatched types
--> $DIR/issue-114423.rs:11:25
|
LL | let _ = RGB { r, g, b };
| ^ expected `f64`, found `f32`
|
help: you can convert an `f32` to an `f64`
|
LL | let _ = RGB { r, g, b: b.into() };
| ++ +++++++

error: aborting due to 6 previous errors

Some errors have detailed explanations: E0308, E0425, E0560.
For more information about an error, try `rustc --explain E0308`.