Skip to content

Commit 7022ae4

Browse files
authored
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.
2 parents 194d52c + 6b36c30 commit 7022ae4

File tree

2 files changed

+0
-3
lines changed

2 files changed

+0
-3
lines changed

compiler/rustc_hir/src/hir.rs

-2
Original file line numberDiff line numberDiff line change
@@ -987,7 +987,6 @@ pub struct Pat<'hir> {
987987
}
988988

989989
impl<'hir> Pat<'hir> {
990-
// FIXME(#19596) this is a workaround, but there should be a better way
991990
fn walk_short_(&self, it: &mut impl FnMut(&Pat<'hir>) -> bool) -> bool {
992991
if !it(self) {
993992
return false;
@@ -1015,7 +1014,6 @@ impl<'hir> Pat<'hir> {
10151014
self.walk_short_(&mut it)
10161015
}
10171016

1018-
// FIXME(#19596) this is a workaround, but there should be a better way
10191017
fn walk_(&self, it: &mut impl FnMut(&Pat<'hir>) -> bool) {
10201018
if !it(self) {
10211019
return;

compiler/rustc_hir_typeck/src/mem_categorization.rs

-1
Original file line numberDiff line numberDiff line change
@@ -601,7 +601,6 @@ impl<'a, 'tcx> MemCategorizationContext<'a, 'tcx> {
601601
}
602602
}
603603

604-
// FIXME(#19596) This is a workaround, but there should be a better way to do this
605604
fn cat_pattern_<F>(
606605
&self,
607606
mut place_with_id: PlaceWithHirId<'tcx>,

0 commit comments

Comments
 (0)