Remove unnecessary lifetime from OperandCollector.

Also put the remaining lifetimes into the usual order.

Author: nnethercote

compiler/rustc_mir_transform/src/dataflow_const_prop.rs

@@ -838,14 +838,14 @@ impl<'tcx> MutVisitor<'tcx> for Patch<'tcx> {
 }
 }
 
-structOperandCollector<'tcx,'map,'locals,'a>{
+structOperandCollector<'a,'locals,'tcx>{
 state:&'aState<FlatSet<Scalar>>,
 visitor:&'amutCollector<'tcx,'locals>,
-ecx:&'mapmutInterpCx<'tcx,DummyMachine>,
-map:&'mapMap<'tcx>,
+ecx:&'amutInterpCx<'tcx,DummyMachine>,
+map:&'aMap<'tcx>,
 }
 
-impl<'tcx>Visitor<'tcx>forOperandCollector<'tcx,'_,'_,'_>{
+impl<'tcx>Visitor<'tcx>forOperandCollector<'_,'_,'tcx>{
 fnvisit_projection_elem(
 &mutself,
  _:PlaceRef<'tcx>,