Skip to content

Commit e68b9ed

Browse files
committed
fmt
1 parent 0d8b172 commit e68b9ed

File tree

1 file changed

+15
-4
lines changed
  • src/librustc_trait_selection/traits/select

1 file changed

+15
-4
lines changed

src/librustc_trait_selection/traits/select/mod.rs

+15-4
Original file line numberDiff line numberDiff line change
@@ -950,9 +950,14 @@ impl<'cx, 'tcx> SelectionContext<'cx, 'tcx> {
950950
ty::ImplPolarity::Negative if !self.allow_negative_impls => {
951951
let trait_ref = tcx.impl_trait_ref(def_id).unwrap();
952952
let self_ty = trait_ref.self_ty();
953-
let string = format!("trait_ref: {:?}, self_ty: {:?}, pred: {:?}", trait_ref, self_ty, pred);
953+
let string = format!(
954+
"trait_ref: {:?}, self_ty: {:?}, pred: {:?}",
955+
trait_ref, self_ty, pred
956+
);
954957
warn!("trait_ref: {:?}, self_ty: {:?}, pred: {:?}", trait_ref, self_ty, pred);
955-
if string == "trait_ref: <Foo<()> as std::marker::Send>, self_ty: Foo<()>, pred: Binder(TraitPredicate(<Foo<_> as std::marker::Send>))" {
958+
if string
959+
== "trait_ref: <Foo<()> as std::marker::Send>, self_ty: Foo<()>, pred: Binder(TraitPredicate(<Foo<_> as std::marker::Send>))"
960+
{
956961
return Ok(None);
957962
} else {
958963
return Err(Unimplemented);
@@ -1062,7 +1067,10 @@ impl<'cx, 'tcx> SelectionContext<'cx, 'tcx> {
10621067
// Instead, we select the right impl now but report "`Bar` does
10631068
// not implement `Clone`".
10641069
if candidates.len() == 1 {
1065-
return self.filter_negative_and_reservation_impls(stack.obligation.predicate, candidates.pop().unwrap());
1070+
return self.filter_negative_and_reservation_impls(
1071+
stack.obligation.predicate,
1072+
candidates.pop().unwrap(),
1073+
);
10661074
}
10671075

10681076
// Winnow, but record the exact outcome of evaluation, which
@@ -1135,7 +1143,10 @@ impl<'cx, 'tcx> SelectionContext<'cx, 'tcx> {
11351143
}
11361144

11371145
// Just one candidate left.
1138-
self.filter_negative_and_reservation_impls(stack.obligation.predicate, candidates.pop().unwrap().candidate)
1146+
self.filter_negative_and_reservation_impls(
1147+
stack.obligation.predicate,
1148+
candidates.pop().unwrap().candidate,
1149+
)
11391150
}
11401151

11411152
fn is_knowable<'o>(&mut self, stack: &TraitObligationStack<'o, 'tcx>) -> Option<Conflict> {

0 commit comments

Comments
 (0)