Skip to content

Commit 0e3d15b

Browse files
nikomatsakisnikomatsakis
committed
pacify the mercilous tidy
1 parent f58ad99 commit 0e3d15b

File tree

7 files changed

+52
-29
lines changed

7 files changed

+52
-29
lines changed

‎src/librustc/traits/fulfill.rs

+9-3
Original file line numberDiff line numberDiff line change
@@ -420,7 +420,9 @@ fn process_predicate<'a, 'gcx, 'tcx>(
420420
}
421421

422422
ty::Predicate::Equate(ref binder) => {
423-
match selcx.infcx().equality_predicate(&obligation.cause, obligation.param_env, binder) {
423+
match selcx.infcx().equality_predicate(&obligation.cause,
424+
obligation.param_env,
425+
binder) {
424426
Ok(InferOk { obligations, value: () }) => {
425427
Ok(Some(obligations))
426428
},
@@ -508,7 +510,9 @@ fn process_predicate<'a, 'gcx, 'tcx>(
508510
}
509511

510512
ty::Predicate::WellFormed(ty) => {
511-
match ty::wf::obligations(selcx.infcx(), obligation.param_env, obligation.cause.body_id,
513+
match ty::wf::obligations(selcx.infcx(),
514+
obligation.param_env,
515+
obligation.cause.body_id,
512516
ty, obligation.cause.span) {
513517
None => {
514518
pending_obligation.stalled_on = vec![ty];
@@ -519,7 +523,9 @@ fn process_predicate<'a, 'gcx, 'tcx>(
519523
}
520524

521525
ty::Predicate::Subtype(ref subtype) => {
522-
match selcx.infcx().subtype_predicate(&obligation.cause, obligation.param_env, subtype) {
526+
match selcx.infcx().subtype_predicate(&obligation.cause,
527+
obligation.param_env,
528+
subtype) {
523529
None => {
524530
// none means that both are unresolved
525531
pending_obligation.stalled_on = vec![subtype.skip_binder().a,

‎src/librustc/traits/project.rs

+4-1
Original file line numberDiff line numberDiff line change
@@ -500,7 +500,10 @@ fn opt_normalize_projection_type<'a, 'b, 'gcx, 'tcx>(
500500
cacheable);
501501

502502
let result = if projected_ty.has_projection_types() {
503-
let mut normalizer = AssociatedTypeNormalizer::new(selcx, param_env, cause, depth+1);
503+
let mut normalizer = AssociatedTypeNormalizer::new(selcx,
504+
param_env,
505+
cause,
506+
depth+1);
504507
let normalized_ty = normalizer.fold(&projected_ty);
505508

506509
debug!("opt_normalize_projection_type: \

‎src/librustc/traits/select.rs

+3-1
Original file line numberDiff line numberDiff line change
@@ -553,7 +553,9 @@ impl<'cx, 'gcx, 'tcx> SelectionContext<'cx, 'gcx, 'tcx> {
553553
}
554554

555555
ty::Predicate::WellFormed(ty) => {
556-
match ty::wf::obligations(self.infcx, obligation.param_env, obligation.cause.body_id,
556+
match ty::wf::obligations(self.infcx,
557+
obligation.param_env,
558+
obligation.cause.body_id,
557559
ty, obligation.cause.span) {
558560
Some(obligations) =>
559561
self.evaluate_predicates_recursively(previous_stack, obligations.iter()),

‎src/librustc/ty/layout.rs

+27-21
Original file line numberDiff line numberDiff line change
@@ -1788,10 +1788,11 @@ impl<'a, 'tcx> Layout {
17881788
Fields::WithDiscrim(s) => (s, &s.offsets[1..]),
17891789
Fields::NoDiscrim(s) => (s, &s.offsets[0..]),
17901790
};
1791-
let field_info: Vec<_> = flds.iter()
1792-
.zip(field_offsets.iter())
1793-
.map(|(&field_name_ty, offset)| build_field_info(field_name_ty, offset))
1794-
.collect();
1791+
let field_info: Vec<_> =
1792+
flds.iter()
1793+
.zip(field_offsets.iter())
1794+
.map(|(&field_name_ty, offset)| build_field_info(field_name_ty, offset))
1795+
.collect();
17951796

17961797
session::VariantInfo {
17971798
name: n.map(|n|n.to_string()),
@@ -1814,9 +1815,10 @@ impl<'a, 'tcx> Layout {
18141815
debug!("print-type-size t: `{:?}` adt struct-wrapped nullable nndiscr {} is {:?}",
18151816
ty, nndiscr, variant_layout);
18161817
let variant_def = &adt_def.variants[nndiscr as usize];
1817-
let fields: Vec<_> = variant_def.fields.iter()
1818-
.map(|field_def| (field_def.name, field_def.ty(tcx, substs)))
1819-
.collect();
1818+
let fields: Vec<_> =
1819+
variant_def.fields.iter()
1820+
.map(|field_def| (field_def.name, field_def.ty(tcx, substs)))
1821+
.collect();
18201822
record(adt_kind.into(),
18211823
None,
18221824
vec![build_variant_info(Some(variant_def.name),
@@ -1840,9 +1842,10 @@ impl<'a, 'tcx> Layout {
18401842
"univariant with variants {:?}", variant_names());
18411843
if adt_def.variants.len() == 1 {
18421844
let variant_def = &adt_def.variants[0];
1843-
let fields: Vec<_> = variant_def.fields.iter()
1844-
.map(|field_def| (field_def.name, field_def.ty(tcx, substs)))
1845-
.collect();
1845+
let fields: Vec<_> =
1846+
variant_def.fields.iter()
1847+
.map(|f| (f.name, f.ty(tcx, substs)))
1848+
.collect();
18461849
record(adt_kind.into(),
18471850
None,
18481851
vec![build_variant_info(Some(variant_def.name),
@@ -1858,17 +1861,20 @@ impl<'a, 'tcx> Layout {
18581861
Layout::General { ref variants, discr, .. } => {
18591862
debug!("print-type-size t: `{:?}` adt general variants def {} layouts {} {:?}",
18601863
ty, adt_def.variants.len(), variants.len(), variants);
1861-
let variant_infos: Vec<_> = adt_def.variants.iter()
1862-
.zip(variants.iter())
1863-
.map(|(variant_def, variant_layout)| {
1864-
let fields: Vec<_> = variant_def.fields.iter()
1865-
.map(|field_def| (field_def.name, field_def.ty(tcx, substs)))
1866-
.collect();
1867-
build_variant_info(Some(variant_def.name),
1868-
&fields,
1869-
Fields::WithDiscrim(variant_layout))
1870-
})
1871-
.collect();
1864+
let variant_infos: Vec<_> =
1865+
adt_def.variants.iter()
1866+
.zip(variants.iter())
1867+
.map(|(variant_def, variant_layout)| {
1868+
let fields: Vec<_> =
1869+
variant_def.fields
1870+
.iter()
1871+
.map(|f| (f.name, f.ty(tcx, substs)))
1872+
.collect();
1873+
build_variant_info(Some(variant_def.name),
1874+
&fields,
1875+
Fields::WithDiscrim(variant_layout))
1876+
})
1877+
.collect();
18721878
record(adt_kind.into(), Some(discr.size()), variant_infos);
18731879
}
18741880

‎src/librustc_typeck/check/method/probe.rs

+3-1
Original file line numberDiff line numberDiff line change
@@ -1183,7 +1183,9 @@ impl<'a, 'gcx, 'tcx> ProbeContext<'a, 'gcx, 'tcx> {
11831183
traits::normalize(selcx, self.param_env, cause.clone(), &impl_bounds);
11841184

11851185
// Convert the bounds into obligations.
1186-
let obligations = traits::predicates_for_generics(cause.clone(), self.param_env, &impl_bounds);
1186+
let obligations = traits::predicates_for_generics(cause.clone(),
1187+
self.param_env,
1188+
&impl_bounds);
11871189
debug!("impl_obligations={:?}", obligations);
11881190

11891191
// Evaluate those obligations to see if they might possibly hold.

‎src/librustc_typeck/check/mod.rs

+4-1
Original file line numberDiff line numberDiff line change
@@ -1930,7 +1930,10 @@ impl<'a, 'gcx, 'tcx> FnCtxt<'a, 'gcx, 'tcx> {
19301930
-> InferOk<'tcx, T>
19311931
where T : TypeFoldable<'tcx>
19321932
{
1933-
self.inh.normalize_associated_types_in_as_infer_ok(span, self.body_id, self.param_env, value)
1933+
self.inh.normalize_associated_types_in_as_infer_ok(span,
1934+
self.body_id,
1935+
self.param_env,
1936+
value)
19341937
}
19351938

19361939
pub fn write_nil(&self, node_id: ast::NodeId) {

‎src/librustc_typeck/check/regionck.rs

+2-1
Original file line numberDiff line numberDiff line change
@@ -386,7 +386,8 @@ impl<'a, 'gcx, 'tcx> RegionCtxt<'a, 'gcx, 'tcx> {
386386
for &ty in fn_sig_tys {
387387
let ty = self.resolve_type(ty);
388388
debug!("relate_free_regions(t={:?})", ty);
389-
let implied_bounds = ty::wf::implied_bounds(self, self.fcx.param_env, body_id, ty, span);
389+
let implied_bounds =
390+
ty::wf::implied_bounds(self, self.fcx.param_env, body_id, ty, span);
390391

391392
// Record any relations between free regions that we observe into the free-region-map.
392393
self.free_region_map.relate_free_regions_from_implied_bounds(&implied_bounds);

0 commit comments

Comments
 (0)