Skip to content

Commit 7e674be

Browse files
Rollup merge of rust-lang#118350 - DaniPopes:tuple-default, r=workingjubilee
Simplify Default for tuples Doesn't need a separate block for each element
2 parents 14bc0f2 + 9ae3213 commit 7e674be

File tree

1 file changed

+6
-9
lines changed

1 file changed

+6
-9
lines changed

library/core/src/tuple.rs

+6-9
Original file line numberDiff line numberDiff line change
@@ -50,22 +50,19 @@ macro_rules! tuple_impls {
5050
maybe_tuple_doc! {
5151
$($T)+ @
5252
#[unstable(feature = "structural_match", issue = "31434")]
53-
impl<$($T: ConstParamTy),+> ConstParamTy for ($($T,)+)
54-
{}
53+
impl<$($T: ConstParamTy),+> ConstParamTy for ($($T,)+) {}
5554
}
5655

5756
maybe_tuple_doc! {
5857
$($T)+ @
5958
#[unstable(feature = "structural_match", issue = "31434")]
60-
impl<$($T),+> StructuralPartialEq for ($($T,)+)
61-
{}
59+
impl<$($T),+> StructuralPartialEq for ($($T,)+) {}
6260
}
6361

6462
maybe_tuple_doc! {
6563
$($T)+ @
6664
#[unstable(feature = "structural_match", issue = "31434")]
67-
impl<$($T),+> StructuralEq for ($($T,)+)
68-
{}
65+
impl<$($T),+> StructuralEq for ($($T,)+) {}
6966
}
7067

7168
maybe_tuple_doc! {
@@ -118,7 +115,7 @@ macro_rules! tuple_impls {
118115
impl<$($T: Default),+> Default for ($($T,)+) {
119116
#[inline]
120117
fn default() -> ($($T,)+) {
121-
($({ let x: $T = Default::default(); x},)+)
118+
($($T::default(),)+)
122119
}
123120
}
124121
}
@@ -196,7 +193,7 @@ macro_rules! lexical_partial_cmp {
196193
($a:expr, $b:expr, $($rest_a:expr, $rest_b:expr),+) => {
197194
match ($a).partial_cmp(&$b) {
198195
Some(Equal) => lexical_partial_cmp!($($rest_a, $rest_b),+),
199-
ordering => ordering
196+
ordering => ordering
200197
}
201198
};
202199
($a:expr, $b:expr) => { ($a).partial_cmp(&$b) };
@@ -206,7 +203,7 @@ macro_rules! lexical_cmp {
206203
($a:expr, $b:expr, $($rest_a:expr, $rest_b:expr),+) => {
207204
match ($a).cmp(&$b) {
208205
Equal => lexical_cmp!($($rest_a, $rest_b),+),
209-
ordering => ordering
206+
ordering => ordering
210207
}
211208
};
212209
($a:expr, $b:expr) => { ($a).cmp(&$b) };

0 commit comments

Comments
 (0)