Rollup merge of #80487 - matthiaskrgr:field_names, r=jyn514
don't redundantly repeat field names r? `@Dylan-DPC`
This commit is contained in:
commit
3812909919
|
@ -523,7 +523,7 @@ where
|
||||||
successors_len: 0,
|
successors_len: 0,
|
||||||
min_depth: depth,
|
min_depth: depth,
|
||||||
min_cycle_root: successor_node,
|
min_cycle_root: successor_node,
|
||||||
successor_node: successor_node,
|
successor_node,
|
||||||
});
|
});
|
||||||
continue 'recurse;
|
continue 'recurse;
|
||||||
}
|
}
|
||||||
|
|
|
@ -110,10 +110,7 @@ impl<'tcx> PlaceWithHirId<'tcx> {
|
||||||
base: PlaceBase,
|
base: PlaceBase,
|
||||||
projections: Vec<Projection<'tcx>>,
|
projections: Vec<Projection<'tcx>>,
|
||||||
) -> PlaceWithHirId<'tcx> {
|
) -> PlaceWithHirId<'tcx> {
|
||||||
PlaceWithHirId {
|
PlaceWithHirId { hir_id, place: Place { base_ty, base, projections } }
|
||||||
hir_id: hir_id,
|
|
||||||
place: Place { base_ty: base_ty, base: base, projections: projections },
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -306,13 +306,13 @@ macro_rules! make_mir_visitor {
|
||||||
|
|
||||||
let mut index = 0;
|
let mut index = 0;
|
||||||
for statement in statements {
|
for statement in statements {
|
||||||
let location = Location { block: block, statement_index: index };
|
let location = Location { block, statement_index: index };
|
||||||
self.visit_statement(statement, location);
|
self.visit_statement(statement, location);
|
||||||
index += 1;
|
index += 1;
|
||||||
}
|
}
|
||||||
|
|
||||||
if let Some(terminator) = terminator {
|
if let Some(terminator) = terminator {
|
||||||
let location = Location { block: block, statement_index: index };
|
let location = Location { block, statement_index: index };
|
||||||
self.visit_terminator(terminator, location);
|
self.visit_terminator(terminator, location);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -1634,7 +1634,7 @@ impl<'tcx> LayoutCx<'tcx, TyCtxt<'tcx>> {
|
||||||
|
|
||||||
let layout = tcx.intern_layout(Layout {
|
let layout = tcx.intern_layout(Layout {
|
||||||
variants: Variants::Multiple {
|
variants: Variants::Multiple {
|
||||||
tag: tag,
|
tag,
|
||||||
tag_encoding: TagEncoding::Direct,
|
tag_encoding: TagEncoding::Direct,
|
||||||
tag_field: tag_index,
|
tag_field: tag_index,
|
||||||
variants,
|
variants,
|
||||||
|
|
|
@ -390,7 +390,7 @@ impl<'a, 'tcx> FnCtxt<'a, 'tcx> {
|
||||||
|
|
||||||
let min_cap_list = match root_var_min_capture_list.get_mut(&var_hir_id) {
|
let min_cap_list = match root_var_min_capture_list.get_mut(&var_hir_id) {
|
||||||
None => {
|
None => {
|
||||||
let min_cap_list = vec![ty::CapturedPlace { place: place, info: capture_info }];
|
let min_cap_list = vec![ty::CapturedPlace { place, info: capture_info }];
|
||||||
root_var_min_capture_list.insert(var_hir_id, min_cap_list);
|
root_var_min_capture_list.insert(var_hir_id, min_cap_list);
|
||||||
continue;
|
continue;
|
||||||
}
|
}
|
||||||
|
|
|
@ -459,7 +459,7 @@ impl<'a, 'tcx> MemCategorizationContext<'a, 'tcx> {
|
||||||
kind: ProjectionKind,
|
kind: ProjectionKind,
|
||||||
) -> PlaceWithHirId<'tcx> {
|
) -> PlaceWithHirId<'tcx> {
|
||||||
let mut projections = base_place.place.projections;
|
let mut projections = base_place.place.projections;
|
||||||
projections.push(Projection { kind: kind, ty: ty });
|
projections.push(Projection { kind, ty });
|
||||||
let ret = PlaceWithHirId::new(
|
let ret = PlaceWithHirId::new(
|
||||||
node.hir_id(),
|
node.hir_id(),
|
||||||
base_place.place.base_ty,
|
base_place.place.base_ty,
|
||||||
|
|
Loading…
Reference in a new issue