WIP: Add implied bounds to rustdoc

Author: aDotInTheVoid

src/librustdoc/clean/mod.rs

@@ -2830,9 +2830,13 @@ fn clean_maybe_renamed_item<'tcx>(
                 generics: clean_generics(generics, cx),
                 fields: variant_data.fields().iter().map(|x| clean_field(x, cx)).collect(),
             }),
-            ItemKind::Struct(_, generics, variant_data) => StructItem(Struct {
+            ItemKind::Struct(_, _, variant_data) => StructItem(Struct {
                 ctor_kind: variant_data.ctor_kind(),
-                generics: clean_generics(generics, cx),
+                generics: clean_ty_generics(
+                    cx,
+                    cx.tcx.generics_of(def_id),
+                    cx.tcx.predicates_of(def_id),
+                ),
                 fields: variant_data.fields().iter().map(|x| clean_field(x, cx)).collect(),
             }),
             ItemKind::Macro(_, macro_def, MacroKind::Bang) => MacroItem(Macro {

src/tools/compiletest/src/runtest.rs

@@ -1972,11 +1972,18 @@ impl<'test> TestCx<'test> {
             config: &Config {
                 // FIXME: use beta or a user-specified rustdoc instead of
                 // hardcoding the default toolchain
-                rustdoc_path: Some("rustdoc".into()),
+
+                // GODAWFUL HAAACKS!!
+                rustdoc_path: Some("/home/gh-aDotInTheVoid/rust2/build/aarch64-unknown-linux-gnu/stage1/bin/rustdoc".into()),
                 // Needed for building auxiliary docs below
-                rustc_path: "rustc".into(),
+                rustc_path: "/home/gh-aDotInTheVoid/rust2/build/aarch64-unknown-linux-gnu/stage1/bin/rustc".into(),
+                run_lib_path: "/home/gh-aDotInTheVoid/rust2/build/aarch64-unknown-linux-gnu/stage1/lib/rustlib/aarch64-unknown-linux-gnu/lib".into(),
+                
+                sysroot_base: "/home/gh-aDotInTheVoid/rust2/build/aarch64-unknown-linux-gnu/stage1".into(),
+
                 ..self.config.clone()
             },
+            revision: Some("compare-base"),
             ..*self
         };
 
@@ -1990,11 +1997,13 @@ impl<'test> TestCx<'test> {
             Vec::new(),
         );
         let aux_dir = new_rustdoc.aux_output_dir();
+        eprintln!("new aux dir = {aux_dir}");
         new_rustdoc.build_all_auxiliary(&new_rustdoc.testpaths, &aux_dir, &mut rustc);
 
         let proc_res = new_rustdoc.document(&compare_dir, &new_rustdoc.testpaths);
         if !proc_res.status.success() {
             eprintln!("failed to run nightly rustdoc");
+            proc_res.print_info();
             return;
         }
 

tests/rustdoc-json/implied-bounds.rs

@@ -0,0 +1,19 @@
+//@ count '$.index[?(@.name=="Foo")].inner.struct.generics.params[*]' 2
+//@ is    '$.index[?(@.name=="Foo")].inner.struct.generics.params[0].name' \"\'a\"
+//@ is    '$.index[?(@.name=="Foo")].inner.struct.generics.params[0].kind.lifetime.outlives' []
+//@ is    '$.index[?(@.name=="Foo")].inner.struct.generics.params[1].name' '"T"'
+//@ is    '$.index[?(@.name=="Foo")].inner.struct.generics.params[1].kind.type.bounds' '[]'
+//@ count '$.index[?(@.name=="Foo")].inner.struct.generics.where_predicates[*]' 1
+//@ count '$.index[?(@.name=="Foo")].inner.struct.generics.where_predicates[*]' 1
+//@ is    '$.index[?(@.name=="Foo")].inner.struct.generics.where_predicates[0].bound_predicate.type.generic' '"T"'
+//@ count '$.index[?(@.name=="Foo")].inner.struct.generics.where_predicates[0].bound_predicate.bounds[*]' 2
+//@ is    '$.index[?(@.name=="Foo")].inner.struct.generics.where_predicates[0].bound_predicate.bounds[0].trait_bound.trait.path' '"Copy"'
+//@ is    '$.index[?(@.name=="Foo")].inner.struct.generics.where_predicates[0].bound_predicate.bounds[1].outlives' \"\'a\"
+// ^^^^ The last bound donesn't exist anywhere in the source code ^^^^
+
+pub struct Foo<'a, T: Copy>(&'a T);
+// Desguars to:
+//     pub struct Foo<'a, T>(&'a T) where T: Copy + 'a;
+
+// FIXME: Needs more tests, at least
+// - Implied 'a: 'b

tests/rustdoc/assoc/normalize-assoc-item.rs

@@ -49,10 +49,10 @@ impl<Inner: Trait> Trait for Generic<Inner> {
 // These can't be normalized because they depend on a generic parameter.
 // However the user can choose whether the text should be displayed as `Inner::X` or `<Inner as Trait>::X`.
 
-//@ has 'normalize_assoc_item/struct.Unknown.html' '//pre[@class="rust item-decl"]' 'pub struct Unknown<Inner: Trait>(pub <Inner as Trait>::X);'
+//@ has 'normalize_assoc_item/struct.Unknown.html' '//pre[@class="rust item-decl"]' 'pub struct Unknown<Inner>(pub <Inner as Trait>::X) where Inner: Trait;'
 pub struct Unknown<Inner: Trait>(pub <Inner as Trait>::X);
 
-//@ has 'normalize_assoc_item/struct.Unknown2.html' '//pre[@class="rust item-decl"]' 'pub struct Unknown2<Inner: Trait>(pub Inner::X);'
+//@ has 'normalize_assoc_item/struct.Unknown2.html' '//pre[@class="rust item-decl"]' 'pub struct Unknown2<Inner>(pub Inner::X) where Inner: Trait;'
 pub struct Unknown2<Inner: Trait>(pub Inner::X);
 
 trait Lifetimes<'a> {

tests/rustdoc/const-generics/generic_const_exprs.rs

@@ -3,5 +3,5 @@
 #![allow(incomplete_features)]
 // make sure that `ConstEvaluatable` predicates dont cause rustdoc to ICE #77647
 //@ has foo/struct.Ice.html '//pre[@class="rust item-decl"]' \
-//      'pub struct Ice<const N: usize> where [(); { _ }]:;'
+//      'pub struct Ice<const N: usize>;'
 pub struct Ice<const N: usize> where [(); N + 1]:;

tests/rustdoc/whitespace-after-where-clause.struct.html

@@ -1,5 +1,5 @@
 <pre class="rust item-decl"><code>pub struct Struct&lt;'a, B&gt;<div class="where">where
-    B: <a class="trait" href="trait.ToOwned.html" title="trait foo::ToOwned">ToOwned</a>&lt;<a class="primitive" href="{{channel}}/std/primitive.unit.html">()</a>&gt; + ?<a class="trait" href="{{channel}}/core/marker/trait.Sized.html" title="trait core::marker::Sized">Sized</a> + 'a,</div>{
+    B: 'a + <a class="trait" href="trait.ToOwned.html" title="trait foo::ToOwned">ToOwned</a>&lt;<a class="primitive" href="{{channel}}/std/primitive.unit.html">()</a>&gt; + ?<a class="trait" href="{{channel}}/core/marker/trait.Sized.html" title="trait core::marker::Sized">Sized</a>,</div>{
     pub a: <a class="primitive" href="{{channel}}/std/primitive.reference.html">&amp;'a B</a>,
     pub b: <a class="primitive" href="{{channel}}/std/primitive.u32.html">u32</a>,
 }</code></pre>

tests/rustdoc/whitespace-after-where-clause.struct2.html

@@ -1,4 +1,5 @@
-<pre class="rust item-decl"><code>pub struct Struct2&lt;'a, B: ?<a class="trait" href="{{channel}}/core/marker/trait.Sized.html" title="trait core::marker::Sized">Sized</a> + <a class="trait" href="trait.ToOwned.html" title="trait foo::ToOwned">ToOwned</a>&lt;<a class="primitive" href="{{channel}}/std/primitive.unit.html">()</a>&gt; + 'a&gt; {
+<pre class="rust item-decl"><code>pub struct Struct2&lt;'a, B&gt;<div class="where">where
+    B: <a class="trait" href="trait.ToOwned.html" title="trait foo::ToOwned">ToOwned</a>&lt;<a class="primitive" href="{{channel}}/std/primitive.unit.html">()</a>&gt; + 'a + ?<a class="trait" href="{{channel}}/core/marker/trait.Sized.html" title="trait core::marker::Sized">Sized</a>,</div>{
     pub a: <a class="primitive" href="{{channel}}/std/primitive.reference.html">&amp;'a B</a>,
     pub b: <a class="primitive" href="{{channel}}/std/primitive.u32.html">u32</a>,
 }</code></pre>