review

compiler/rustc_hir_typeck/src/fn_ctxt/suggestions.rs

@@ -609,8 +609,7 @@ pub(in super::super) fn suggest_calling_boxed_future_when_appropriate(
             return false;
         }
         let pin_did = self.tcx.lang_items().pin_type();
-        // FIXME: replace mk_box with?
-        // This guards the `unwrap` and `mk_box` below.
+        // This guards the `new_box` below.
         if pin_did.is_none() || self.tcx.lang_items().owned_box().is_none() {
             return false;
         }

compiler/rustc_trait_selection/src/traits/coherence.rs

@@ -330,8 +330,7 @@ fn equate_impl_headers<'tcx>(
                 impl1.self_ty,
                 impl2.self_ty,
             ),
-            // FIXME: mk_eq_impl_headers fn not exist
-            _ => bug!("mk_eq_impl_headers given mismatched impl kinds"),
+            _ => bug!("equate_impl_headers given mismatched impl kinds"),
         };
 
     result.map(|infer_ok| infer_ok.obligations).ok()