diff options
| author | bors <bors@rust-lang.org> | 2022-10-27 07:24:39 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2022-10-27 07:24:39 +0000 |
| commit | 9dd3d29ec848efd753667292277fd9f297d7db8d (patch) | |
| tree | 6393506c984e64e78f554a9205deb89f8499cf8b /compiler | |
| parent | 44fcfb0a9606fa08ea293a71f2e6d470227ef9df (diff) | |
| parent | 901649eeb7a42d521b222ee42701cc06655e9cd8 (diff) | |
| download | rust-9dd3d29ec848efd753667292277fd9f297d7db8d.tar.gz rust-9dd3d29ec848efd753667292277fd9f297d7db8d.zip | |
Auto merge of #103601 - compiler-errors:no-opaque-probe-in-nll-relate, r=oli-obk
Remove `commit_if_ok` probe from NLL type relation It was not really necessary to add the `commit_if_ok` in #100092 -- I added it to protect us against weird inference error messages due to recursive RPIT calls, but we are always on the error path when this happens anyways, and I can't come up with an example that makes this manifest. Fixes #103599 r? `@oli-obk` since you reviewed #100092, feel free to re-roll. :b: :loudspeaker: beta-nominating this since it's on beta (which forks in ~a week~ two days :fearful:) -- worst case we could revert the original PR on beta and land this on nightly, to give it some extra soak time...
Diffstat (limited to 'compiler')
| -rw-r--r-- | compiler/rustc_infer/src/infer/nll_relate/mod.rs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/compiler/rustc_infer/src/infer/nll_relate/mod.rs b/compiler/rustc_infer/src/infer/nll_relate/mod.rs index 7c186ae9470..bd4a1155092 100644 --- a/compiler/rustc_infer/src/infer/nll_relate/mod.rs +++ b/compiler/rustc_infer/src/infer/nll_relate/mod.rs @@ -592,7 +592,7 @@ where (&ty::Infer(ty::TyVar(vid)), _) => self.relate_ty_var((vid, b)), (&ty::Opaque(a_def_id, _), &ty::Opaque(b_def_id, _)) if a_def_id == b_def_id => { - infcx.commit_if_ok(|_| infcx.super_combine_tys(self, a, b)).or_else(|err| { + infcx.super_combine_tys(self, a, b).or_else(|err| { self.tcx().sess.delay_span_bug( self.delegate.span(), "failure to relate an opaque to itself should result in an error later on", |