forked from rust-lang/rust
-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Rollup merge of rust-lang#101462 - aDotInTheVoid:rdj-enum-field-2, r=…
…GuillaumeGomez Rustdoc-Json: Store Variant Fields as their own item. Closes rust-lang#100587 Closes rust-lang#92945 Successor to rust-lang#100762 Unlike that one, we don't have merge `StructType` and `Variant`, as after rust-lang#101386 `Variant` stores enum specific information (discriminant). Resolves the naming discussion (rust-lang#100762 (comment)) by having seperate enums for struct and enum kinds Resolves `#[doc(hidden)]` on tuple structs (rust-lang#100762 (comment)) by storing as a `Vec<Option<Id>>` r? `@GuillaumeGomez`
- Loading branch information
Showing
7 changed files
with
203 additions
and
18 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,37 @@ | ||
// ignore-tidy-linelength | ||
|
||
#![feature(no_core)] | ||
#![no_core] | ||
|
||
pub enum Foo { | ||
// @set Unit = "$.index[*][?(@.name=='Unit')].id" | ||
// @is "$.index[*][?(@.name=='Unit')].inner.variant_kind" '"plain"' | ||
// @is "$.index[*][?(@.name=='Unit')].inner.variant_inner" null | ||
Unit, | ||
// @set Named = "$.index[*][?(@.name=='Named')].id" | ||
// @is "$.index[*][?(@.name=='Named')].inner.variant_kind" '"struct"' | ||
// @is "$.index[*][?(@.name=='Named')].inner.variant_inner" '{"fields": [], "fields_stripped": false}' | ||
Named {}, | ||
// @set Tuple = "$.index[*][?(@.name=='Tuple')].id" | ||
// @is "$.index[*][?(@.name=='Tuple')].inner.variant_kind" '"tuple"' | ||
// @is "$.index[*][?(@.name=='Tuple')].inner.variant_inner" [] | ||
Tuple(), | ||
// @set NamedField = "$.index[*][?(@.name=='NamedField')].id" | ||
// @set x = "$.index[*][?(@.name=='x' && @.kind=='struct_field')].id" | ||
// @is "$.index[*][?(@.name=='NamedField')].inner.variant_kind" '"struct"' | ||
// @is "$.index[*][?(@.name=='NamedField')].inner.variant_inner.fields[*]" $x | ||
// @is "$.index[*][?(@.name=='NamedField')].inner.variant_inner.fields_stripped" false | ||
NamedField { x: i32 }, | ||
// @set TupleField = "$.index[*][?(@.name=='TupleField')].id" | ||
// @is "$.index[*][?(@.name=='TupleField')].inner.variant_kind" '"tuple"' | ||
// @set tup_field = "$.index[*][?(@.name=='0' && @.kind=='struct_field')].id" | ||
// @is "$.index[*][?(@.name=='TupleField')].inner.variant_inner[*]" $tup_field | ||
TupleField(i32), | ||
} | ||
|
||
// @is "$.index[*][?(@.name=='Foo')].inner.variants[0]" $Unit | ||
// @is "$.index[*][?(@.name=='Foo')].inner.variants[1]" $Named | ||
// @is "$.index[*][?(@.name=='Foo')].inner.variants[2]" $Tuple | ||
// @is "$.index[*][?(@.name=='Foo')].inner.variants[3]" $NamedField | ||
// @is "$.index[*][?(@.name=='Foo')].inner.variants[4]" $TupleField | ||
// @count "$.index[*][?(@.name=='Foo')].inner.variants[*]" 5 |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,17 @@ | ||
pub enum Foo { | ||
Variant { | ||
#[doc(hidden)] | ||
a: i32, | ||
// @set b = "$.index[*][?(@.name=='b')].id" | ||
b: i32, | ||
#[doc(hidden)] | ||
x: i32, | ||
// @set y = "$.index[*][?(@.name=='y')].id" | ||
y: i32, | ||
}, | ||
// @is "$.index[*][?(@.name=='Variant')].inner.variant_kind" '"struct"' | ||
// @is "$.index[*][?(@.name=='Variant')].inner.variant_inner.fields_stripped" true | ||
// @is "$.index[*][?(@.name=='Variant')].inner.variant_inner.fields[0]" $b | ||
// @is "$.index[*][?(@.name=='Variant')].inner.variant_inner.fields[1]" $y | ||
// @count "$.index[*][?(@.name=='Variant')].inner.variant_inner.fields[*]" 2 | ||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,94 @@ | ||
#![feature(no_core)] | ||
#![no_core] | ||
|
||
// @set 1.1.0 = "$.index[*][?(@.docs=='1.1.0')].id" | ||
// @set 2.1.0 = "$.index[*][?(@.docs=='2.1.0')].id" | ||
// @set 2.1.1 = "$.index[*][?(@.docs=='2.1.1')].id" | ||
// @set 2.2.1 = "$.index[*][?(@.docs=='2.2.1')].id" | ||
// @set 2.3.0 = "$.index[*][?(@.docs=='2.3.0')].id" | ||
// @set 3.1.1 = "$.index[*][?(@.docs=='3.1.1')].id" | ||
// @set 3.1.2 = "$.index[*][?(@.docs=='3.1.2')].id" | ||
// @set 3.2.0 = "$.index[*][?(@.docs=='3.2.0')].id" | ||
// @set 3.2.2 = "$.index[*][?(@.docs=='3.2.2')].id" | ||
// @set 3.3.0 = "$.index[*][?(@.docs=='3.3.0')].id" | ||
// @set 3.3.1 = "$.index[*][?(@.docs=='3.3.1')].id" | ||
|
||
pub enum EnumWithStrippedTupleVariants { | ||
// @is "$.index[*][?(@.name=='None')].inner.variant_kind" '"tuple"' | ||
// @count "$.index[*][?(@.name=='None')].inner.variant_inner[*]" 0 | ||
None(), | ||
|
||
// @is "$.index[*][?(@.name=='One')].inner.variant_kind" '"tuple"' | ||
// @count "$.index[*][?(@.name=='One')].inner.variant_inner[*]" 1 | ||
// @is "$.index[*][?(@.name=='One')].inner.variant_inner[0]" $1.1.0 | ||
One(/** 1.1.0*/ bool), | ||
// @is "$.index[*][?(@.name=='OneHidden')].inner.variant_kind" '"tuple"' | ||
// @count "$.index[*][?(@.name=='OneHidden')].inner.variant_inner[*]" 1 | ||
// @is "$.index[*][?(@.name=='OneHidden')].inner.variant_inner[0]" null | ||
OneHidden(#[doc(hidden)] bool), | ||
|
||
// @is "$.index[*][?(@.name=='Two')].inner.variant_kind" '"tuple"' | ||
// @count "$.index[*][?(@.name=='Two')].inner.variant_inner[*]" 2 | ||
// @is "$.index[*][?(@.name=='Two')].inner.variant_inner[0]" $2.1.0 | ||
// @is "$.index[*][?(@.name=='Two')].inner.variant_inner[1]" $2.1.1 | ||
Two(/** 2.1.0*/ bool, /** 2.1.1*/ bool), | ||
// @is "$.index[*][?(@.name=='TwoLeftHidden')].inner.variant_kind" '"tuple"' | ||
// @count "$.index[*][?(@.name=='TwoLeftHidden')].inner.variant_inner[*]" 2 | ||
// @is "$.index[*][?(@.name=='TwoLeftHidden')].inner.variant_inner[0]" null | ||
// @is "$.index[*][?(@.name=='TwoLeftHidden')].inner.variant_inner[1]" $2.2.1 | ||
TwoLeftHidden(#[doc(hidden)] bool, /** 2.2.1*/ bool), | ||
// @is "$.index[*][?(@.name=='TwoRightHidden')].inner.variant_kind" '"tuple"' | ||
// @count "$.index[*][?(@.name=='TwoRightHidden')].inner.variant_inner[*]" 2 | ||
// @is "$.index[*][?(@.name=='TwoRightHidden')].inner.variant_inner[0]" $2.3.0 | ||
// @is "$.index[*][?(@.name=='TwoRightHidden')].inner.variant_inner[1]" null | ||
TwoRightHidden(/** 2.3.0*/ bool, #[doc(hidden)] bool), | ||
// @is "$.index[*][?(@.name=='TwoBothHidden')].inner.variant_kind" '"tuple"' | ||
// @count "$.index[*][?(@.name=='TwoBothHidden')].inner.variant_inner[*]" 2 | ||
// @is "$.index[*][?(@.name=='TwoBothHidden')].inner.variant_inner[0]" null | ||
// @is "$.index[*][?(@.name=='TwoBothHidden')].inner.variant_inner[1]" null | ||
TwoBothHidden(#[doc(hidden)] bool, #[doc(hidden)] bool), | ||
|
||
// @is "$.index[*][?(@.name=='Three1')].inner.variant_kind" '"tuple"' | ||
// @count "$.index[*][?(@.name=='Three1')].inner.variant_inner[*]" 3 | ||
// @is "$.index[*][?(@.name=='Three1')].inner.variant_inner[0]" null | ||
// @is "$.index[*][?(@.name=='Three1')].inner.variant_inner[1]" $3.1.1 | ||
// @is "$.index[*][?(@.name=='Three1')].inner.variant_inner[2]" $3.1.2 | ||
Three1(#[doc(hidden)] bool, /** 3.1.1*/ bool, /** 3.1.2*/ bool), | ||
// @is "$.index[*][?(@.name=='Three2')].inner.variant_kind" '"tuple"' | ||
// @count "$.index[*][?(@.name=='Three2')].inner.variant_inner[*]" 3 | ||
// @is "$.index[*][?(@.name=='Three2')].inner.variant_inner[0]" $3.2.0 | ||
// @is "$.index[*][?(@.name=='Three2')].inner.variant_inner[1]" null | ||
// @is "$.index[*][?(@.name=='Three2')].inner.variant_inner[2]" $3.2.2 | ||
Three2(/** 3.2.0*/ bool, #[doc(hidden)] bool, /** 3.2.2*/ bool), | ||
// @is "$.index[*][?(@.name=='Three3')].inner.variant_kind" '"tuple"' | ||
// @count "$.index[*][?(@.name=='Three3')].inner.variant_inner[*]" 3 | ||
// @is "$.index[*][?(@.name=='Three3')].inner.variant_inner[0]" $3.3.0 | ||
// @is "$.index[*][?(@.name=='Three3')].inner.variant_inner[1]" $3.3.1 | ||
// @is "$.index[*][?(@.name=='Three3')].inner.variant_inner[2]" null | ||
Three3(/** 3.3.0*/ bool, /** 3.3.1*/ bool, #[doc(hidden)] bool), | ||
} | ||
|
||
|
||
// @is "$.index[*][?(@.docs=='1.1.0')].name" '"0"' | ||
// @is "$.index[*][?(@.docs=='2.1.0')].name" '"0"' | ||
// @is "$.index[*][?(@.docs=='2.1.1')].name" '"1"' | ||
// @is "$.index[*][?(@.docs=='2.2.1')].name" '"1"' | ||
// @is "$.index[*][?(@.docs=='2.3.0')].name" '"0"' | ||
// @is "$.index[*][?(@.docs=='3.1.1')].name" '"1"' | ||
// @is "$.index[*][?(@.docs=='3.1.2')].name" '"2"' | ||
// @is "$.index[*][?(@.docs=='3.2.0')].name" '"0"' | ||
// @is "$.index[*][?(@.docs=='3.2.2')].name" '"2"' | ||
// @is "$.index[*][?(@.docs=='3.3.0')].name" '"0"' | ||
// @is "$.index[*][?(@.docs=='3.3.1')].name" '"1"' | ||
|
||
// @is "$.index[*][?(@.docs=='1.1.0')].inner" '{"kind": "primitive", "inner": "bool"}' | ||
// @is "$.index[*][?(@.docs=='2.1.0')].inner" '{"kind": "primitive", "inner": "bool"}' | ||
// @is "$.index[*][?(@.docs=='2.1.1')].inner" '{"kind": "primitive", "inner": "bool"}' | ||
// @is "$.index[*][?(@.docs=='2.2.1')].inner" '{"kind": "primitive", "inner": "bool"}' | ||
// @is "$.index[*][?(@.docs=='2.3.0')].inner" '{"kind": "primitive", "inner": "bool"}' | ||
// @is "$.index[*][?(@.docs=='3.1.1')].inner" '{"kind": "primitive", "inner": "bool"}' | ||
// @is "$.index[*][?(@.docs=='3.1.2')].inner" '{"kind": "primitive", "inner": "bool"}' | ||
// @is "$.index[*][?(@.docs=='3.2.0')].inner" '{"kind": "primitive", "inner": "bool"}' | ||
// @is "$.index[*][?(@.docs=='3.2.2')].inner" '{"kind": "primitive", "inner": "bool"}' | ||
// @is "$.index[*][?(@.docs=='3.3.0')].inner" '{"kind": "primitive", "inner": "bool"}' | ||
// @is "$.index[*][?(@.docs=='3.3.1')].inner" '{"kind": "primitive", "inner": "bool"}' |