More cleanup

Author: amandasystems

compiler/rustc_borrowck/src/eliminate_placeholders.rs

@@ -450,7 +450,6 @@ pub(crate) fn rewrite_higher_kinded_outlives_as_constraints<'tcx>(
         scc_annotations[sccs.scc(r1)].min_universe() != scc_annotations[sccs.scc(r2)].min_universe()
     };
 
-    // FIXME(amandasystems) it's probably better to destroy and recreate the member constraints from scratch.
     let member_constraints = member_constraints.into_mapped(
         |r| sccs.scc(r),
         |r| scc_annotations[sccs.scc(r)].in_root_universe(),
@@ -540,9 +539,8 @@ fn rewrite_outlives<'tcx>(
     outlives_static
 }
 
+// FIXME this is at least partially duplicated code to the constraint search in `region_infer`.
 /// Find a region matching a predicate in a set of constraints, using BFS.
-// FIXME(amandasystems) this is at least partially duplicated code to the constraint search in `region_infer`.
-// It's probably also very expensive.
 fn find_region<'tcx>(
     constraints: &OutlivesConstraintSet<'tcx>,
     graph: &ConstraintGraph<Normal>,

compiler/rustc_borrowck/src/nll.rs

@@ -131,7 +131,6 @@ pub(crate) fn compute_regions<'a, 'tcx>(
         &constraints,
     );
 
-    // FIXME(amandasystems) Polonius should happen *after* the constraint rewrite!
     let var_infos = infcx.get_region_var_infos();
     let MirTypeckRegionConstraints {
         liveness_constraints,

compiler/rustc_borrowck/src/region_infer/mod.rs

@@ -705,7 +705,12 @@ impl<'tcx> RegionInferenceContext<'tcx> {
     ) -> Option<RegionErrorKind<'tcx>> {
         let bound_failure = verify_bound.either(
             |verify_bound| {
-                if self.eval_verify_bound(infcx, generic_kind, lower_bound, verify_bound) {
+                if self.eval_verify_bound(
+                    infcx,
+                    generic_kind.to_ty(infcx.tcx),
+                    lower_bound,
+                    verify_bound,
+                ) {
                     None
                 } else {
                     Some(RegionErrorKind::TypeTestError {
@@ -1024,7 +1029,7 @@ impl<'tcx> RegionInferenceContext<'tcx> {
     fn eval_rewritten_verify_bound(
         &self,
         infcx: &InferCtxt<'tcx>,
-        generic_kind: &GenericKind<'tcx>, // FIXME(amandasystems): make into Generic_ty
+        generic_kind: &GenericKind<'tcx>,
         lower_bound: RegionVid,
         verify_bound: &RewrittenVerifyBound<'tcx>,
         span: Span,
@@ -1040,8 +1045,12 @@ impl<'tcx> RegionInferenceContext<'tcx> {
             |verify_bound: &Either<VerifyBound<'tcx>, RewrittenVerifyBound<'tcx>>| {
                 verify_bound.as_ref().either(
                     |verify_bound| {
-                        let bound_fails =
-                            !self.eval_verify_bound(infcx, generic_kind, lower_bound, verify_bound);
+                        let bound_fails = !self.eval_verify_bound(
+                            infcx,
+                            generic_kind.to_ty(infcx.tcx),
+                            lower_bound,
+                            verify_bound,
+                        );
                         bound_fails.then(|| bound_fails_due_to_static(false))
                     },
                     |rewritten| {
@@ -1105,13 +1114,13 @@ impl<'tcx> RegionInferenceContext<'tcx> {
     fn eval_verify_bound(
         &self,
         infcx: &InferCtxt<'tcx>,
-        generic_kind: &GenericKind<'tcx>, // FIXME(amandasystems): make into Generic_ty
+        generic_ty: Ty<'tcx>,
         lower_bound: RegionVid,
         verify_bound: &VerifyBound<'tcx>,
     ) -> bool {
         match verify_bound {
             VerifyBound::IfEq(verify_if_eq_b) => {
-                self.eval_if_eq(infcx, generic_kind.to_ty(infcx.tcx), lower_bound, *verify_if_eq_b)
+                self.eval_if_eq(infcx, generic_ty, lower_bound, *verify_if_eq_b)
             }
 
             VerifyBound::IsEmpty => {
@@ -1125,11 +1134,11 @@ impl<'tcx> RegionInferenceContext<'tcx> {
             }
 
             VerifyBound::AnyBound(verify_bounds) => verify_bounds.iter().any(|verify_bound| {
-                self.eval_verify_bound(infcx, generic_kind, lower_bound, verify_bound)
+                self.eval_verify_bound(infcx, generic_ty, lower_bound, verify_bound)
             }),
 
             VerifyBound::AllBounds(verify_bounds) => verify_bounds.iter().all(|verify_bound| {
-                self.eval_verify_bound(infcx, generic_kind, lower_bound, verify_bound)
+                self.eval_verify_bound(infcx, generic_ty, lower_bound, verify_bound)
             }),
         }
     }
@@ -1899,7 +1908,6 @@ impl<'tcx> RegionInferenceContext<'tcx> {
             | NllRegionVariableOrigin::Existential { from_forall: true } => false,
         };
 
-        // FIXME(amandasystems) This closure is tooe big to inline, it should be a method if plausible.
         // To pick a constraint to blame, we organize constraints by how interesting we expect them
         // to be in diagnostics, then pick the most interesting one closest to either the source or
         // the target on our constraint path.