Skip to content

Commit 5092946

Browse files
authored
Rollup merge of #95805 - c410-f3r:meta-vars, r=petrochenkov
Left overs of #95761 These are just nits. Feel free to close this PR if all modifications are not worth merging. * `#![feature(decl_macro)]` is not needed anymore in `rustc_expand` * `tuple_impls` does not require `$Tuple:ident`. I guess it is there to enhance readability? r? ```@petrochenkov```
2 parents 198a154 + e946aa3 commit 5092946

File tree

2 files changed

+13
-14
lines changed

2 files changed

+13
-14
lines changed

compiler/rustc_expand/src/lib.rs

-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@
22
#![feature(associated_type_bounds)]
33
#![feature(associated_type_defaults)]
44
#![feature(crate_visibility_modifier)]
5-
#![feature(decl_macro)]
65
#![feature(if_let_guard)]
76
#![feature(let_chains)]
87
#![feature(let_else)]

library/core/src/tuple.rs

+13-13
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ use crate::cmp::*;
55

66
// macro for implementing n-ary tuple functions and operations
77
macro_rules! tuple_impls {
8-
( $( $Tuple:ident( $( $T:ident )+ ) )+ ) => {
8+
( $( ( $( $T:ident )+ ) )+ ) => {
99
$(
1010
#[stable(feature = "rust1", since = "1.0.0")]
1111
impl<$($T:PartialEq),+> PartialEq for ($($T,)+) where last_type!($($T,)+): ?Sized {
@@ -106,16 +106,16 @@ macro_rules! last_type {
106106
}
107107

108108
tuple_impls! {
109-
Tuple1(A)
110-
Tuple2(A B)
111-
Tuple3(A B C)
112-
Tuple4(A B C D)
113-
Tuple5(A B C D E)
114-
Tuple6(A B C D E F)
115-
Tuple7(A B C D E F G)
116-
Tuple8(A B C D E F G H)
117-
Tuple9(A B C D E F G H I)
118-
Tuple10(A B C D E F G H I J)
119-
Tuple11(A B C D E F G H I J K)
120-
Tuple12(A B C D E F G H I J K L)
109+
(A)
110+
(A B)
111+
(A B C)
112+
(A B C D)
113+
(A B C D E)
114+
(A B C D E F)
115+
(A B C D E F G)
116+
(A B C D E F G H)
117+
(A B C D E F G H I)
118+
(A B C D E F G H I J)
119+
(A B C D E F G H I J K)
120+
(A B C D E F G H I J K L)
121121
}

0 commit comments

Comments
 (0)