random reformatting

This commit is contained in:
Niko Matsakis
2018-02-21 04:16:25 -05:00
parent 0037cca2f7
commit 652b3b71f3
2 changed files with 16 additions and 17 deletions

View File

@@ -105,8 +105,7 @@ impl<'gen, 'typeck, 'flow, 'gcx, 'tcx> TypeLivenessGenerator<'gen, 'typeck, 'flo
for live_local in live_locals { for live_local in live_locals {
debug!( debug!(
"add_liveness_constraints: location={:?} live_local={:?}", "add_liveness_constraints: location={:?} live_local={:?}",
location, location, live_local
live_local
); );
self.flow_inits.each_state_bit(|mpi_init| { self.flow_inits.each_state_bit(|mpi_init| {
@@ -157,8 +156,7 @@ impl<'gen, 'typeck, 'flow, 'gcx, 'tcx> TypeLivenessGenerator<'gen, 'typeck, 'flo
{ {
debug!( debug!(
"push_type_live_constraint(live_ty={:?}, location={:?})", "push_type_live_constraint(live_ty={:?}, location={:?})",
value, value, location
location
); );
self.tcx.for_each_free_region(&value, |live_region| { self.tcx.for_each_free_region(&value, |live_region| {
@@ -182,9 +180,7 @@ impl<'gen, 'typeck, 'flow, 'gcx, 'tcx> TypeLivenessGenerator<'gen, 'typeck, 'flo
) { ) {
debug!( debug!(
"add_drop_live_constraint(dropped_local={:?}, dropped_ty={:?}, location={:?})", "add_drop_live_constraint(dropped_local={:?}, dropped_ty={:?}, location={:?})",
dropped_local, dropped_local, dropped_ty, location
dropped_ty,
location
); );
// If we end visiting the same type twice (usually due to a cycle involving // If we end visiting the same type twice (usually due to a cycle involving

View File

@@ -243,8 +243,7 @@ impl<'a, 'b, 'gcx, 'tcx> TypeVerifier<'a, 'b, 'gcx, 'tcx> {
fn sanitize_constant(&mut self, constant: &Constant<'tcx>, location: Location) { fn sanitize_constant(&mut self, constant: &Constant<'tcx>, location: Location) {
debug!( debug!(
"sanitize_constant(constant={:?}, location={:?})", "sanitize_constant(constant={:?}, location={:?})",
constant, constant, location
location
); );
let expected_ty = match constant.literal { let expected_ty = match constant.literal {
@@ -678,8 +677,10 @@ impl<'a, 'gcx, 'tcx> TypeChecker<'a, 'gcx, 'tcx> {
let data = self.infcx.take_and_reset_region_constraints(); let data = self.infcx.take_and_reset_region_constraints();
if !data.is_empty() { if !data.is_empty() {
debug!("fully_perform_op: constraints generated at {:?} are {:#?}", debug!(
locations, data); "fully_perform_op: constraints generated at {:?} are {:#?}",
locations, data
);
self.constraints self.constraints
.outlives_sets .outlives_sets
.push(OutlivesSet { locations, data }); .push(OutlivesSet { locations, data });
@@ -1137,12 +1138,16 @@ impl<'a, 'gcx, 'tcx> TypeChecker<'a, 'gcx, 'tcx> {
} }
TerminatorKind::FalseUnwind { TerminatorKind::FalseUnwind {
real_target, real_target,
unwind unwind,
} => { } => {
self.assert_iscleanup(mir, block_data, real_target, is_cleanup); self.assert_iscleanup(mir, block_data, real_target, is_cleanup);
if let Some(unwind) = unwind { if let Some(unwind) = unwind {
if is_cleanup { if is_cleanup {
span_mirbug!(self, block_data, "cleanup in cleanup block via false unwind"); span_mirbug!(
self,
block_data,
"cleanup in cleanup block via false unwind"
);
} }
self.assert_iscleanup(mir, block_data, unwind, true); self.assert_iscleanup(mir, block_data, unwind, true);
} }
@@ -1435,8 +1440,7 @@ impl<'a, 'gcx, 'tcx> TypeChecker<'a, 'gcx, 'tcx> {
debug!( debug!(
"prove_aggregate_predicates(aggregate_kind={:?}, location={:?})", "prove_aggregate_predicates(aggregate_kind={:?}, location={:?})",
aggregate_kind, aggregate_kind, location
location
); );
let instantiated_predicates = match aggregate_kind { let instantiated_predicates = match aggregate_kind {
@@ -1502,8 +1506,7 @@ impl<'a, 'gcx, 'tcx> TypeChecker<'a, 'gcx, 'tcx> {
fn prove_predicates(&mut self, predicates: &[ty::Predicate<'tcx>], location: Location) { fn prove_predicates(&mut self, predicates: &[ty::Predicate<'tcx>], location: Location) {
debug!( debug!(
"prove_predicates(predicates={:?}, location={:?})", "prove_predicates(predicates={:?}, location={:?})",
predicates, predicates, location
location
); );
self.fully_perform_op(location.at_self(), |this| { self.fully_perform_op(location.at_self(), |this| {
let cause = this.misc(this.last_span); let cause = this.misc(this.last_span);