bjoernager/rust
bjoernager/rust
1
Fork 0
Code Activity

Auto merge of #37735 - Mark-Simulacrum:remove-e-macro, r=bluss

Browse source 
Remove macro work-around

`--stage 2` build succeeded.
This commit is contained in:
bors 2016-11-13 05:22:09 -08:00 • committed by GitHub
commit ea02f87daa
1 changed files with 3 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

11
src/libcore/tuple.rs
View file

@ -13,11 +13,6 @@
use cmp::*; use cmp::*;
use cmp::Ordering::*; use cmp::Ordering::*;
// FIXME(#19630) Remove this work-around
macro_rules! e {
($e:expr) => { $e }
}
// macro for implementing n-ary tuple functions and operations // macro for implementing n-ary tuple functions and operations
macro_rules! tuple_impls { macro_rules! tuple_impls {
($( ($(
@ -29,7 +24,7 @@ macro_rules! tuple_impls {
#[stable(feature = "rust1", since = "1.0.0")] #[stable(feature = "rust1", since = "1.0.0")]
impl<$($T:Clone),+> Clone for ($($T,)+) { impl<$($T:Clone),+> Clone for ($($T,)+) {
fn clone(&self) -> ($($T,)+) { fn clone(&self) -> ($($T,)+) {
($(e!(self.$idx.clone()),)+) ($(self.$idx.clone(),)+)
} }
} }
@ -37,11 +32,11 @@ macro_rules! tuple_impls {
impl<$($T:PartialEq),+> PartialEq for ($($T,)+) { impl<$($T:PartialEq),+> PartialEq for ($($T,)+) {
#[inline] #[inline]
fn eq(&self, other: &($($T,)+)) -> bool { fn eq(&self, other: &($($T,)+)) -> bool {
e!($(self.$idx == other.$idx)&&+) $(self.$idx == other.$idx)&&+
} }
#[inline] #[inline]
fn ne(&self, other: &($($T,)+)) -> bool { fn ne(&self, other: &($($T,)+)) -> bool {
e!($(self.$idx != other.$idx)||+) $(self.$idx != other.$idx)||+
} }
} }