Skip to content

Commit

Permalink
Rollup merge of #121586 - gurry:121532-ice-unwrap-on-none, r=cjgillot
Browse files Browse the repository at this point in the history
Don't use `unwrap()` in `ArrayIntoIter` lint when typeck fails

Fixes #121532
  • Loading branch information
matthiaskrgr authored Feb 25, 2024
2 parents 3d5fd9d + fa75571 commit a442388
Show file tree
Hide file tree
Showing 3 changed files with 29 additions and 5 deletions.
14 changes: 9 additions & 5 deletions compiler/rustc_lint/src/array_into_iter.rs
Original file line number Diff line number Diff line change
Expand Up @@ -70,11 +70,15 @@ impl<'tcx> LateLintPass<'tcx> for ArrayIntoIter {

// Check if the method call actually calls the libcore
// `IntoIterator::into_iter`.
let def_id = cx.typeck_results().type_dependent_def_id(expr.hir_id).unwrap();
match cx.tcx.trait_of_item(def_id) {
Some(trait_id) if cx.tcx.is_diagnostic_item(sym::IntoIterator, trait_id) => {}
_ => return,
};
let trait_id = cx
.typeck_results()
.type_dependent_def_id(expr.hir_id)
.and_then(|did| cx.tcx.trait_of_item(did));
if trait_id.is_none()
|| !cx.tcx.is_diagnostic_item(sym::IntoIterator, trait_id.unwrap())
{
return;
}

// As this is a method call expression, we have at least one argument.
let receiver_ty = cx.typeck_results().expr_ty(receiver_arg);
Expand Down
11 changes: 11 additions & 0 deletions tests/ui/lint/ice-array-into-iter-lint-issue-121532.rs
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
// Regression test for #121532
// Checks the we don't ICE in ArrayIntoIter
// lint when typeck has failed

// Typeck fails for the arg type as
// `Self` makes no sense here
fn func(a: Self::ItemsIterator) { //~ ERROR failed to resolve: `Self` is only available in impls, traits, and type definitions
a.into_iter();
}

fn main() {}
9 changes: 9 additions & 0 deletions tests/ui/lint/ice-array-into-iter-lint-issue-121532.stderr
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
error[E0433]: failed to resolve: `Self` is only available in impls, traits, and type definitions
--> $DIR/ice-array-into-iter-lint-issue-121532.rs:7:12
|
LL | fn func(a: Self::ItemsIterator) {
| ^^^^ `Self` is only available in impls, traits, and type definitions

error: aborting due to 1 previous error

For more information about this error, try `rustc --explain E0433`.

0 comments on commit a442388

Please sign in to comment.