Merge branch 'rust-lang:main' into add-riscv64-uefi-target

gjbauer · web-flow · commit 106cbdd68526 · 2025-11-14T22:53:17.000-05:00
diff --git a/compiler/rustc_resolve/src/late.rs b/compiler/rustc_resolve/src/late.rs
@@ -2916,9 +2916,9 @@ impl<'a, 'ast, 'ra, 'tcx> LateResolutionVisitor<'a, 'ast, 'ra, 'tcx> {
         }
     }
 
-    fn with_generic_param_rib<'c, F>(
-        &'c mut self,
-        params: &'c [GenericParam],
+    fn with_generic_param_rib<F>(
+        &mut self,
+        params: &[GenericParam],
         kind: RibKind<'ra>,
         binder: NodeId,
         generics_kind: LifetimeBinderKind,

Original file line number	Diff line number	Diff line change
`@@ -2916,9 +2916,9 @@ impl<'a, 'ast, 'ra, 'tcx> LateResolutionVisitor<'a, 'ast, 'ra, 'tcx> {`
`2916`	`2916`	`}`
`2917`	`2917`	`}`
`2918`	`2918`
`2919`		`- fn with_generic_param_rib<'c, F>(`
`2920`		`- &'c mut self,`
`2921`		`- params: &'c [GenericParam],`
	`2919`	`+ fn with_generic_param_rib<F>(`
	`2920`	`+ &mut self,`
	`2921`	`+ params: &[GenericParam],`
`2922`	`2922`	`kind: RibKind<'ra>,`
`2923`	`2923`	`binder: NodeId,`
`2924`	`2924`	`generics_kind: LifetimeBinderKind,`