Skip to content

Commit a18c779

Browse files
committed
pacify the mercilous tidy
long lines, trailing newlines
1 parent 4831146 commit a18c779

File tree

4 files changed

+15
-6
lines changed
  • src
    • librustc_data_structures/graph/vec_graph
    • librustc_mir/borrow_check/nll/region_infer
    • librustc/infer

4 files changed

+15
-6
lines changed

src/librustc/infer/canonical/mod.rs

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -307,7 +307,8 @@ impl<'tcx, V> Canonical<'tcx, V> {
307307
}
308308
}
309309

310-
pub type QueryOutlivesConstraint<'tcx> = ty::Binder<ty::OutlivesPredicate<Kind<'tcx>, Region<'tcx>>>;
310+
pub type QueryOutlivesConstraint<'tcx> =
311+
ty::Binder<ty::OutlivesPredicate<Kind<'tcx>, Region<'tcx>>>;
311312

312313
impl<'cx, 'tcx> InferCtxt<'cx, 'tcx> {
313314
/// Creates a substitution S for the canonical value with fresh

src/librustc/infer/region_constraints/mod.rs

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -973,6 +973,9 @@ impl<'tcx> RegionConstraintData<'tcx> {
973973
verifys,
974974
givens,
975975
} = self;
976-
constraints.is_empty() && pick_constraints.is_empty() && verifys.is_empty() && givens.is_empty()
976+
constraints.is_empty() &&
977+
pick_constraints.is_empty() &&
978+
verifys.is_empty() &&
979+
givens.is_empty()
977980
}
978981
}

src/librustc_data_structures/graph/vec_graph/mod.rs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -110,4 +110,3 @@ impl<N: Idx> WithSuccessors for VecGraph<N> {
110110
self.successors(node).iter().cloned()
111111
}
112112
}
113-

src/librustc_mir/borrow_check/nll/region_infer/mod.rs

Lines changed: 9 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1493,19 +1493,25 @@ impl<'tcx> RegionInferenceContext<'tcx> {
14931493
debug!("check_pick_constraint(p_c_i={:?})", p_c_i);
14941494
let p_c = &pick_constraints[p_c_i];
14951495
let pick_region_vid = p_c.pick_region_vid;
1496-
debug!("check_pick_constraint: pick_region_vid={:?} with value {}", pick_region_vid, self.region_value_str(pick_region_vid));
1496+
debug!(
1497+
"check_pick_constraint: pick_region_vid={:?} with value {}",
1498+
pick_region_vid,
1499+
self.region_value_str(pick_region_vid),
1500+
);
14971501
let option_regions = pick_constraints.option_regions(p_c_i);
14981502
debug!("check_pick_constraint: option_regions={:?}", option_regions);
14991503

15001504
// did the pick-region wind up equal to any of the option regions?
1501-
if let Some(o) = option_regions.iter().find(|&&o_r| self.eval_equal(o_r, p_c.pick_region_vid)) {
1505+
if let Some(o) = option_regions.iter().find(|&&o_r| {
1506+
self.eval_equal(o_r, p_c.pick_region_vid)
1507+
}) {
15021508
debug!("check_pick_constraint: evaluated as equal to {:?}", o);
15031509
continue;
15041510
}
15051511

15061512
// if not, report an error
15071513
let region_scope_tree = &infcx.tcx.region_scope_tree(mir_def_id);
1508-
let pick_region = infcx.tcx.mk_region(ty::ReVar(pick_region_vid)); // XXX
1514+
let pick_region = infcx.tcx.mk_region(ty::ReVar(pick_region_vid));
15091515
opaque_types::unexpected_hidden_region_diagnostic(
15101516
infcx.tcx,
15111517
Some(region_scope_tree),

0 commit comments

Comments
 (0)