bjoernager/rust
bjoernager/rust
1
Fork 0
Code Activity

Revert some whitespace changes

Browse source
This commit is contained in:
John Kåre Alsaker 2017-07-15 01:37:43 +02:00
parent 10def9a6e0
commit a602fc06bd
1 changed files with 10 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

20
src/librustc_typeck/variance/constraints.rs
View file

@ -149,11 +149,11 @@ impl<'a, 'tcx> ConstraintContext<'a, 'tcx> {
// //
// See README.md for a detailed discussion // See README.md for a detailed discussion
// on dep-graph management. // on dep-graph management.
let dep_node = def_id.to_dep_node(tcx, DepKind::ItemVarianceConstraints); let dep_node = def_id.to_dep_node(tcx, DepKind::ItemVarianceConstraints);
tcx.dep_graph.with_task(dep_node, tcx.dep_graph.with_task(dep_node,
AssertDepGraphSafe(self), AssertDepGraphSafe(self),
def_id, def_id,
visit_item_task); visit_item_task);
fn visit_item_task<'a, 'tcx>(ccx: AssertDepGraphSafe<&mut ConstraintContext<'a, 'tcx>>, fn visit_item_task<'a, 'tcx>(ccx: AssertDepGraphSafe<&mut ConstraintContext<'a, 'tcx>>,
def_id: DefId) def_id: DefId)
@ -202,9 +202,9 @@ impl<'a, 'tcx> ConstraintContext<'a, 'tcx> {
_ => { _ => {
span_bug!(tcx.def_span(def_id), span_bug!(tcx.def_span(def_id),
"`build_constraints_for_item` unsupported for this item"); "`build_constraints_for_item` unsupported for this item");
}
} }
} }
}
fn add_constraint(&mut self, fn add_constraint(&mut self,
current: &CurrentItem, current: &CurrentItem,
@ -269,7 +269,7 @@ impl<'a, 'tcx> ConstraintContext<'a, 'tcx> {
let variance_i = self.invariant(variance); let variance_i = self.invariant(variance);
for ty in substs.types() { for ty in substs.types() {
self.add_constraints_from_ty(current, ty, variance_i); self.add_constraints_from_ty(current, ty, variance_i);
} }
for region in substs.regions() { for region in substs.regions() {
self.add_constraints_from_region(current, region, variance_i); self.add_constraints_from_region(current, region, variance_i);
@ -350,7 +350,7 @@ impl<'a, 'tcx> ConstraintContext<'a, 'tcx> {
ty::TyParam(ref data) => { ty::TyParam(ref data) => {
self.add_constraint(current, data.idx, variance); self.add_constraint(current, data.idx, variance);
} }
ty::TyFnPtr(sig) => { ty::TyFnPtr(sig) => {
self.add_constraints_from_sig(current, sig, variance); self.add_constraints_from_sig(current, sig, variance);
@ -419,7 +419,7 @@ impl<'a, 'tcx> ConstraintContext<'a, 'tcx> {
self.add_constraints_from_region(current, r, variance_i); self.add_constraints_from_region(current, r, variance_i);
} else { } else {
bug!(); bug!();
} }
} }
} }
@ -445,7 +445,7 @@ impl<'a, 'tcx> ConstraintContext<'a, 'tcx> {
match *region { match *region {
ty::ReEarlyBound(ref data) => { ty::ReEarlyBound(ref data) => {
self.add_constraint(current, data.index, variance); self.add_constraint(current, data.index, variance);
} }
ty::ReStatic => {} ty::ReStatic => {}