mikros/rust
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

change make_query_outlives to take an iterator

Browse Source
This commit is contained in:
Niko Matsakis 2018-08-21 19:19:49 -04:00
parent a9d496796f
commit 1ca467d4a1
2 changed files with 18 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
src/librustc/infer/canonical/query_result.rs
View File

@ -24,19 +24,18 @@
}; };
use infer::region_constraints::{Constraint, RegionConstraintData}; use infer::region_constraints::{Constraint, RegionConstraintData};
use infer::InferCtxtBuilder; use infer::InferCtxtBuilder;
use infer::{InferCtxt, InferOk, InferResult, RegionObligation}; use infer::{InferCtxt, InferOk, InferResult};
use rustc_data_structures::indexed_vec::Idx; use rustc_data_structures::indexed_vec::Idx;
use rustc_data_structures::indexed_vec::IndexVec; use rustc_data_structures::indexed_vec::IndexVec;
use rustc_data_structures::sync::Lrc; use rustc_data_structures::sync::Lrc;
use std::fmt::Debug; use std::fmt::Debug;
use syntax::ast;
use syntax_pos::DUMMY_SP; use syntax_pos::DUMMY_SP;
use traits::query::{Fallible, NoSolution}; use traits::query::{Fallible, NoSolution};
use traits::{FulfillmentContext, TraitEngine}; use traits::{FulfillmentContext, TraitEngine};
use traits::{Obligation, ObligationCause, PredicateObligation}; use traits::{Obligation, ObligationCause, PredicateObligation};
use ty::fold::TypeFoldable; use ty::fold::TypeFoldable;
use ty::subst::{Kind, UnpackedKind}; use ty::subst::{Kind, UnpackedKind};
use ty::{self, CanonicalVar, Lift, TyCtxt}; use ty::{self, CanonicalVar, Lift, Ty, TyCtxt};
impl<'cx, 'gcx, 'tcx> InferCtxtBuilder<'cx, 'gcx, 'tcx> { impl<'cx, 'gcx, 'tcx> InferCtxtBuilder<'cx, 'gcx, 'tcx> {
/// The "main method" for a canonicalized trait query. Given the /// The "main method" for a canonicalized trait query. Given the
@ -157,7 +156,12 @@ fn make_query_result<T>(
let region_obligations = self.take_registered_region_obligations(); let region_obligations = self.take_registered_region_obligations();
let region_constraints = self.with_region_constraints(|region_constraints| { let region_constraints = self.with_region_constraints(|region_constraints| {
make_query_outlives(tcx, region_obligations, region_constraints) make_query_outlives(
tcx,
region_obligations
.iter()
.map(|(_, r_o)| (r_o.sup_type, r_o.sub_region)),
region_constraints)
}); });
let certainty = if ambig_errors.is_empty() { let certainty = if ambig_errors.is_empty() {
@ -567,7 +571,7 @@ fn unify_canonical_vars(
/// creates query region constraints. /// creates query region constraints.
pub fn make_query_outlives<'tcx>( pub fn make_query_outlives<'tcx>(
tcx: TyCtxt<'_, '_, 'tcx>, tcx: TyCtxt<'_, '_, 'tcx>,
region_obligations: Vec<(ast::NodeId, RegionObligation<'tcx>)>, outlives_obligations: impl Iterator<Item = (Ty<'tcx>, ty::Region<'tcx>)>,
region_constraints: &RegionConstraintData<'tcx>, region_constraints: &RegionConstraintData<'tcx>,
) -> Vec<QueryRegionConstraint<'tcx>> { ) -> Vec<QueryRegionConstraint<'tcx>> {
let RegionConstraintData { let RegionConstraintData {
@ -600,9 +604,8 @@ pub fn make_query_outlives<'tcx>(
.collect(); .collect();
outlives.extend( outlives.extend(
region_obligations outlives_obligations
.into_iter() .map(|(ty, r)| ty::OutlivesPredicate(ty.into(), r))
.map(|(_, r_o)| ty::OutlivesPredicate(r_o.sup_type.into(), r_o.sub_region))
.map(ty::Binder::dummy), // no bound regions in the code above .map(ty::Binder::dummy), // no bound regions in the code above
); );

9
src/librustc/traits/query/type_op/custom.rs
View File

@ -102,8 +102,13 @@ fn scrape_region_constraints<'gcx, 'tcx, R>(
let region_constraint_data = infcx.take_and_reset_region_constraints(); let region_constraint_data = infcx.take_and_reset_region_constraints();
let outlives = let outlives = query_result::make_query_outlives(
query_result::make_query_outlives(infcx.tcx, region_obligations, &region_constraint_data); infcx.tcx,
region_obligations
.iter()
.map(|(_, r_o)| (r_o.sup_type, r_o.sub_region)),
&region_constraint_data,
);
if outlives.is_empty() { if outlives.is_empty() {
Ok((value, None)) Ok((value, None))