From 9f63b52b7e48142d39b362cc7455582171875aa2 Mon Sep 17 00:00:00 2001
From: Martin Nordholts <enselic@gmail.com>
Date: Sun, 16 Jan 2022 11:54:43 +0100
Subject: [PATCH] rustdoc-json: make variant Tuple contain `Vec<Id>` instead of
 `Vec<Type>`

---
 src/librustdoc/json/conversions.rs | 15 ++-------------
 src/rustdoc-json-types/lib.rs      |  2 +-
 2 files changed, 3 insertions(+), 14 deletions(-)

diff --git a/src/librustdoc/json/conversions.rs b/src/librustdoc/json/conversions.rs
index c8efa4bbbcc30..864ee4ce26342 100644
--- a/src/librustdoc/json/conversions.rs
+++ b/src/librustdoc/json/conversions.rs
@@ -576,22 +576,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 9466f84ffcd59..2f9b4898f6fe2 100644
--- a/src/rustdoc-json-types/lib.rs
+++ b/src/rustdoc-json-types/lib.rs
@@ -272,7 +272,7 @@ pub struct Enum {
 #[serde(tag = "variant_kind", content = "variant_inner")]
 pub enum Variant {
     Plain,
-    Tuple(Vec<Type>),
+    Tuple(Vec<Id>),
     Struct(Vec<Id>),
 }