Skip to content

Commit 1c1a5d9

Browse files
committed
Reorder struct_ and newtype tests of adjacently_tagged enums to match order in Enum
1 parent ee3c237 commit 1c1a5d9

File tree

1 file changed

+17
-17
lines changed

1 file changed

+17
-17
lines changed

test_suite/tests/test_annotations.rs

Lines changed: 17 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -2827,14 +2827,11 @@ mod flatten {
28272827
}
28282828

28292829
#[test]
2830-
fn struct_() {
2830+
fn newtype() {
28312831
assert_tokens(
28322832
&Flatten {
28332833
outer: 42,
2834-
data: NewtypeWrapper(Enum::Struct {
2835-
index: 0,
2836-
value: 42,
2837-
}),
2834+
data: NewtypeWrapper(Enum::Newtype(NewtypeVariant { value: 23 })),
28382835
},
28392836
&[
28402837
Token::Map { len: None },
@@ -2843,29 +2840,30 @@ mod flatten {
28432840
Token::Str("tag"),
28442841
Token::UnitVariant {
28452842
name: "Enum",
2846-
variant: "Struct",
2843+
variant: "Newtype",
28472844
},
28482845
Token::Str("content"),
28492846
Token::Struct {
2850-
len: 2,
2851-
name: "Struct",
2847+
len: 1,
2848+
name: "NewtypeVariant",
28522849
},
2853-
Token::Str("index"),
2854-
Token::U32(0),
28552850
Token::Str("value"),
2856-
Token::U32(42),
2851+
Token::U32(23),
28572852
Token::StructEnd,
28582853
Token::MapEnd,
28592854
],
28602855
);
28612856
}
28622857

28632858
#[test]
2864-
fn newtype() {
2859+
fn struct_() {
28652860
assert_tokens(
28662861
&Flatten {
28672862
outer: 42,
2868-
data: NewtypeWrapper(Enum::Newtype(NewtypeVariant { value: 23 })),
2863+
data: NewtypeWrapper(Enum::Struct {
2864+
index: 0,
2865+
value: 42,
2866+
}),
28692867
},
28702868
&[
28712869
Token::Map { len: None },
@@ -2874,15 +2872,17 @@ mod flatten {
28742872
Token::Str("tag"),
28752873
Token::UnitVariant {
28762874
name: "Enum",
2877-
variant: "Newtype",
2875+
variant: "Struct",
28782876
},
28792877
Token::Str("content"),
28802878
Token::Struct {
2881-
len: 1,
2882-
name: "NewtypeVariant",
2879+
len: 2,
2880+
name: "Struct",
28832881
},
2882+
Token::Str("index"),
2883+
Token::U32(0),
28842884
Token::Str("value"),
2885-
Token::U32(23),
2885+
Token::U32(42),
28862886
Token::StructEnd,
28872887
Token::MapEnd,
28882888
],

0 commit comments

Comments
 (0)