Skip to content

Commit c55c312

Browse files
committed
Fix tidy errors
1 parent 6d54672 commit c55c312

File tree

1 file changed

+11
-6
lines changed

1 file changed

+11
-6
lines changed

src/librustc/traits/select.rs

Lines changed: 11 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -657,7 +657,7 @@ impl<'cx, 'gcx, 'tcx> SelectionContext<'cx, 'gcx, 'tcx> {
657657
&mut self,
658658
stack: TraitObligationStackList<'o, 'tcx>,
659659
predicates: I,
660-
recursion_depth: usize
660+
recursion_depth: usize
661661
) -> Result<EvaluationResult, OverflowError>
662662
where
663663
I: IntoIterator<Item = &'a PredicateObligation<'tcx>>,
@@ -708,7 +708,8 @@ impl<'cx, 'gcx, 'tcx> SelectionContext<'cx, 'gcx, 'tcx> {
708708
ty::Predicate::Trait(ref t) => {
709709
debug_assert!(!t.has_escaping_bound_vars());
710710
let obligation = obligation.with(t.clone());
711-
self.evaluate_trait_predicate_recursively(previous_stack, obligation, recursion_depth)
711+
self.evaluate_trait_predicate_recursively(previous_stack, obligation,
712+
recursion_depth)
712713
}
713714

714715
ty::Predicate::Subtype(ref p) => {
@@ -717,7 +718,8 @@ impl<'cx, 'gcx, 'tcx> SelectionContext<'cx, 'gcx, 'tcx> {
717718
.subtype_predicate(&obligation.cause, obligation.param_env, p)
718719
{
719720
Some(Ok(InferOk { obligations, .. })) => {
720-
self.evaluate_predicates_recursively(previous_stack, &obligations, recursion_depth)
721+
self.evaluate_predicates_recursively(previous_stack, &obligations,
722+
recursion_depth)
721723
}
722724
Some(Err(_)) => Ok(EvaluatedToErr),
723725
None => Ok(EvaluatedToAmbig),
@@ -732,7 +734,8 @@ impl<'cx, 'gcx, 'tcx> SelectionContext<'cx, 'gcx, 'tcx> {
732734
obligation.cause.span,
733735
) {
734736
Some(obligations) => {
735-
self.evaluate_predicates_recursively(previous_stack, obligations.iter(), recursion_depth)
737+
self.evaluate_predicates_recursively(previous_stack, obligations.iter(),
738+
recursion_depth)
736739
}
737740
None => Ok(EvaluatedToAmbig),
738741
},
@@ -1108,7 +1111,8 @@ impl<'cx, 'gcx, 'tcx> SelectionContext<'cx, 'gcx, 'tcx> {
11081111

11091112
// The weird return type of this function allows it to be used with the 'try' (?)
11101113
// operator within certain functions
1111-
fn check_recursion_limit<T: Display + TypeFoldable<'tcx>>(&self, recursion_depth: usize, obligation: &Obligation<'tcx, T>,
1114+
fn check_recursion_limit<T: Display + TypeFoldable<'tcx>>(&self, recursion_depth: usize,
1115+
obligation: &Obligation<'tcx, T>,
11121116
) -> Result<(), OverflowError> {
11131117
let recursion_limit = *self.infcx.tcx.sess.recursion_limit.get();
11141118
if recursion_depth >= recursion_limit {
@@ -1813,7 +1817,8 @@ impl<'cx, 'gcx, 'tcx> SelectionContext<'cx, 'gcx, 'tcx> {
18131817
self.evaluation_probe(|this| {
18141818
match this.match_where_clause_trait_ref(stack.obligation, where_clause_trait_ref) {
18151819
Ok(obligations) => {
1816-
this.evaluate_predicates_recursively(stack.list(), obligations.iter(), recursion_depth)
1820+
this.evaluate_predicates_recursively(stack.list(), obligations.iter(),
1821+
recursion_depth)
18171822
}
18181823
Err(()) => Ok(EvaluatedToErr),
18191824
}

0 commit comments

Comments
 (0)