squiid/rust
1
0
Fork 0
Code Issues Pull requests Projects Activity

Rollup merge of #102069 - compiler-errors:no-eq-in-register-opaque, r=oli-obk

Browse source 
Skip `Equate` relation in `handle_opaque_type`

r? ``@oli-obk``
This commit is contained in:
Dylan DPC 2022-09-22 18:25:54 +05:30 committed by GitHub
parent d5ae6737bf 5b96e5e71a
commit 8bf533593d
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 3 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
compiler/rustc_infer/src/infer/opaque_types.rs
View file

@ -7,6 +7,7 @@ use rustc_data_structures::sync::Lrc;
use rustc_data_structures::vec_map::VecMap; use rustc_data_structures::vec_map::VecMap;
use rustc_hir as hir; use rustc_hir as hir;
use rustc_middle::traits::ObligationCause; use rustc_middle::traits::ObligationCause;
use rustc_middle::ty::error::{ExpectedFound, TypeError};
use rustc_middle::ty::fold::BottomUpFolder; use rustc_middle::ty::fold::BottomUpFolder;
use rustc_middle::ty::GenericArgKind; use rustc_middle::ty::GenericArgKind;
use rustc_middle::ty::{ use rustc_middle::ty::{
@ -176,16 +177,8 @@ impl<'a, 'tcx> InferCtxt<'a, 'tcx> {
} else if let Some(res) = process(b, a) { } else if let Some(res) = process(b, a) {
res res
} else { } else {
// Rerun equality check, but this time error out due to let (a, b) = self.resolve_vars_if_possible((a, b));
// different types. Err(TypeError::Sorts(ExpectedFound::new(true, a, b)))
match self.at(cause, param_env).define_opaque_types(false).eq(a, b) {
Ok(_) => span_bug!(
cause.span,
"opaque types are never equal to anything but themselves: {:#?}",
(a.kind(), b.kind())
),
Err(e) => Err(e),
}
} }
} }