Skip to content

Commit d8352af

Browse files
Fix up tidy errors
1 parent d64bd2a commit d8352af

File tree

2 files changed

+8
-3
lines changed

2 files changed

+8
-3
lines changed

src/librustc_typeck/check/method/confirm.rs

+2-1
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,8 @@ use rustc::ty::subst::Substs;
1717
use rustc::traits;
1818
use rustc::ty::{self, Ty};
1919
use rustc::ty::subst::Subst;
20-
use rustc::ty::adjustment::{Adjustment, Adjust, AllowTwoPhase, AutoBorrow, AutoBorrowMutability, OverloadedDeref};
20+
use rustc::ty::adjustment::{Adjustment, Adjust, OverloadedDeref};
21+
use rustc::ty::adjustment::{AllowTwoPhase, AutoBorrow, AutoBorrowMutability};
2122
use rustc::ty::fold::TypeFoldable;
2223
use rustc::infer::{self, InferOk};
2324
use syntax_pos::Span;

src/librustc_typeck/check/mod.rs

+6-2
Original file line numberDiff line numberDiff line change
@@ -2648,8 +2648,12 @@ impl<'a, 'gcx, 'tcx> FnCtxt<'a, 'gcx, 'tcx> {
26482648
// to, which is `expected_ty` if `rvalue_hint` returns an
26492649
// `ExpectHasType(expected_ty)`, or the `formal_ty` otherwise.
26502650
let coerce_ty = expected.and_then(|e| e.only_has_type(self));
2651-
// We're processing function arguments so we definitely want to use two-phase borrows.
2652-
self.demand_coerce(&arg, checked_ty, coerce_ty.unwrap_or(formal_ty), AllowTwoPhase::Yes);
2651+
// We're processing function arguments so we definitely want to use
2652+
// two-phase borrows.
2653+
self.demand_coerce(&arg,
2654+
checked_ty,
2655+
coerce_ty.unwrap_or(formal_ty),
2656+
AllowTwoPhase::Yes);
26532657

26542658
// 3. Relate the expected type and the formal one,
26552659
// if the expected type was used for the coercion.

0 commit comments

Comments
 (0)