user0/rust
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Introduce trait query mode and use it to set overflow error handling policy in traits::select

Browse source
This commit is contained in:
Aravind Gollakota 2018-04-19 02:28:03 -05:00
parent 3dd26b8a3e
commit e5535fc7dd
3 changed files with 60 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

4
src/librustc_traits/evaluate_obligation.rs
View file

@ -9,7 +9,7 @@
// except according to those terms.
use rustc::traits::{EvaluationResult, Obligation, ObligationCause,
OverflowError, SelectionContext};
OverflowError, SelectionContext, TraitQueryMode};
use rustc::traits::query::CanonicalPredicateGoal;
use rustc::ty::{ParamEnvAnd, TyCtxt};
use syntax::codemap::DUMMY_SP;
@ -27,7 +27,7 @@ crate fn evaluate_obligation<'tcx>(
_canonical_inference_vars,
) = infcx.instantiate_canonical_with_fresh_inference_vars(DUMMY_SP, &goal);
let mut selcx = SelectionContext::new(&infcx);
let mut selcx = SelectionContext::with_query_mode(&infcx, TraitQueryMode::Canonical);
let obligation = Obligation::new(ObligationCause::dummy(), param_env, predicate);
match selcx.evaluate_obligation_recursively(&obligation) {