Provide previous generic arguments to provided_kind

oli-obk · oli-obk · commit d498eb59373a · 2024-06-03T13:48:54.000Z
diff --git a/compiler/rustc_hir_analysis/src/hir_ty_lowering/generics.rs b/compiler/rustc_hir_analysis/src/hir_ty_lowering/generics.rs
@@ -282,7 +282,7 @@ pub fn lower_generic_args<'tcx: 'a, 'a>(
                             GenericParamDefKind::Const { .. },
                             _,
                         ) => {
-                            args.push(ctx.provided_kind(param, arg));
+                            args.push(ctx.provided_kind(&args, param, arg));
                             args_iter.next();
                             params.next();
                         }
diff --git a/compiler/rustc_hir_analysis/src/hir_ty_lowering/mod.rs b/compiler/rustc_hir_analysis/src/hir_ty_lowering/mod.rs
@@ -239,6 +239,7 @@ pub trait GenericArgsLowerer<'a, 'tcx> {
 
     fn provided_kind(
         &mut self,
+        preceding_args: &[ty::GenericArg<'tcx>],
         param: &ty::GenericParamDef,
         arg: &GenericArg<'tcx>,
     ) -> ty::GenericArg<'tcx>;
@@ -437,29 +438,15 @@ impl<'tcx> dyn HirTyLowerer<'tcx> + '_ {
 
             fn provided_kind(
                 &mut self,
+                preceding_args: &[ty::GenericArg<'tcx>],
                 param: &ty::GenericParamDef,
                 arg: &GenericArg<'tcx>,
             ) -> ty::GenericArg<'tcx> {
                 let tcx = self.lowerer.tcx();
 
                 if let Err(incorrect) = self.incorrect_args {
                     if incorrect.invalid_args.contains(&(param.index as usize)) {
-                        // FIXME: use `param.to_error` once `provided_kind` is supplied a list of
-                        // all previous generic args.
-                        return match param.kind {
-                            GenericParamDefKind::Lifetime => {
-                                ty::Region::new_error(tcx, incorrect.reported).into()
-                            }
-                            GenericParamDefKind::Type { .. } => {
-                                Ty::new_error(tcx, incorrect.reported).into()
-                            }
-                            GenericParamDefKind::Const { .. } => ty::Const::new_error(
-                                tcx,
-                                incorrect.reported,
-                                Ty::new_error(tcx, incorrect.reported),
-                            )
-                            .into(),
-                        };
+                        return param.to_error(tcx, preceding_args);
                     }
                 }
 
diff --git a/compiler/rustc_hir_typeck/src/fn_ctxt/_impl.rs b/compiler/rustc_hir_typeck/src/fn_ctxt/_impl.rs
@@ -1275,6 +1275,7 @@ impl<'a, 'tcx> FnCtxt<'a, 'tcx> {
 
             fn provided_kind(
                 &mut self,
+                _preceding_args: &[ty::GenericArg<'tcx>],
                 param: &ty::GenericParamDef,
                 arg: &GenericArg<'tcx>,
             ) -> ty::GenericArg<'tcx> {
diff --git a/compiler/rustc_hir_typeck/src/method/confirm.rs b/compiler/rustc_hir_typeck/src/method/confirm.rs
@@ -383,6 +383,7 @@ impl<'a, 'tcx> ConfirmContext<'a, 'tcx> {
 
             fn provided_kind(
                 &mut self,
+                _preceding_args: &[ty::GenericArg<'tcx>],
                 param: &ty::GenericParamDef,
                 arg: &GenericArg<'tcx>,
             ) -> ty::GenericArg<'tcx> {

Original file line number	Diff line number	Diff line change
`@@ -282,7 +282,7 @@ pub fn lower_generic_args<'tcx: 'a, 'a>(`
`282`	`282`	`GenericParamDefKind::Const { .. },`
`283`	`283`	`_,`
`284`	`284`	`) => {`
`285`		`- args.push(ctx.provided_kind(param, arg));`
	`285`	`+ args.push(ctx.provided_kind(&args, param, arg));`
`286`	`286`	`args_iter.next();`
`287`	`287`	`params.next();`
`288`	`288`	`}`