Skip to content

Commit 980e383

Browse files
committed
Auto merge of #153157 - madsmtm:fix-eq-derive-comptime-regression, r=<try>
Re-add `#[inline]` to `Eq::assert_fields_are_eq`
2 parents 6a979b3 + cfc24b4 commit 980e383

File tree

3 files changed

+18
-1
lines changed

3 files changed

+18
-1
lines changed

compiler/rustc_builtin_macros/src/deriving/cmp/eq.rs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,7 @@ pub(crate) fn expand_deriving_eq(
3232
nonself_args: vec![],
3333
ret_ty: Unit,
3434
attributes: thin_vec![
35+
cx.attr_word(sym::inline, span),
3536
cx.attr_nested_word(sym::doc, sym::hidden, span),
3637
cx.attr_nested_word(sym::coverage, sym::off, span),
3738
],

tests/ui/deriving/deriving-all-codegen.stdout

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -62,6 +62,7 @@ impl ::core::cmp::PartialEq for Empty {
6262
}
6363
#[automatically_derived]
6464
impl ::core::cmp::Eq for Empty {
65+
#[inline]
6566
#[doc(hidden)]
6667
#[coverage(off)]
6768
fn assert_fields_are_eq(&self) {}
@@ -138,6 +139,7 @@ impl ::core::cmp::PartialEq for Point {
138139
}
139140
#[automatically_derived]
140141
impl ::core::cmp::Eq for Point {
142+
#[inline]
141143
#[doc(hidden)]
142144
#[coverage(off)]
143145
fn assert_fields_are_eq(&self) {
@@ -225,6 +227,7 @@ impl ::core::cmp::PartialEq for PackedPoint {
225227
}
226228
#[automatically_derived]
227229
impl ::core::cmp::Eq for PackedPoint {
230+
#[inline]
228231
#[doc(hidden)]
229232
#[coverage(off)]
230233
fn assert_fields_are_eq(&self) {
@@ -307,6 +310,7 @@ impl ::core::cmp::PartialEq for TupleSingleField {
307310
}
308311
#[automatically_derived]
309312
impl ::core::cmp::Eq for TupleSingleField {
313+
#[inline]
310314
#[doc(hidden)]
311315
#[coverage(off)]
312316
fn assert_fields_are_eq(&self) {
@@ -381,6 +385,7 @@ impl ::core::cmp::PartialEq for SingleField {
381385
}
382386
#[automatically_derived]
383387
impl ::core::cmp::Eq for SingleField {
388+
#[inline]
384389
#[doc(hidden)]
385390
#[coverage(off)]
386391
fn assert_fields_are_eq(&self) {
@@ -485,6 +490,7 @@ impl ::core::cmp::PartialEq for Big {
485490
}
486491
#[automatically_derived]
487492
impl ::core::cmp::Eq for Big {
493+
#[inline]
488494
#[doc(hidden)]
489495
#[coverage(off)]
490496
fn assert_fields_are_eq(&self) {
@@ -748,6 +754,7 @@ impl ::core::cmp::PartialEq for Unsized {
748754
}
749755
#[automatically_derived]
750756
impl ::core::cmp::Eq for Unsized {
757+
#[inline]
751758
#[doc(hidden)]
752759
#[coverage(off)]
753760
fn assert_fields_are_eq(&self) {
@@ -842,6 +849,7 @@ impl<T: ::core::cmp::PartialEq + Trait, U: ::core::cmp::PartialEq>
842849
#[automatically_derived]
843850
impl<T: ::core::cmp::Eq + Trait, U: ::core::cmp::Eq> ::core::cmp::Eq for
844851
Generic<T, U> where T::A: ::core::cmp::Eq {
852+
#[inline]
845853
#[doc(hidden)]
846854
#[coverage(off)]
847855
fn assert_fields_are_eq(&self) {
@@ -963,6 +971,7 @@ impl<T: ::core::cmp::PartialEq + ::core::marker::Copy + Trait,
963971
impl<T: ::core::cmp::Eq + ::core::marker::Copy + Trait, U: ::core::cmp::Eq +
964972
::core::marker::Copy> ::core::cmp::Eq for PackedGeneric<T, U> where
965973
T::A: ::core::cmp::Eq + ::core::marker::Copy {
974+
#[inline]
966975
#[doc(hidden)]
967976
#[coverage(off)]
968977
fn assert_fields_are_eq(&self) {
@@ -1047,6 +1056,7 @@ impl ::core::cmp::PartialEq for Enum0 {
10471056
}
10481057
#[automatically_derived]
10491058
impl ::core::cmp::Eq for Enum0 {
1059+
#[inline]
10501060
#[doc(hidden)]
10511061
#[coverage(off)]
10521062
fn assert_fields_are_eq(&self) {}
@@ -1116,6 +1126,7 @@ impl ::core::cmp::PartialEq for Enum1 {
11161126
}
11171127
#[automatically_derived]
11181128
impl ::core::cmp::Eq for Enum1 {
1129+
#[inline]
11191130
#[doc(hidden)]
11201131
#[coverage(off)]
11211132
fn assert_fields_are_eq(&self) {
@@ -1181,6 +1192,7 @@ impl ::core::cmp::PartialEq for Fieldless1 {
11811192
}
11821193
#[automatically_derived]
11831194
impl ::core::cmp::Eq for Fieldless1 {
1195+
#[inline]
11841196
#[doc(hidden)]
11851197
#[coverage(off)]
11861198
fn assert_fields_are_eq(&self) {}
@@ -1257,6 +1269,7 @@ impl ::core::cmp::PartialEq for Fieldless {
12571269
}
12581270
#[automatically_derived]
12591271
impl ::core::cmp::Eq for Fieldless {
1272+
#[inline]
12601273
#[doc(hidden)]
12611274
#[coverage(off)]
12621275
fn assert_fields_are_eq(&self) {}
@@ -1366,6 +1379,7 @@ impl ::core::cmp::PartialEq for Mixed {
13661379
}
13671380
#[automatically_derived]
13681381
impl ::core::cmp::Eq for Mixed {
1382+
#[inline]
13691383
#[doc(hidden)]
13701384
#[coverage(off)]
13711385
fn assert_fields_are_eq(&self) {
@@ -1563,6 +1577,7 @@ impl ::core::cmp::PartialEq for Fielded {
15631577
}
15641578
#[automatically_derived]
15651579
impl ::core::cmp::Eq for Fielded {
1580+
#[inline]
15661581
#[doc(hidden)]
15671582
#[coverage(off)]
15681583
fn assert_fields_are_eq(&self) {
@@ -1684,6 +1699,7 @@ impl<T: ::core::cmp::PartialEq, U: ::core::cmp::PartialEq>
16841699
#[automatically_derived]
16851700
impl<T: ::core::cmp::Eq, U: ::core::cmp::Eq> ::core::cmp::Eq for
16861701
EnumGeneric<T, U> {
1702+
#[inline]
16871703
#[doc(hidden)]
16881704
#[coverage(off)]
16891705
fn assert_fields_are_eq(&self) {

tests/ui/stats/macro-stats.stderr

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ macro-stats #[derive(Hash)] 2 17 8.5
88
macro-stats q! 1 26 26.0 519 519.0
99
macro-stats #[derive(Ord)] 1 15 15.0 503 503.0
1010
macro-stats #[derive(Default)] 2 16 8.0 403 201.5
11-
macro-stats #[derive(Eq)] 1 10 10.0 298 298.0
11+
macro-stats #[derive(Eq)] 1 11 11.0 312 312.0
1212
macro-stats #[derive(Debug)] 1 8 8.0 277 277.0
1313
macro-stats #[derive(PartialEq)] 1 9 9.0 267 267.0
1414
macro-stats #[derive(Copy)] 1 2 2.0 61 61.0

0 commit comments

Comments
 (0)