Skip to content

Commit b24b887

Browse files
committed
select.rs: rustfmt
1 parent d4e4e37 commit b24b887

File tree

1 file changed

+9
-7
lines changed

1 file changed

+9
-7
lines changed

src/librustc/traits/select.rs

Lines changed: 9 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1368,7 +1368,8 @@ impl<'cx, 'gcx, 'tcx> SelectionContext<'cx, 'gcx, 'tcx> {
13681368

13691369
// Winnow, but record the exact outcome of evaluation, which
13701370
// is needed for specialization. Propagate overflow if it occurs.
1371-
let mut candidates = candidates.into_iter()
1371+
let mut candidates = candidates
1372+
.into_iter()
13721373
.map(|c| match self.evaluate_candidate(stack, &c) {
13731374
Ok(eval) if eval.may_apply() => Ok(Some(EvaluatedCandidate {
13741375
candidate: c,
@@ -1377,8 +1378,8 @@ impl<'cx, 'gcx, 'tcx> SelectionContext<'cx, 'gcx, 'tcx> {
13771378
Ok(_) => Ok(None),
13781379
Err(OverflowError) => Err(Overflow),
13791380
})
1380-
.flat_map(Result::transpose)
1381-
.collect::<Result<Vec<_>, _>>()?;
1381+
.flat_map(Result::transpose)
1382+
.collect::<Result<Vec<_>, _>>()?;
13821383

13831384
debug!(
13841385
"winnowed to {} candidates for {:?}: {:?}",
@@ -3004,9 +3005,7 @@ impl<'cx, 'gcx, 'tcx> SelectionContext<'cx, 'gcx, 'tcx> {
30043005
let self_ty = self.infcx
30053006
.shallow_resolve(*obligation.self_ty().skip_binder());
30063007
let poly_trait_ref = match self_ty.sty {
3007-
ty::Dynamic(ref data, ..) => {
3008-
data.principal().with_self_ty(self.tcx(), self_ty)
3009-
}
3008+
ty::Dynamic(ref data, ..) => data.principal().with_self_ty(self.tcx(), self_ty),
30103009
_ => span_bug!(obligation.cause.span, "object candidate with non-object"),
30113010
};
30123011

@@ -3672,7 +3671,10 @@ impl<'cx, 'gcx, 'tcx> SelectionContext<'cx, 'gcx, 'tcx> {
36723671
);
36733672
let closure_type = self.infcx.closure_sig(closure_def_id, substs);
36743673

3675-
debug!("closure_trait_ref_unnormalized: closure_type = {:?}", closure_type);
3674+
debug!(
3675+
"closure_trait_ref_unnormalized: closure_type = {:?}",
3676+
closure_type
3677+
);
36763678

36773679
// (1) Feels icky to skip the binder here, but OTOH we know
36783680
// that the self-type is an unboxed closure type and hence is

0 commit comments

Comments
 (0)