diff options
| author | Niko Matsakis <niko@alum.mit.edu> | 2017-05-24 12:01:53 -0400 |
|---|---|---|
| committer | Niko Matsakis <niko@alum.mit.edu> | 2017-06-01 13:31:12 -0400 |
| commit | af223fae27d2aa16743abadeb5635f8452a49894 (patch) | |
| tree | 86d5b4ee0a51f6a7ce1a99b2cb08181424036266 /src/librustc/traits | |
| parent | c7a2e32c102057242950697da6b83b2190b00dfb (diff) | |
| download | rust-af223fae27d2aa16743abadeb5635f8452a49894.tar.gz rust-af223fae27d2aa16743abadeb5635f8452a49894.zip | |
pacify the mercilous tidy
Diffstat (limited to 'src/librustc/traits')
| -rw-r--r-- | src/librustc/traits/fulfill.rs | 12 | ||||
| -rw-r--r-- | src/librustc/traits/project.rs | 5 | ||||
| -rw-r--r-- | src/librustc/traits/select.rs | 4 |
3 files changed, 16 insertions, 5 deletions
diff --git a/src/librustc/traits/fulfill.rs b/src/librustc/traits/fulfill.rs index daeb96e188d..c2fe0453437 100644 --- a/src/librustc/traits/fulfill.rs +++ b/src/librustc/traits/fulfill.rs @@ -420,7 +420,9 @@ fn process_predicate<'a, 'gcx, 'tcx>( } ty::Predicate::Equate(ref binder) => { - match selcx.infcx().equality_predicate(&obligation.cause, obligation.param_env, binder) { + match selcx.infcx().equality_predicate(&obligation.cause, + obligation.param_env, + binder) { Ok(InferOk { obligations, value: () }) => { Ok(Some(obligations)) }, @@ -508,7 +510,9 @@ fn process_predicate<'a, 'gcx, 'tcx>( } ty::Predicate::WellFormed(ty) => { - match ty::wf::obligations(selcx.infcx(), obligation.param_env, obligation.cause.body_id, + match ty::wf::obligations(selcx.infcx(), + obligation.param_env, + obligation.cause.body_id, ty, obligation.cause.span) { None => { pending_obligation.stalled_on = vec![ty]; @@ -519,7 +523,9 @@ fn process_predicate<'a, 'gcx, 'tcx>( } ty::Predicate::Subtype(ref subtype) => { - match selcx.infcx().subtype_predicate(&obligation.cause, obligation.param_env, subtype) { + match selcx.infcx().subtype_predicate(&obligation.cause, + obligation.param_env, + subtype) { None => { // none means that both are unresolved pending_obligation.stalled_on = vec![subtype.skip_binder().a, diff --git a/src/librustc/traits/project.rs b/src/librustc/traits/project.rs index dbeaf46e8be..787452121d3 100644 --- a/src/librustc/traits/project.rs +++ b/src/librustc/traits/project.rs @@ -500,7 +500,10 @@ fn opt_normalize_projection_type<'a, 'b, 'gcx, 'tcx>( cacheable); let result = if projected_ty.has_projection_types() { - let mut normalizer = AssociatedTypeNormalizer::new(selcx, param_env, cause, depth+1); + let mut normalizer = AssociatedTypeNormalizer::new(selcx, + param_env, + cause, + depth+1); let normalized_ty = normalizer.fold(&projected_ty); debug!("opt_normalize_projection_type: \ diff --git a/src/librustc/traits/select.rs b/src/librustc/traits/select.rs index 6ac26e413ce..998201ad8d9 100644 --- a/src/librustc/traits/select.rs +++ b/src/librustc/traits/select.rs @@ -553,7 +553,9 @@ impl<'cx, 'gcx, 'tcx> SelectionContext<'cx, 'gcx, 'tcx> { } ty::Predicate::WellFormed(ty) => { - match ty::wf::obligations(self.infcx, obligation.param_env, obligation.cause.body_id, + match ty::wf::obligations(self.infcx, + obligation.param_env, + obligation.cause.body_id, ty, obligation.cause.span) { Some(obligations) => self.evaluate_predicates_recursively(previous_stack, obligations.iter()), |