bjoernager/rust
bjoernager/rust
1
Fork 0
Code Activity

Rollup merge of #102133 - b-naber:use-valtrees-in-fast-reject, r=lcnr

Browse source 
Use valtrees for comparison

r? `@lcnr`
This commit is contained in:
Matthias Krüger 2022-09-22 21:34:54 +02:00 • committed by GitHub
commit aa384834d7
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 1 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

9
compiler/rustc_middle/src/ty/fast_reject.rs
View file

@ -384,14 +384,7 @@ impl DeepRejectCtxt {
// they might unify with any value. // they might unify with any value.
ty::ConstKind::Unevaluated(_) | ty::ConstKind::Error(_) => true, ty::ConstKind::Unevaluated(_) | ty::ConstKind::Error(_) => true,
ty::ConstKind::Value(obl) => match k { ty::ConstKind::Value(obl) => match k {
ty::ConstKind::Value(imp) => { ty::ConstKind::Value(imp) => obl == imp,
// FIXME(valtrees): Once we have valtrees, we can just
// compare them directly here.
match (obl.try_to_scalar_int(), imp.try_to_scalar_int()) {
(Some(obl), Some(imp)) => obl == imp,
_ => true,
}
}
_ => true, _ => true,
}, },