Skip to content

Commit

Permalink
Fix ICE when suggesting dereferencing binop operands
Browse files Browse the repository at this point in the history
  • Loading branch information
sjwang05 committed Jan 4, 2024
1 parent 15755f3 commit c29b565
Show file tree
Hide file tree
Showing 3 changed files with 45 additions and 1 deletion.
Original file line number Diff line number Diff line change
Expand Up @@ -860,6 +860,21 @@ impl<'tcx> TypeErrCtxtExt<'tcx> for TypeErrCtxt<'_, 'tcx> {
&& let hir::Node::Expr(lhs) = self.tcx.hir_node(*lhs_hir_id)
&& let hir::Node::Expr(rhs) = self.tcx.hir_node(*rhs_hir_id)
&& let Some(rhs_ty) = typeck_results.expr_ty_opt(rhs)
&& let trait_pred = predicate.unwrap_or(trait_pred)
// Only run this code on binary operators
&& hir::lang_items::OPERATORS
.iter()
.filter_map(|&op|
(!matches!(
op,
LangItem::Neg | LangItem::Not | LangItem::Index | LangItem::IndexMut
))
.then_some(self.tcx.lang_items().get(op))
.flatten()
)
.any(|op| {
op == trait_pred.skip_binder().trait_ref.def_id
})
{
// Suggest dereferencing the LHS, RHS, or both terms of a binop if possible

Expand Down
8 changes: 8 additions & 0 deletions tests/ui/binop/binary-op-suggest-deref.rs
Original file line number Diff line number Diff line change
Expand Up @@ -72,4 +72,12 @@ fn baz() {
//~^ERROR can't compare `str` with `&String` [E0277]
}

fn qux() {
// Issue #119352
const FOO: i32 = 42;
let _ = FOO & (*"Sized".to_string().into_boxed_str());
//~^ ERROR the size for values of type `str` cannot be known at compilation time
//~| ERROR no implementation for `i32 & str` [E0277]
}

fn main() {}
23 changes: 22 additions & 1 deletion tests/ui/binop/binary-op-suggest-deref.stderr
Original file line number Diff line number Diff line change
Expand Up @@ -300,7 +300,28 @@ help: consider dereferencing here
LL | _ = partial[..3] == *string_ref;
| +

error: aborting due to 22 previous errors
error[E0277]: no implementation for `i32 & str`
--> $DIR/binary-op-suggest-deref.rs:78:17
|
LL | let _ = FOO & (*"Sized".to_string().into_boxed_str());
| ^ no implementation for `i32 & str`
|
= help: the trait `BitAnd<str>` is not implemented for `i32`
= help: the following other types implement trait `BitAnd<Rhs>`:
<i32 as BitAnd>
<i32 as BitAnd<&i32>>
<&'a i32 as BitAnd<i32>>
<&i32 as BitAnd<&i32>>

error[E0277]: the size for values of type `str` cannot be known at compilation time
--> $DIR/binary-op-suggest-deref.rs:78:17
|
LL | let _ = FOO & (*"Sized".to_string().into_boxed_str());
| ^ doesn't have a size known at compile-time
|
= help: the trait `Sized` is not implemented for `str`

error: aborting due to 24 previous errors

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

0 comments on commit c29b565

Please sign in to comment.