From c921d75e52673bedce078d0b9b23dd7bacc4bbd0 Mon Sep 17 00:00:00 2001
From: Rune Tynan <runetynan@gmail.com>
Date: Mon, 31 Jan 2022 18:15:55 -0500
Subject: [PATCH 1/2] Make enum tuple variants match tuple structs, and not
 have free-floating struct_field members they don't reference.

---
 src/etc/check_missing_items.py     |  5 +----
 src/librustdoc/json/conversions.rs | 15 ++-------------
 src/rustdoc-json-types/lib.rs      |  6 +++---
 3 files changed, 6 insertions(+), 20 deletions(-)

diff --git a/src/etc/check_missing_items.py b/src/etc/check_missing_items.py
index 343dd0387f479..ded96c145acfc 100644
--- a/src/etc/check_missing_items.py
+++ b/src/etc/check_missing_items.py
@@ -143,10 +143,7 @@ def check_type(ty):
             set(item["inner"]["variants"]) | set(item["inner"]["impls"])
         ) - visited
     elif item["kind"] == "variant":
-        if item["inner"]["variant_kind"] == "tuple":
-            for ty in item["inner"]["variant_inner"]:
-                check_type(ty)
-        elif item["inner"]["variant_kind"] == "struct":
+        if item["inner"]["variant_kind"] == "struct" or item["inner"]["variant_kind"] == "tuple":
             work_list |= set(item["inner"]["variant_inner"]) - visited
     elif item["kind"] in ("function", "method"):
         check_generics(item["inner"]["generics"])
diff --git a/src/librustdoc/json/conversions.rs b/src/librustdoc/json/conversions.rs
index 56b02cd848041..3def45a5ec4a4 100644
--- a/src/librustdoc/json/conversions.rs
+++ b/src/librustdoc/json/conversions.rs
@@ -602,22 +602,11 @@ impl FromWithTcx<clean::VariantStruct> for Struct {
 }
 
 impl FromWithTcx<clean::Variant> for Variant {
-    fn from_tcx(variant: clean::Variant, tcx: TyCtxt<'_>) -> Self {
+    fn from_tcx(variant: clean::Variant, _tcx: TyCtxt<'_>) -> Self {
         use clean::Variant::*;
         match variant {
             CLike => Variant::Plain,
-            Tuple(fields) => Variant::Tuple(
-                fields
-                    .into_iter()
-                    .map(|f| {
-                        if let clean::StructFieldItem(ty) = *f.kind {
-                            ty.into_tcx(tcx)
-                        } else {
-                            unreachable!()
-                        }
-                    })
-                    .collect(),
-            ),
+            Tuple(fields) => Variant::Tuple(ids(fields)),
             Struct(s) => Variant::Struct(ids(s.fields)),
         }
     }
diff --git a/src/rustdoc-json-types/lib.rs b/src/rustdoc-json-types/lib.rs
index 17b3859a77b64..468fa6840e638 100644
--- a/src/rustdoc-json-types/lib.rs
+++ b/src/rustdoc-json-types/lib.rs
@@ -9,7 +9,7 @@ use std::path::PathBuf;
 use serde::{Deserialize, Serialize};
 
 /// rustdoc format-version.
-pub const FORMAT_VERSION: u32 = 14;
+pub const FORMAT_VERSION: u32 = 15;
 
 /// A `Crate` is the root of the emitted JSON blob. It contains all type/documentation information
 /// about the language items in the local crate, as well as info about external items to allow
@@ -277,7 +277,7 @@ pub struct Enum {
 #[serde(tag = "variant_kind", content = "variant_inner")]
 pub enum Variant {
     Plain,
-    Tuple(Vec<Type>),
+    Tuple(Vec<Id>),
     Struct(Vec<Id>),
 }
 
@@ -451,7 +451,7 @@ pub enum Type {
     Tuple(Vec<Type>),
     /// `[u32]`
     Slice(Box<Type>),
-    /// [u32; 15]
+    /// `[u32; 15]`
     Array {
         #[serde(rename = "type")]
         type_: Box<Type>,

From 45e05ec9387319a2f51873fa86fd2db4a1187524 Mon Sep 17 00:00:00 2001
From: Rune Tynan <runetynan@gmail.com>
Date: Tue, 1 Feb 2022 12:42:20 -0500
Subject: [PATCH 2/2] Add test that variant contains its fields

---
 .../rustdoc-json/enums/variant_tuple_struct.rs     | 14 +++++++++++---
 1 file changed, 11 insertions(+), 3 deletions(-)

diff --git a/src/test/rustdoc-json/enums/variant_tuple_struct.rs b/src/test/rustdoc-json/enums/variant_tuple_struct.rs
index ac3e72e2905d2..03dbd28237975 100644
--- a/src/test/rustdoc-json/enums/variant_tuple_struct.rs
+++ b/src/test/rustdoc-json/enums/variant_tuple_struct.rs
@@ -2,7 +2,15 @@
 // @has - "$.index[*][?(@.name=='EnumTupleStruct')].kind" \"enum\"
 pub enum EnumTupleStruct {
     // @has - "$.index[*][?(@.name=='VariantA')].inner.variant_kind" \"tuple\"
-    // @has - "$.index[*][?(@.name=='0')].kind" \"struct_field\"
-    // @has - "$.index[*][?(@.name=='1')].kind" \"struct_field\"
-    VariantA(u32, String),
+    VariantA(
+        // @set field_0 = - "$.index[*][?(@.name=='0')].id"
+        // @has - "$.index[*][?(@.name=='0')].kind" \"struct_field\"
+        u32,
+        // @set field_1 = - "$.index[*][?(@.name=='1')].id"
+        // @has - "$.index[*][?(@.name=='1')].kind" \"struct_field\"
+        String,
+    ),
 }
+
+// @has - "$.index[*][?(@.name=='VariantA')].inner.variant_inner[*]" $field_0
+// @has - "$.index[*][?(@.name=='VariantA')].inner.variant_inner[*]" $field_1