about summary refs log tree commit diff
path: root/src/etc
diff options
context:
space:
mode:
authorGuillaume Gomez <guillaume1.gomez@gmail.com>2022-09-06 17:00:28 +0200
committerGitHub <noreply@github.com>2022-09-06 17:00:28 +0200
commitb59c1aa29891da79df8fbba2ea915ac2275781e2 (patch)
tree88a0f038b8a49bbfb981c1290f5cc94d59c6828f /src/etc
parent78968e595924af11c3e487f7f0ae7fc7b3c23fc5 (diff)
parent065e0b9c9cf3d03f286c5d0b98fbae7185e41b75 (diff)
downloadrust-b59c1aa29891da79df8fbba2ea915ac2275781e2.tar.gz
rust-b59c1aa29891da79df8fbba2ea915ac2275781e2.zip
Rollup merge of #101462 - aDotInTheVoid:rdj-enum-field-2, r=GuillaumeGomez
Rustdoc-Json: Store Variant Fields as their own item.

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 (https://github.com/rust-lang/rust/pull/100762#discussion_r950690526) by having seperate enums for struct and enum kinds

Resolves `#[doc(hidden)]` on tuple structs (https://github.com/rust-lang/rust/pull/100762#discussion_r950833884) by storing as a `Vec<Option<Id>>`

r? `@GuillaumeGomez`
Diffstat (limited to 'src/etc')
-rw-r--r--src/etc/check_missing_items.py6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/etc/check_missing_items.py b/src/etc/check_missing_items.py
index 025f320e3a1..27fb018aeca 100644
--- a/src/etc/check_missing_items.py
+++ b/src/etc/check_missing_items.py
@@ -144,10 +144,10 @@ while work_list:
         ) - visited
     elif item["kind"] == "variant":
         if item["inner"]["variant_kind"] == "tuple":
-            for ty in item["inner"]["variant_inner"]:
-                check_type(ty)
+            for field_id in filter(None, item["inner"]["variant_inner"]):
+                work_list.add(field_id)
         elif item["inner"]["variant_kind"] == "struct":
-            work_list |= set(item["inner"]["variant_inner"]) - visited
+            work_list |= set(item["inner"]["variant_inner"]["fields"]) - visited
     elif item["kind"] in ("function", "method"):
         check_generics(item["inner"]["generics"])
         check_decl(item["inner"]["decl"])