bjoernager/rust
bjoernager/rust
1
Fork 0
Code Activity

Make functional record update/struct update syntax works inside closures when feature capture_disjoint_fields is enabled

Browse source
This commit is contained in:
Dhruv Jauhar 2021-01-22 21:24:54 -05:00
parent 180fdffa17
commit e94cf57c3e
4 changed files with 51 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

2
compiler/rustc_mir_build/src/build/expr/as_place.rs
View file

@ -303,7 +303,7 @@ impl<'tcx> PlaceBuilder<'tcx> {
self.base
}
fn field(self, f: Field, ty: Ty<'tcx>) -> Self {
crate fn field(self, f: Field, ty: Ty<'tcx>) -> Self {
self.project(PlaceElem::Field(f, ty))
}

13
compiler/rustc_mir_build/src/build/expr/into.rs
View file

@ -302,7 +302,7 @@ impl<'a, 'tcx> Builder<'a, 'tcx> {
let field_names = this.hir.all_fields(adt_def, variant_index);
let fields: Vec<_> = if let Some(FruInfo { base, field_types }) = base {
let base = unpack!(block = this.as_place(block, base));
let place_builder = unpack!(block = this.as_place_builder(block, base));
// MIR does not natively support FRU, so for each
// base-supplied field, generate an operand that
@ -312,9 +312,14 @@ impl<'a, 'tcx> Builder<'a, 'tcx> {
.zip(field_types.into_iter())
.map(|(n, ty)| match fields_map.get(&n) {
Some(v) => v.clone(),
None => this.consume_by_copy_or_move(
this.hir.tcx().mk_place_field(base, n, ty),
),
None => {
let place_builder = place_builder.clone();
this.consume_by_copy_or_move(
place_builder
.field(n, ty)
.into_place(this.hir.tcx(), this.hir.typeck_results()),
)
},
})
.collect()
} else {