diff options
| author | bors <bors@rust-lang.org> | 2023-03-05 01:15:46 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2023-03-05 01:15:46 +0000 |
| commit | 70e85d146fee03c09e28a02c9c18d56e74254f3c (patch) | |
| tree | 7613924ff07dd42517ee69b96194f882d99d142a | |
| parent | 78f0f78826c394eab1b522761014e38a8b02f66e (diff) | |
| parent | f95d9deafd0f4d206eea02f2ab56b1c495f2f8d3 (diff) | |
| download | rust-70e85d146fee03c09e28a02c9c18d56e74254f3c.tar.gz rust-70e85d146fee03c09e28a02c9c18d56e74254f3c.zip | |
Auto merge of #10403 - smoelius:fix-107877, r=Jarcho
Fix rust-lang/rust#107877, etc. Fix #10009 Fix #10387 Fix https://github.com/rust-lang/rust/issues/107877 The fix is to verify that the associated item's trait is implemented before trying to project the item's type. r? `@Jarcho` --- changelog: ICE: [`needless_borrow`]: No longer panics on ambiguous projections [#10403](https://github.com/rust-lang/rust-clippy/pull/10403) <!-- changelog_checked -->
| -rw-r--r-- | clippy_lints/src/dereference.rs | 8 | ||||
| -rw-r--r-- | tests/ui/crashes/ice-rust-107877.rs | 17 |
2 files changed, 21 insertions, 4 deletions
diff --git a/clippy_lints/src/dereference.rs b/clippy_lints/src/dereference.rs index 5246a86cf84..6409050ea66 100644 --- a/clippy_lints/src/dereference.rs +++ b/clippy_lints/src/dereference.rs @@ -1357,10 +1357,10 @@ fn replace_types<'tcx>( && let Some(term_ty) = projection_predicate.term.ty() && let ty::Param(term_param_ty) = term_ty.kind() { - let item_def_id = projection_predicate.projection_ty.def_id; - let assoc_item = cx.tcx.associated_item(item_def_id); - let projection = cx.tcx - .mk_projection(assoc_item.def_id, cx.tcx.mk_substs_trait(new_ty, [])); + let projection = cx.tcx.mk_ty(ty::Alias( + ty::Projection, + projection_predicate.projection_ty.with_self_ty(cx.tcx, new_ty), + )); if let Ok(projected_ty) = cx.tcx.try_normalize_erasing_regions(cx.param_env, projection) && substs[term_param_ty.index as usize] != ty::GenericArg::from(projected_ty) diff --git a/tests/ui/crashes/ice-rust-107877.rs b/tests/ui/crashes/ice-rust-107877.rs new file mode 100644 index 00000000000..7f5bae60d55 --- /dev/null +++ b/tests/ui/crashes/ice-rust-107877.rs @@ -0,0 +1,17 @@ +#![allow(dead_code)] + +struct Foo; + +impl<'a> std::convert::TryFrom<&'a String> for Foo { + type Error = std::convert::Infallible; + + fn try_from(_: &'a String) -> Result<Self, Self::Error> { + Ok(Foo) + } +} + +fn find<E>(_: impl std::convert::TryInto<Foo, Error = E>) {} + +fn main() { + find(&String::new()); +} |
