bjoernager/rust
bjoernager/rust
1
Fork 0
Code Issues Pull requests Activity

move code to InferCtxt method

Browse source
This commit is contained in:
Ellen 2021-08-19 21:04:04 +01:00
parent ab61e722ee
commit c2b61fbafe
3 changed files with 18 additions and 16 deletions
Download patch file Download diff file Expand all files Collapse all files

9
compiler/rustc_trait_selection/src/traits/select/mod.rs
View file

@ -33,7 +33,6 @@ use rustc_errors::ErrorReported;
use rustc_hir as hir;
use rustc_hir::def_id::DefId;
use rustc_hir::Constness;
use rustc_infer::infer::canonical::OriginalQueryValues;
use rustc_infer::infer::LateBoundRegionConversionTime;
use rustc_middle::dep_graph::{DepKind, DepNodeIndex};
use rustc_middle::mir::abstract_const::NotConstEvaluatable;
@ -609,13 +608,7 @@ impl<'cx, 'tcx> SelectionContext<'cx, 'tcx> {
if let (ty::ConstKind::Unevaluated(a), ty::ConstKind::Unevaluated(b)) =
(c1.val, c2.val)
{
let canonical = self.infcx.canonicalize_query(
((a.def, a.substs), (b.def, b.substs)),
&mut OriginalQueryValues::default(),
);
debug!("canonical consts: {:?}", &canonical.value);
if self.tcx().try_unify_abstract_consts(canonical.value) {
if self.infcx.try_unify_abstract_consts(a, b) {
return Ok(EvaluatedToOk);
}
}