Rollup merge of rust-lang#108255 - fee1-dead-contrib:fix-old-fixme, r…

…=cjgillot Remove old FIXMEs referring to rust-lang#19596 Having an inner function that accepts a mutable reference seems to be the only way this can be expressed. Taking a mutable reference would call the same function with a new type &mut F which then causes the infinite recursion error in rust-lang#19596.
matthiaskrgr · Feb 20, 2023 · 7022ae4 · 7022ae4
2 parents 194d52c + 6b36c30
commit 7022ae4
Show file tree

Hide file tree

Showing 2 changed files with 0 additions and 3 deletions.
diff --git a/compiler/rustc_hir/src/hir.rs b/compiler/rustc_hir/src/hir.rs
@@ -987,7 +987,6 @@ pub struct Pat<'hir> {
 }
 
 impl<'hir> Pat<'hir> {
-    // FIXME(#19596) this is a workaround, but there should be a better way
     fn walk_short_(&self, it: &mut impl FnMut(&Pat<'hir>) -> bool) -> bool {
         if !it(self) {
             return false;
@@ -1015,7 +1014,6 @@ impl<'hir> Pat<'hir> {
         self.walk_short_(&mut it)
     }
 
-    // FIXME(#19596) this is a workaround, but there should be a better way
     fn walk_(&self, it: &mut impl FnMut(&Pat<'hir>) -> bool) {
         if !it(self) {
             return;

diff --git a/compiler/rustc_hir_typeck/src/mem_categorization.rs b/compiler/rustc_hir_typeck/src/mem_categorization.rs
@@ -601,7 +601,6 @@ impl<'a, 'tcx> MemCategorizationContext<'a, 'tcx> {
         }
     }
 
-    // FIXME(#19596) This is a workaround, but there should be a better way to do this
     fn cat_pattern_<F>(
         &self,
         mut place_with_id: PlaceWithHirId<'tcx>,
-Original file line number
+Diff line change
@@ Expand Up / @@ -601,7 +601,6 @@ impl<'a, 'tcx> MemCategorizationContext<'a, 'tcx> { @@
             }
         }
-        // FIXME(#19596) This is a workaround, but there should be a better way to do this
         fn cat_pattern_<F>(
             &self,
             mut place_with_id: PlaceWithHirId<'tcx>,
@@ Expand Down @@