Skip to content

Commit ea02f87

Browse files
authored
Auto merge of #37735 - Mark-Simulacrum:remove-e-macro, r=bluss
Remove macro work-around `--stage 2` build succeeded.
2 parents b6b98ea + 8a06740 commit ea02f87

File tree

1 file changed

+3
-8
lines changed

1 file changed

+3
-8
lines changed

src/libcore/tuple.rs

+3-8
Original file line numberDiff line numberDiff line change
@@ -13,11 +13,6 @@
1313
use cmp::*;
1414
use cmp::Ordering::*;
1515

16-
// FIXME(#19630) Remove this work-around
17-
macro_rules! e {
18-
($e:expr) => { $e }
19-
}
20-
2116
// macro for implementing n-ary tuple functions and operations
2217
macro_rules! tuple_impls {
2318
($(
@@ -29,19 +24,19 @@ macro_rules! tuple_impls {
2924
#[stable(feature = "rust1", since = "1.0.0")]
3025
impl<$($T:Clone),+> Clone for ($($T,)+) {
3126
fn clone(&self) -> ($($T,)+) {
32-
($(e!(self.$idx.clone()),)+)
27+
($(self.$idx.clone(),)+)
3328
}
3429
}
3530

3631
#[stable(feature = "rust1", since = "1.0.0")]
3732
impl<$($T:PartialEq),+> PartialEq for ($($T,)+) {
3833
#[inline]
3934
fn eq(&self, other: &($($T,)+)) -> bool {
40-
e!($(self.$idx == other.$idx)&&+)
35+
$(self.$idx == other.$idx)&&+
4136
}
4237
#[inline]
4338
fn ne(&self, other: &($($T,)+)) -> bool {
44-
e!($(self.$idx != other.$idx)||+)
39+
$(self.$idx != other.$idx)||+
4540
}
4641
}
4742

0 commit comments

Comments
 (0)