Skip to content

Commit 6834dcc

Browse files
regexidentregexident
committed
Update test snapshots
1 parent d614f9c commit 6834dcc

7 files changed

Lines changed: 70 additions & 70 deletions

File tree

‎tests/derive-tests/smoke/pass/enum/smoke.out.rs‎

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -290,9 +290,9 @@ impl ::core::clone::Clone for CustomDiscriminant {
290290
impl ::core::cmp::Ord for CustomDiscriminant {
291291
#[inline]
292292
fn cmp(&self, other: &CustomDiscriminant) -> ::core::cmp::Ordering {
293-
let __self_tag = ::core::intrinsics::discriminant_value(self);
294-
let __arg1_tag = ::core::intrinsics::discriminant_value(other);
295-
::core::cmp::Ord::cmp(&__self_tag, &__arg1_tag)
293+
let __self_discr = ::core::intrinsics::discriminant_value(self);
294+
let __arg1_discr = ::core::intrinsics::discriminant_value(other);
295+
::core::cmp::Ord::cmp(&__self_discr, &__arg1_discr)
296296
}
297297
}
298298
#[automatically_derived]
@@ -302,9 +302,9 @@ impl ::core::cmp::PartialOrd for CustomDiscriminant {
302302
&self,
303303
other: &CustomDiscriminant,
304304
) -> ::core::option::Option<::core::cmp::Ordering> {
305-
let __self_tag = ::core::intrinsics::discriminant_value(self);
306-
let __arg1_tag = ::core::intrinsics::discriminant_value(other);
307-
::core::cmp::PartialOrd::partial_cmp(&__self_tag, &__arg1_tag)
305+
let __self_discr = ::core::intrinsics::discriminant_value(self);
306+
let __arg1_discr = ::core::intrinsics::discriminant_value(other);
307+
::core::cmp::PartialOrd::partial_cmp(&__self_discr, &__arg1_discr)
308308
}
309309
}
310310
#[automatically_derived]
@@ -320,17 +320,17 @@ impl ::core::marker::StructuralPartialEq for CustomDiscriminant {}
320320
impl ::core::cmp::PartialEq for CustomDiscriminant {
321321
#[inline]
322322
fn eq(&self, other: &CustomDiscriminant) -> bool {
323-
let __self_tag = ::core::intrinsics::discriminant_value(self);
324-
let __arg1_tag = ::core::intrinsics::discriminant_value(other);
325-
__self_tag == __arg1_tag
323+
let __self_discr = ::core::intrinsics::discriminant_value(self);
324+
let __arg1_discr = ::core::intrinsics::discriminant_value(other);
325+
__self_discr == __arg1_discr
326326
}
327327
}
328328
#[automatically_derived]
329329
impl ::core::hash::Hash for CustomDiscriminant {
330330
#[inline]
331331
fn hash<__H: ::core::hash::Hasher>(&self, state: &mut __H) -> () {
332-
let __self_tag = ::core::intrinsics::discriminant_value(self);
333-
::core::hash::Hash::hash(&__self_tag, state)
332+
let __self_discr = ::core::intrinsics::discriminant_value(self);
333+
::core::hash::Hash::hash(&__self_discr, state)
334334
}
335335
}
336336
#[automatically_derived]

‎tests/derive-tests/variant_discriminant/fail/nested_with_value.out.rs‎

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -20,9 +20,9 @@ impl ::core::clone::Clone for VariantADiscriminant {
2020
impl ::core::cmp::Ord for VariantADiscriminant {
2121
#[inline]
2222
fn cmp(&self, other: &VariantADiscriminant) -> ::core::cmp::Ordering {
23-
let __self_tag = ::core::intrinsics::discriminant_value(self);
24-
let __arg1_tag = ::core::intrinsics::discriminant_value(other);
25-
::core::cmp::Ord::cmp(&__self_tag, &__arg1_tag)
23+
let __self_discr = ::core::intrinsics::discriminant_value(self);
24+
let __arg1_discr = ::core::intrinsics::discriminant_value(other);
25+
::core::cmp::Ord::cmp(&__self_discr, &__arg1_discr)
2626
}
2727
}
2828
#[automatically_derived]
@@ -32,9 +32,9 @@ impl ::core::cmp::PartialOrd for VariantADiscriminant {
3232
&self,
3333
other: &VariantADiscriminant,
3434
) -> ::core::option::Option<::core::cmp::Ordering> {
35-
let __self_tag = ::core::intrinsics::discriminant_value(self);
36-
let __arg1_tag = ::core::intrinsics::discriminant_value(other);
37-
::core::cmp::PartialOrd::partial_cmp(&__self_tag, &__arg1_tag)
35+
let __self_discr = ::core::intrinsics::discriminant_value(self);
36+
let __arg1_discr = ::core::intrinsics::discriminant_value(other);
37+
::core::cmp::PartialOrd::partial_cmp(&__self_discr, &__arg1_discr)
3838
}
3939
}
4040
#[automatically_derived]
@@ -50,17 +50,17 @@ impl ::core::marker::StructuralPartialEq for VariantADiscriminant {}
5050
impl ::core::cmp::PartialEq for VariantADiscriminant {
5151
#[inline]
5252
fn eq(&self, other: &VariantADiscriminant) -> bool {
53-
let __self_tag = ::core::intrinsics::discriminant_value(self);
54-
let __arg1_tag = ::core::intrinsics::discriminant_value(other);
55-
__self_tag == __arg1_tag
53+
let __self_discr = ::core::intrinsics::discriminant_value(self);
54+
let __arg1_discr = ::core::intrinsics::discriminant_value(other);
55+
__self_discr == __arg1_discr
5656
}
5757
}
5858
#[automatically_derived]
5959
impl ::core::hash::Hash for VariantADiscriminant {
6060
#[inline]
6161
fn hash<__H: ::core::hash::Hasher>(&self, state: &mut __H) -> () {
62-
let __self_tag = ::core::intrinsics::discriminant_value(self);
63-
::core::hash::Hash::hash(&__self_tag, state)
62+
let __self_discr = ::core::intrinsics::discriminant_value(self);
63+
::core::hash::Hash::hash(&__self_discr, state)
6464
}
6565
}
6666
#[automatically_derived]

‎tests/derive-tests/variant_discriminant/pass/enum/lifetimes.out.rs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -143,7 +143,7 @@ impl ::core::cmp::PartialEq for EnumWithLifetimeDiscriminant {
143143
(
144144
EnumWithLifetimeDiscriminant::VariantA(__self_0),
145145
EnumWithLifetimeDiscriminant::VariantA(__arg1_0),
146-
) => *__self_0 == *__arg1_0,
146+
) => __self_0 == __arg1_0,
147147
}
148148
}
149149
}

‎tests/derive-tests/variant_discriminant/pass/enum/mixed_variants.out.rs‎

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -34,9 +34,9 @@ impl ::core::clone::Clone for EnumDiscriminant {
3434
impl ::core::cmp::Ord for EnumDiscriminant {
3535
#[inline]
3636
fn cmp(&self, other: &EnumDiscriminant) -> ::core::cmp::Ordering {
37-
let __self_tag = ::core::intrinsics::discriminant_value(self);
38-
let __arg1_tag = ::core::intrinsics::discriminant_value(other);
39-
::core::cmp::Ord::cmp(&__self_tag, &__arg1_tag)
37+
let __self_discr = ::core::intrinsics::discriminant_value(self);
38+
let __arg1_discr = ::core::intrinsics::discriminant_value(other);
39+
::core::cmp::Ord::cmp(&__self_discr, &__arg1_discr)
4040
}
4141
}
4242
#[automatically_derived]
@@ -46,9 +46,9 @@ impl ::core::cmp::PartialOrd for EnumDiscriminant {
4646
&self,
4747
other: &EnumDiscriminant,
4848
) -> ::core::option::Option<::core::cmp::Ordering> {
49-
let __self_tag = ::core::intrinsics::discriminant_value(self);
50-
let __arg1_tag = ::core::intrinsics::discriminant_value(other);
51-
::core::cmp::PartialOrd::partial_cmp(&__self_tag, &__arg1_tag)
49+
let __self_discr = ::core::intrinsics::discriminant_value(self);
50+
let __arg1_discr = ::core::intrinsics::discriminant_value(other);
51+
::core::cmp::PartialOrd::partial_cmp(&__self_discr, &__arg1_discr)
5252
}
5353
}
5454
#[automatically_derived]
@@ -64,17 +64,17 @@ impl ::core::marker::StructuralPartialEq for EnumDiscriminant {}
6464
impl ::core::cmp::PartialEq for EnumDiscriminant {
6565
#[inline]
6666
fn eq(&self, other: &EnumDiscriminant) -> bool {
67-
let __self_tag = ::core::intrinsics::discriminant_value(self);
68-
let __arg1_tag = ::core::intrinsics::discriminant_value(other);
69-
__self_tag == __arg1_tag
67+
let __self_discr = ::core::intrinsics::discriminant_value(self);
68+
let __arg1_discr = ::core::intrinsics::discriminant_value(other);
69+
__self_discr == __arg1_discr
7070
}
7171
}
7272
#[automatically_derived]
7373
impl ::core::hash::Hash for EnumDiscriminant {
7474
#[inline]
7575
fn hash<__H: ::core::hash::Hasher>(&self, state: &mut __H) -> () {
76-
let __self_tag = ::core::intrinsics::discriminant_value(self);
77-
::core::hash::Hash::hash(&__self_tag, state)
76+
let __self_discr = ::core::intrinsics::discriminant_value(self);
77+
::core::hash::Hash::hash(&__self_discr, state)
7878
}
7979
}
8080
#[automatically_derived]

‎tests/derive-tests/variant_discriminant/pass/enum/name.out.rs‎

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -26,9 +26,9 @@ impl ::core::clone::Clone for RenamedDiscriminant {
2626
impl ::core::cmp::Ord for RenamedDiscriminant {
2727
#[inline]
2828
fn cmp(&self, other: &RenamedDiscriminant) -> ::core::cmp::Ordering {
29-
let __self_tag = ::core::intrinsics::discriminant_value(self);
30-
let __arg1_tag = ::core::intrinsics::discriminant_value(other);
31-
::core::cmp::Ord::cmp(&__self_tag, &__arg1_tag)
29+
let __self_discr = ::core::intrinsics::discriminant_value(self);
30+
let __arg1_discr = ::core::intrinsics::discriminant_value(other);
31+
::core::cmp::Ord::cmp(&__self_discr, &__arg1_discr)
3232
}
3333
}
3434
#[automatically_derived]
@@ -38,9 +38,9 @@ impl ::core::cmp::PartialOrd for RenamedDiscriminant {
3838
&self,
3939
other: &RenamedDiscriminant,
4040
) -> ::core::option::Option<::core::cmp::Ordering> {
41-
let __self_tag = ::core::intrinsics::discriminant_value(self);
42-
let __arg1_tag = ::core::intrinsics::discriminant_value(other);
43-
::core::cmp::PartialOrd::partial_cmp(&__self_tag, &__arg1_tag)
41+
let __self_discr = ::core::intrinsics::discriminant_value(self);
42+
let __arg1_discr = ::core::intrinsics::discriminant_value(other);
43+
::core::cmp::PartialOrd::partial_cmp(&__self_discr, &__arg1_discr)
4444
}
4545
}
4646
#[automatically_derived]
@@ -56,17 +56,17 @@ impl ::core::marker::StructuralPartialEq for RenamedDiscriminant {}
5656
impl ::core::cmp::PartialEq for RenamedDiscriminant {
5757
#[inline]
5858
fn eq(&self, other: &RenamedDiscriminant) -> bool {
59-
let __self_tag = ::core::intrinsics::discriminant_value(self);
60-
let __arg1_tag = ::core::intrinsics::discriminant_value(other);
61-
__self_tag == __arg1_tag
59+
let __self_discr = ::core::intrinsics::discriminant_value(self);
60+
let __arg1_discr = ::core::intrinsics::discriminant_value(other);
61+
__self_discr == __arg1_discr
6262
}
6363
}
6464
#[automatically_derived]
6565
impl ::core::hash::Hash for RenamedDiscriminant {
6666
#[inline]
6767
fn hash<__H: ::core::hash::Hasher>(&self, state: &mut __H) -> () {
68-
let __self_tag = ::core::intrinsics::discriminant_value(self);
69-
::core::hash::Hash::hash(&__self_tag, state)
68+
let __self_discr = ::core::intrinsics::discriminant_value(self);
69+
::core::hash::Hash::hash(&__self_discr, state)
7070
}
7171
}
7272
#[automatically_derived]

‎tests/derive-tests/variant_discriminant/pass/enum/nested.out.rs‎

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -246,9 +246,9 @@ impl ::core::clone::Clone for EnumDiscriminant {
246246
impl ::core::cmp::Ord for EnumDiscriminant {
247247
#[inline]
248248
fn cmp(&self, other: &EnumDiscriminant) -> ::core::cmp::Ordering {
249-
let __self_tag = ::core::intrinsics::discriminant_value(self);
250-
let __arg1_tag = ::core::intrinsics::discriminant_value(other);
251-
match ::core::cmp::Ord::cmp(&__self_tag, &__arg1_tag) {
249+
let __self_discr = ::core::intrinsics::discriminant_value(self);
250+
let __arg1_discr = ::core::intrinsics::discriminant_value(other);
251+
match ::core::cmp::Ord::cmp(&__self_discr, &__arg1_discr) {
252252
::core::cmp::Ordering::Equal => {
253253
match (self, other) {
254254
(
@@ -277,8 +277,8 @@ impl ::core::cmp::PartialOrd for EnumDiscriminant {
277277
&self,
278278
other: &EnumDiscriminant,
279279
) -> ::core::option::Option<::core::cmp::Ordering> {
280-
let __self_tag = ::core::intrinsics::discriminant_value(self);
281-
let __arg1_tag = ::core::intrinsics::discriminant_value(other);
280+
let __self_discr = ::core::intrinsics::discriminant_value(self);
281+
let __arg1_discr = ::core::intrinsics::discriminant_value(other);
282282
match (self, other) {
283283
(
284284
EnumDiscriminant::VariantC(__self_0),
@@ -292,7 +292,7 @@ impl ::core::cmp::PartialOrd for EnumDiscriminant {
292292
EnumDiscriminant::VariantE(__self_0),
293293
EnumDiscriminant::VariantE(__arg1_0),
294294
) => ::core::cmp::PartialOrd::partial_cmp(__self_0, __arg1_0),
295-
_ => ::core::cmp::PartialOrd::partial_cmp(&__self_tag, &__arg1_tag),
295+
_ => ::core::cmp::PartialOrd::partial_cmp(&__self_discr, &__arg1_discr),
296296
}
297297
}
298298
}
@@ -317,22 +317,22 @@ impl ::core::marker::StructuralPartialEq for EnumDiscriminant {}
317317
impl ::core::cmp::PartialEq for EnumDiscriminant {
318318
#[inline]
319319
fn eq(&self, other: &EnumDiscriminant) -> bool {
320-
let __self_tag = ::core::intrinsics::discriminant_value(self);
321-
let __arg1_tag = ::core::intrinsics::discriminant_value(other);
322-
__self_tag == __arg1_tag
320+
let __self_discr = ::core::intrinsics::discriminant_value(self);
321+
let __arg1_discr = ::core::intrinsics::discriminant_value(other);
322+
__self_discr == __arg1_discr
323323
&& match (self, other) {
324324
(
325325
EnumDiscriminant::VariantC(__self_0),
326326
EnumDiscriminant::VariantC(__arg1_0),
327-
) => *__self_0 == *__arg1_0,
327+
) => __self_0 == __arg1_0,
328328
(
329329
EnumDiscriminant::RenamedVariant(__self_0),
330330
EnumDiscriminant::RenamedVariant(__arg1_0),
331-
) => *__self_0 == *__arg1_0,
331+
) => __self_0 == __arg1_0,
332332
(
333333
EnumDiscriminant::VariantE(__self_0),
334334
EnumDiscriminant::VariantE(__arg1_0),
335-
) => *__self_0 == *__arg1_0,
335+
) => __self_0 == __arg1_0,
336336
_ => true,
337337
}
338338
}
@@ -341,8 +341,8 @@ impl ::core::cmp::PartialEq for EnumDiscriminant {
341341
impl ::core::hash::Hash for EnumDiscriminant {
342342
#[inline]
343343
fn hash<__H: ::core::hash::Hasher>(&self, state: &mut __H) -> () {
344-
let __self_tag = ::core::intrinsics::discriminant_value(self);
345-
::core::hash::Hash::hash(&__self_tag, state);
344+
let __self_discr = ::core::intrinsics::discriminant_value(self);
345+
::core::hash::Hash::hash(&__self_discr, state);
346346
match self {
347347
EnumDiscriminant::VariantC(__self_0) => {
348348
::core::hash::Hash::hash(__self_0, state)

‎tests/derive-tests/variant_discriminant/pass/enum/repr.out.rs‎

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -27,9 +27,9 @@ impl ::core::clone::Clone for EnumDiscriminant {
2727
impl ::core::cmp::Ord for EnumDiscriminant {
2828
#[inline]
2929
fn cmp(&self, other: &EnumDiscriminant) -> ::core::cmp::Ordering {
30-
let __self_tag = ::core::intrinsics::discriminant_value(self);
31-
let __arg1_tag = ::core::intrinsics::discriminant_value(other);
32-
::core::cmp::Ord::cmp(&__self_tag, &__arg1_tag)
30+
let __self_discr = ::core::intrinsics::discriminant_value(self);
31+
let __arg1_discr = ::core::intrinsics::discriminant_value(other);
32+
::core::cmp::Ord::cmp(&__self_discr, &__arg1_discr)
3333
}
3434
}
3535
#[automatically_derived]
@@ -39,9 +39,9 @@ impl ::core::cmp::PartialOrd for EnumDiscriminant {
3939
&self,
4040
other: &EnumDiscriminant,
4141
) -> ::core::option::Option<::core::cmp::Ordering> {
42-
let __self_tag = ::core::intrinsics::discriminant_value(self);
43-
let __arg1_tag = ::core::intrinsics::discriminant_value(other);
44-
::core::cmp::PartialOrd::partial_cmp(&__self_tag, &__arg1_tag)
42+
let __self_discr = ::core::intrinsics::discriminant_value(self);
43+
let __arg1_discr = ::core::intrinsics::discriminant_value(other);
44+
::core::cmp::PartialOrd::partial_cmp(&__self_discr, &__arg1_discr)
4545
}
4646
}
4747
#[automatically_derived]
@@ -57,17 +57,17 @@ impl ::core::marker::StructuralPartialEq for EnumDiscriminant {}
5757
impl ::core::cmp::PartialEq for EnumDiscriminant {
5858
#[inline]
5959
fn eq(&self, other: &EnumDiscriminant) -> bool {
60-
let __self_tag = ::core::intrinsics::discriminant_value(self);
61-
let __arg1_tag = ::core::intrinsics::discriminant_value(other);
62-
__self_tag == __arg1_tag
60+
let __self_discr = ::core::intrinsics::discriminant_value(self);
61+
let __arg1_discr = ::core::intrinsics::discriminant_value(other);
62+
__self_discr == __arg1_discr
6363
}
6464
}
6565
#[automatically_derived]
6666
impl ::core::hash::Hash for EnumDiscriminant {
6767
#[inline]
6868
fn hash<__H: ::core::hash::Hasher>(&self, state: &mut __H) -> () {
69-
let __self_tag = ::core::intrinsics::discriminant_value(self);
70-
::core::hash::Hash::hash(&__self_tag, state)
69+
let __self_discr = ::core::intrinsics::discriminant_value(self);
70+
::core::hash::Hash::hash(&__self_discr, state)
7171
}
7272
}
7373
#[automatically_derived]

0 commit comments

Comments
 (0)