Resolve review comments

Author: sinkuu

src/librustdoc/clean/mod.rs

@@ -1699,16 +1699,16 @@ impl<'a, 'tcx> Clean<Generics> for (&'a ty::Generics,
         // Bounds in the type_params and lifetimes fields are repeated in the
         // predicates field (see rustc_typeck::collect::ty_generics), so remove
         // them.
-        let stripped_typarams = gens.params.iter().enumerate()
-            .filter_map(|(i, param)| match param.kind {
+        let stripped_typarams = gens.params.iter()
+            .filter_map(|param| match param.kind {
                 ty::GenericParamDefKind::Lifetime => None,
                 ty::GenericParamDefKind::Type { synthetic, .. } => {
                     if param.name.as_symbol() == kw::SelfUpper {
                         assert_eq!(param.index, 0);
                         return None;
                     }
                     if synthetic == Some(hir::SyntheticTyParamKind::ImplTrait) {
-                        impl_trait.insert((i as u32).into(), vec![]);
+                        impl_trait.insert(param.index.into(), vec![]);
                         return None;
                     }
                     Some(param.clean(cx))

src/test/rustdoc/inline_cross/impl_trait.rs

@@ -3,17 +3,11 @@
 extern crate impl_trait_aux;
 
 // @has impl_trait/fn.func.html
-// @has - '//pre[@class="rust fn"]' '(_x: impl '
-// @has - '//pre[@class="rust fn"]' 'Clone'
-// @has - '//pre[@class="rust fn"]' 'Into'
-// @has - '//pre[@class="rust fn"]' "'a"
+// @has - '//pre[@class="rust fn"]' "pub fn func<'a>(_x: impl Clone + Into<Vec<u8>> + 'a)"
 // @!has - '//pre[@class="rust fn"]' 'where'
 pub use impl_trait_aux::func;
 
 // @has impl_trait/struct.Foo.html
-// @has - '//code[@id="method.v"]' '(_x: impl '
-// @has - '//code[@id="method.v"]' 'Clone'
-// @has - '//code[@id="method.v"]' 'Into'
-// @has - '//code[@id="method.v"]' "'a"
+// @has - '//code[@id="method.v"]' "pub fn method<'a>(_x: impl Clone + Into<Vec<u8>> + 'a)"
 // @!has - '//code[@id="method.v"]' 'where'
 pub use impl_trait_aux::Foo;