From 25cf2b648fb04f6d2bf82560a86f3a27bd6c4e68 Mon Sep 17 00:00:00 2001
From: Giacomo Pasini <giacomo@status.im>
Date: Tue, 10 Jan 2023 17:20:25 +0100
Subject: [PATCH] remove resolved fixmes

---
 compiler/rustc_borrowck/src/used_muts.rs            |  4 ----
 .../src/transform/check_consts/resolver.rs          | 13 -------------
 compiler/rustc_const_eval/src/transform/validate.rs | 13 -------------
 3 files changed, 30 deletions(-)

diff --git a/compiler/rustc_borrowck/src/used_muts.rs b/compiler/rustc_borrowck/src/used_muts.rs
index 86c784da3a02f..10ade142b24dd 100644
--- a/compiler/rustc_borrowck/src/used_muts.rs
+++ b/compiler/rustc_borrowck/src/used_muts.rs
@@ -71,10 +71,6 @@ impl<'visit, 'cx, 'tcx> Visitor<'tcx> for GatherUsedMutsVisitor<'visit, 'cx, 'tc
             TerminatorKind::Call { destination, .. } => {
                 self.remove_never_initialized_mut_locals(*destination);
             }
-            // FIXME: ??
-            // TerminatorKind::DropAndReplace { place, .. } => {
-            //     self.remove_never_initialized_mut_locals(*place);
-            // }
             _ => {}
         }
 
diff --git a/compiler/rustc_const_eval/src/transform/check_consts/resolver.rs b/compiler/rustc_const_eval/src/transform/check_consts/resolver.rs
index beb224d150bdf..148aff9be4b5b 100644
--- a/compiler/rustc_const_eval/src/transform/check_consts/resolver.rs
+++ b/compiler/rustc_const_eval/src/transform/check_consts/resolver.rs
@@ -222,19 +222,6 @@ where
         // The effect of assignment to the return place in `TerminatorKind::Call` is not applied
         // here; that occurs in `apply_call_return_effect`.
 
-        // FIXME ??
-        // if let mir::TerminatorKind::DropAndReplace { value, place, .. } = &terminator.kind {
-        //     let qualif = qualifs::in_operand::<Q, _>(
-        //         self.ccx,
-        //         &mut |l| self.state.qualif.contains(l),
-        //         value,
-        //     );
-
-        //     if !place.is_indirect() {
-        //         self.assign_qualif_direct(place, qualif);
-        //     }
-        // }
-
         // We ignore borrow on drop because custom drop impls are not allowed in consts.
         // FIXME: Reconsider if accounting for borrows in drops is necessary for const drop.
 
diff --git a/compiler/rustc_const_eval/src/transform/validate.rs b/compiler/rustc_const_eval/src/transform/validate.rs
index 87cea20ca3d91..0f0b663e91d2a 100644
--- a/compiler/rustc_const_eval/src/transform/validate.rs
+++ b/compiler/rustc_const_eval/src/transform/validate.rs
@@ -736,19 +736,6 @@ impl<'a, 'tcx> Visitor<'tcx> for TypeChecker<'a, 'tcx> {
                     self.check_edge(location, *unwind, EdgeKind::Unwind);
                 }
             }
-            // FIXME ??
-            // TerminatorKind::DropAndReplace { target, unwind, .. } => {
-            //     if self.mir_phase >= MirPhase::Runtime(RuntimePhase::Initial) {
-            //         self.fail(
-            //             location,
-            //             "`DropAndReplace` should have been removed during drop elaboration",
-            //         );
-            //     }
-            //     self.check_edge(location, *target, EdgeKind::Normal);
-            //     if let Some(unwind) = unwind {
-            //         self.check_edge(location, *unwind, EdgeKind::Unwind);
-            //     }
-            // }
             TerminatorKind::Call { func, args, destination, target, cleanup, .. } => {
                 let func_ty = func.ty(&self.body.local_decls, self.tcx);
                 match func_ty.kind() {