Unrolled build for #160295

Rollup merge of #160295 - Colepng:main, r=GuillaumeGomez

Fix rustdoc ICE when checking if a generic arg can be elided

Fixes #133637

The `param_at` call expects a index into the full generics list, while index is generated only from the children.

I also noticed a call to `skip_norm_wip` so I replaced that with `skip_normalization`

I have one question about adding the regression test, should it live under rustdoc-ui or rustdoc-ui/issue. I will add it later today.

@fmease

Author: rust-timer

src/librustdoc/clean/utils.rs

@@ -117,18 +117,22 @@ pub(crate) fn clean_middle_generic_args<'tcx>(
     };
 
     let mut elision_has_failed_once_before = false;
+
+    // Calculates where the parent trait's generic parameters end
+    let index_offset = generics.count() - args.len();
     let clean_arg = |(index, &arg): (usize, &ty::GenericArg<'tcx>)| {
         // Elide the self type.
         if has_self && index == 0 {
             return None;
         }
 
-        let param = generics.param_at(index, cx.tcx);
+        // Skips over the parent trait's generic parameters
+        let param = generics.param_at(index + index_offset, cx.tcx);
         let arg = ty::Binder::bind_with_vars(arg, bound_vars);
 
         // Elide arguments that coincide with their default.
         if !elision_has_failed_once_before && let Some(default) = param.default_value(cx.tcx) {
-            let default = default.instantiate(cx.tcx, args.as_ref()).skip_norm_wip();
+            let default = default.instantiate(cx.tcx, args.as_ref()).skip_normalization();
             if can_elide_generic_arg(arg, arg.rebind(default)) {
                 return None;
             }

tests/rustdoc-ui/ice-clean-generic-args-133637.rs

@@ -0,0 +1,12 @@
+//@ check-pass
+// https://github.com/rust-lang/rust/issues/133637
+#![crate_name="foo"]
+
+// Regression test for issue #133637. Previously we would index into the flattened generics list
+// with the children generic indexes. This resulted in an ICE when debug assertions were on.
+
+trait Trait<Default = ()> {
+    type Type<'a, 'b>;
+}
+
+type Type<T> = <T as Trait>::Type<'static, 'static>;