Skip to content

Commit 25cf2b6

Browse files
committed
remove resolved fixmes
1 parent 1c1e795 commit 25cf2b6

File tree

3 files changed

+0
-30
lines changed

3 files changed

+0
-30
lines changed

compiler/rustc_borrowck/src/used_muts.rs

-4
Original file line numberDiff line numberDiff line change
@@ -71,10 +71,6 @@ impl<'visit, 'cx, 'tcx> Visitor<'tcx> for GatherUsedMutsVisitor<'visit, 'cx, 'tc
7171
TerminatorKind::Call { destination, .. } => {
7272
self.remove_never_initialized_mut_locals(*destination);
7373
}
74-
// FIXME: ??
75-
// TerminatorKind::DropAndReplace { place, .. } => {
76-
// self.remove_never_initialized_mut_locals(*place);
77-
// }
7874
_ => {}
7975
}
8076

compiler/rustc_const_eval/src/transform/check_consts/resolver.rs

-13
Original file line numberDiff line numberDiff line change
@@ -222,19 +222,6 @@ where
222222
// The effect of assignment to the return place in `TerminatorKind::Call` is not applied
223223
// here; that occurs in `apply_call_return_effect`.
224224

225-
// FIXME ??
226-
// if let mir::TerminatorKind::DropAndReplace { value, place, .. } = &terminator.kind {
227-
// let qualif = qualifs::in_operand::<Q, _>(
228-
// self.ccx,
229-
// &mut |l| self.state.qualif.contains(l),
230-
// value,
231-
// );
232-
233-
// if !place.is_indirect() {
234-
// self.assign_qualif_direct(place, qualif);
235-
// }
236-
// }
237-
238225
// We ignore borrow on drop because custom drop impls are not allowed in consts.
239226
// FIXME: Reconsider if accounting for borrows in drops is necessary for const drop.
240227

compiler/rustc_const_eval/src/transform/validate.rs

-13
Original file line numberDiff line numberDiff line change
@@ -736,19 +736,6 @@ impl<'a, 'tcx> Visitor<'tcx> for TypeChecker<'a, 'tcx> {
736736
self.check_edge(location, *unwind, EdgeKind::Unwind);
737737
}
738738
}
739-
// FIXME ??
740-
// TerminatorKind::DropAndReplace { target, unwind, .. } => {
741-
// if self.mir_phase >= MirPhase::Runtime(RuntimePhase::Initial) {
742-
// self.fail(
743-
// location,
744-
// "`DropAndReplace` should have been removed during drop elaboration",
745-
// );
746-
// }
747-
// self.check_edge(location, *target, EdgeKind::Normal);
748-
// if let Some(unwind) = unwind {
749-
// self.check_edge(location, *unwind, EdgeKind::Unwind);
750-
// }
751-
// }
752739
TerminatorKind::Call { func, args, destination, target, cleanup, .. } => {
753740
let func_ty = func.ty(&self.body.local_decls, self.tcx);
754741
match func_ty.kind() {

0 commit comments

Comments
 (0)