Rustdoc-Json: Store Variant Fields as their own item.

[aDotInTheVoid]

Closes #100587
Closes #92945

Successor to #100762

Unlike that one, we don't have merge StructType and Variant, as after #101386 Variant stores enum specific information (discriminant).

Resolves the naming discussion (#100762 (comment)) by having seperate enums for struct and enum kinds

Resolves #[doc(hidden)] on tuple structs (#100762 (comment)) by storing as a Vec<Option<Id>>

r? @GuillaumeGomez

[rustbot]

rustdoc-json-types is a public (although nightly-only) API. If possible, consider changing src/librustdoc/json/conversions.rs; otherwise, make sure you bump the FORMAT_VERSION constant.

cc @CraftSpider, @aDotInTheVoid, @Enselic

[GuillaumeGomez]

I really like this approach. Just one comment: shouldn't we unify the stripped_fields thing? We could either store Struct fields into a Vec<Option<Id>> too or add a stripped_variants into Enum.

[aDotInTheVoid]

In my mind what should happen to Struct is we put fields in StructType, eg

enum StructKind {
   Unit,
   Tuple(Vec<Option<Id>>),
   Normal {
       fields: Vec<Id>,
       fields_stripped: bool,
  },
}

That way we only show the position of #[doc(hidden)] in the tuple case where it's relevant.

If that sounds good I'll send a follow up PR

[GuillaumeGomez]

This is a good argument indeed. Let's keep it this way then!

[GuillaumeGomez]

Thanks for the improvement (and the docs too!).

@bors r+ rollup

[bors]

📌 Commit 065e0b9 has been approved by GuillaumeGomez

It is now in the queue for this repository.