-
Notifications
You must be signed in to change notification settings - Fork 12.6k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Rustdoc-Json: Report discriminant on all kinds of enum variant.
Closes #106299
- Loading branch information
1 parent
b7b252a
commit cca5d21
Showing
16 changed files
with
167 additions
and
144 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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,12 +1,12 @@ | ||
| #[repr(i8)] | ||
| pub enum Ordering { | ||
| // @is "$.index[*][?(@.name=='Less')].inner.variant_inner.expr" '"-1"' | ||
| // @is "$.index[*][?(@.name=='Less')].inner.variant_inner.value" '"-1"' | ||
| // @is "$.index[*][?(@.name=='Less')].inner.discriminant.expr" '"-1"' | ||
| // @is "$.index[*][?(@.name=='Less')].inner.discriminant.value" '"-1"' | ||
| Less = -1, | ||
| // @is "$.index[*][?(@.name=='Equal')].inner.variant_inner.expr" '"0"' | ||
| // @is "$.index[*][?(@.name=='Equal')].inner.variant_inner.value" '"0"' | ||
| // @is "$.index[*][?(@.name=='Equal')].inner.discriminant.expr" '"0"' | ||
| // @is "$.index[*][?(@.name=='Equal')].inner.discriminant.value" '"0"' | ||
| Equal = 0, | ||
| // @is "$.index[*][?(@.name=='Greater')].inner.variant_inner.expr" '"1"' | ||
| // @is "$.index[*][?(@.name=='Greater')].inner.variant_inner.value" '"1"' | ||
| // @is "$.index[*][?(@.name=='Greater')].inner.discriminant.expr" '"1"' | ||
| // @is "$.index[*][?(@.name=='Greater')].inner.discriminant.value" '"1"' | ||
| Greater = 1, | ||
| } |
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
16 changes: 8 additions & 8 deletions
16
src/test/rustdoc-json/enums/discriminant/num_underscore_and_suffix.rs
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 |
|---|---|---|
| @@ -1,15 +1,15 @@ | ||
| #[repr(u32)] | ||
| pub enum Foo { | ||
| // @is "$.index[*][?(@.name=='Basic')].inner.variant_inner.value" '"0"' | ||
| // @is "$.index[*][?(@.name=='Basic')].inner.variant_inner.expr" '"0"' | ||
| // @is "$.index[*][?(@.name=='Basic')].inner.discriminant.value" '"0"' | ||
| // @is "$.index[*][?(@.name=='Basic')].inner.discriminant.expr" '"0"' | ||
| Basic = 0, | ||
| // @is "$.index[*][?(@.name=='Suffix')].inner.variant_inner.value" '"10"' | ||
| // @is "$.index[*][?(@.name=='Suffix')].inner.variant_inner.expr" '"10u32"' | ||
| // @is "$.index[*][?(@.name=='Suffix')].inner.discriminant.value" '"10"' | ||
| // @is "$.index[*][?(@.name=='Suffix')].inner.discriminant.expr" '"10u32"' | ||
| Suffix = 10u32, | ||
| // @is "$.index[*][?(@.name=='Underscore')].inner.variant_inner.value" '"100"' | ||
| // @is "$.index[*][?(@.name=='Underscore')].inner.variant_inner.expr" '"1_0_0"' | ||
| // @is "$.index[*][?(@.name=='Underscore')].inner.discriminant.value" '"100"' | ||
| // @is "$.index[*][?(@.name=='Underscore')].inner.discriminant.expr" '"1_0_0"' | ||
| Underscore = 1_0_0, | ||
| // @is "$.index[*][?(@.name=='SuffixUnderscore')].inner.variant_inner.value" '"1000"' | ||
| // @is "$.index[*][?(@.name=='SuffixUnderscore')].inner.variant_inner.expr" '"1_0_0_0u32"' | ||
| // @is "$.index[*][?(@.name=='SuffixUnderscore')].inner.discriminant.value" '"1000"' | ||
| // @is "$.index[*][?(@.name=='SuffixUnderscore')].inner.discriminant.expr" '"1_0_0_0u32"' | ||
| SuffixUnderscore = 1_0_0_0u32, | ||
| } |
8 changes: 4 additions & 4 deletions
8
src/test/rustdoc-json/enums/discriminant/only_some_have_discriminant.rs
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 |
|---|---|---|
| @@ -1,10 +1,10 @@ | ||
| pub enum Foo { | ||
| // @is "$.index[*][?(@.name=='Has')].inner.variant_inner" '{"expr":"0", "value":"0"}' | ||
| // @is "$.index[*][?(@.name=='Has')].inner.discriminant" '{"expr":"0", "value":"0"}' | ||
| Has = 0, | ||
| // @is "$.index[*][?(@.name=='Doesnt')].inner.variant_inner" null | ||
| // @is "$.index[*][?(@.name=='Doesnt')].inner.discriminant" null | ||
| Doesnt, | ||
| // @is "$.index[*][?(@.name=='AlsoDoesnt')].inner.variant_inner" null | ||
| // @is "$.index[*][?(@.name=='AlsoDoesnt')].inner.discriminant" null | ||
| AlsoDoesnt, | ||
| // @is "$.index[*][?(@.name=='AlsoHas')].inner.variant_inner" '{"expr":"44", "value":"44"}' | ||
| // @is "$.index[*][?(@.name=='AlsoHas')].inner.discriminant" '{"expr":"44", "value":"44"}' | ||
| AlsoHas = 44, | ||
| } |
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,15 @@ | ||
| // ignore-tidy-linelength | ||
|
|
||
| #[repr(i32)] | ||
| // @is "$.index[*][?(@.name=='Foo')].attrs" '["#[repr(i32)]"]' | ||
| pub enum Foo { | ||
| // @is "$.index[*][?(@.name=='Struct')].inner.discriminant" null | ||
| // @count "$.index[*][?(@.name=='Struct')].inner.kind.struct.fields[*]" 0 | ||
| Struct {}, | ||
| // @is "$.index[*][?(@.name=='StructWithDiscr')].inner.discriminant" '{"expr": "42", "value": "42"}' | ||
| // @count "$.index[*][?(@.name=='StructWithDiscr')].inner.kind.struct.fields[*]" 1 | ||
| StructWithDiscr { x: i32 } = 42, | ||
| // @is "$.index[*][?(@.name=='StructWithHexDiscr')].inner.discriminant" '{"expr": "0x42", "value": "66"}' | ||
| // @count "$.index[*][?(@.name=='StructWithHexDiscr')].inner.kind.struct.fields[*]" 2 | ||
| StructWithHexDiscr { x: i32, y: bool } = 0x42, | ||
| } |
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,15 @@ | ||
| // ignore-tidy-linelength | ||
|
|
||
| #[repr(u32)] | ||
| // @is "$.index[*][?(@.name=='Foo')].attrs" '["#[repr(u32)]"]' | ||
| pub enum Foo { | ||
| // @is "$.index[*][?(@.name=='Tuple')].inner.discriminant" null | ||
| // @count "$.index[*][?(@.name=='Tuple')].inner.kind.tuple[*]" 0 | ||
| Tuple(), | ||
| // @is "$.index[*][?(@.name=='TupleWithDiscr')].inner.discriminant" '{"expr": "1", "value": "1"}' | ||
| // @count "$.index[*][?(@.name=='TupleWithDiscr')].inner.kind.tuple[*]" 1 | ||
| TupleWithDiscr(i32) = 1, | ||
| // @is "$.index[*][?(@.name=='TupleWithBinDiscr')].inner.discriminant" '{"expr": "0b10", "value": "2"}' | ||
| // @count "$.index[*][?(@.name=='TupleWithBinDiscr')].inner.kind.tuple[*]" 2 | ||
| TupleWithBinDiscr(i32, i32) = 0b10, | ||
| } |
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
Oops, something went wrong.