user0/rust
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Remove unnecessary Option

Browse source
This commit is contained in:
Wesley Wiser 2019-08-14 08:16:06 -04:00
parent 34fe28bc67
commit 9fdf5b5551
2 changed files with 4 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

3
src/librustc_mir/transform/mod.rs
View file

@ -218,8 +218,7 @@ fn mir_validated(
&qualify_and_promote_pass,
&simplify::SimplifyCfg::new("qualify-consts"),
]);
let promoted =
qualify_and_promote_pass.promoted.into_inner().unwrap_or_else(|| IndexVec::new());
let promoted = qualify_and_promote_pass.promoted.into_inner();
(tcx.alloc_steal_mir(body), tcx.alloc_steal_promoted(promoted))
}

6
src/librustc_mir/transform/qualify_consts.rs
View file

@ -1572,13 +1572,13 @@ fn mir_const_qualif(tcx: TyCtxt<'_>, def_id: DefId) -> (u8, &BitSet<Local>) {
}
pub struct QualifyAndPromoteConstants<'tcx> {
pub promoted: Cell<Option<IndexVec<Promoted, Body<'tcx>>>>,
pub promoted: Cell<IndexVec<Promoted, Body<'tcx>>>,
}
impl<'tcx> Default for QualifyAndPromoteConstants<'tcx> {
fn default() -> Self {
QualifyAndPromoteConstants {
promoted: Cell::new(None),
promoted: Cell::new(IndexVec::new()),
}
}
}
@ -1661,7 +1661,7 @@ impl<'tcx> MirPass<'tcx> for QualifyAndPromoteConstants<'tcx> {
// Do the actual promotion, now that we know what's viable.
self.promoted.set(
Some(promote_consts::promote_candidates(def_id, body, tcx, temps, candidates))
promote_consts::promote_candidates(def_id, body, tcx, temps, candidates)
);
} else {
if !body.control_flow_destroyed.is_empty() {