bjoernager/rust
bjoernager/rust
1
Fork 0
Code Activity

Remove feature gate

Browse source
This commit is contained in:
Roxane 2021-05-27 17:58:35 -04:00
commit 382338fe75
1 changed files with 14 additions and 18 deletions
Download patch file Download diff file Expand all files Collapse all files

32
compiler/rustc_mir_build/src/build/expr/as_rvalue.rs
View file

@ -186,25 +186,21 @@ impl<'a, 'tcx> Builder<'a, 'tcx> {
// }; // };
// ``` // ```
// //
// FIXME(RFC2229, rust#85435): Remove feature gate once diagnostics are for (thir_place, cause, hir_id) in fake_reads.into_iter() {
// improved and unsafe checking works properly in closure bodies again. let place_builder =
if this.tcx.features().capture_disjoint_fields { unpack!(block = this.as_place_builder(block, &this.thir[*thir_place]));
for (thir_place, cause, hir_id) in fake_reads.into_iter() {
let place_builder =
unpack!(block = this.as_place_builder(block, &this.thir[*thir_place]));
if let Ok(place_builder_resolved) = if let Ok(place_builder_resolved) =
place_builder.try_upvars_resolved(this.tcx, this.typeck_results) place_builder.try_upvars_resolved(this.tcx, this.typeck_results)
{ {
let mir_place = let mir_place =
place_builder_resolved.into_place(this.tcx, this.typeck_results); place_builder_resolved.into_place(this.tcx, this.typeck_results);
this.cfg.push_fake_read( this.cfg.push_fake_read(
block, block,
this.source_info(this.tcx.hir().span(*hir_id)), this.source_info(this.tcx.hir().span(*hir_id)),
*cause, *cause,
mir_place, mir_place,
); );
}
} }
} }