diff options
| author | bors <bors@rust-lang.org> | 2013-05-08 18:15:41 -0700 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2013-05-08 18:15:41 -0700 |
| commit | 3bbbb314ee61aa00deb3e9756421fd2465fd7a91 (patch) | |
| tree | 73a6df9c48dba9bb72825306b74d7aff41b435ce /src/libcore/tuple.rs | |
| parent | d82d9874a6f88e0afa021796e9efaba5b3670c31 (diff) | |
| parent | cb66d8948a9375e7be65296d19586166157ec667 (diff) | |
| download | rust-3bbbb314ee61aa00deb3e9756421fd2465fd7a91.tar.gz rust-3bbbb314ee61aa00deb3e9756421fd2465fd7a91.zip | |
auto merge of #6327 : z0w0/rust/rm-notest, r=brson
Makes it more consistent, imo.
Diffstat (limited to 'src/libcore/tuple.rs')
| -rw-r--r-- | src/libcore/tuple.rs | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/src/libcore/tuple.rs b/src/libcore/tuple.rs index 6da22657906..b29a4e55426 100644 --- a/src/libcore/tuple.rs +++ b/src/libcore/tuple.rs @@ -14,7 +14,7 @@ use clone::Clone; use kinds::Copy; use vec; -#[cfg(notest)] use cmp::{Eq, Ord}; +#[cfg(not(test))] use cmp::{Eq, Ord}; pub trait CopyableTuple<T, U> { fn first(&self) -> T; @@ -122,7 +122,7 @@ impl<A:Copy,B:Copy> ExtendedTupleOps<A,B> for (~[A], ~[B]) { } } -#[cfg(notest)] +#[cfg(not(test))] impl<A:Eq> Eq for (A,) { #[inline(always)] fn eq(&self, other: &(A,)) -> bool { @@ -138,7 +138,7 @@ impl<A:Eq> Eq for (A,) { fn ne(&self, other: &(A,)) -> bool { !(*self).eq(other) } } -#[cfg(notest)] +#[cfg(not(test))] impl<A:Ord> Ord for (A,) { #[inline(always)] fn lt(&self, other: &(A,)) -> bool { @@ -161,7 +161,7 @@ impl<A:Ord> Ord for (A,) { fn gt(&self, other: &(A,)) -> bool { other.lt(&(*self)) } } -#[cfg(notest)] +#[cfg(not(test))] impl<A:Eq,B:Eq> Eq for (A, B) { #[inline(always)] fn eq(&self, other: &(A, B)) -> bool { @@ -177,7 +177,7 @@ impl<A:Eq,B:Eq> Eq for (A, B) { fn ne(&self, other: &(A, B)) -> bool { !(*self).eq(other) } } -#[cfg(notest)] +#[cfg(not(test))] impl<A:Ord,B:Ord> Ord for (A, B) { #[inline(always)] fn lt(&self, other: &(A, B)) -> bool { @@ -202,7 +202,7 @@ impl<A:Ord,B:Ord> Ord for (A, B) { fn gt(&self, other: &(A, B)) -> bool { (*other).lt(&(*self)) } } -#[cfg(notest)] +#[cfg(not(test))] impl<A:Eq,B:Eq,C:Eq> Eq for (A, B, C) { #[inline(always)] fn eq(&self, other: &(A, B, C)) -> bool { @@ -219,7 +219,7 @@ impl<A:Eq,B:Eq,C:Eq> Eq for (A, B, C) { fn ne(&self, other: &(A, B, C)) -> bool { !(*self).eq(other) } } -#[cfg(notest)] +#[cfg(not(test))] impl<A:Ord,B:Ord,C:Ord> Ord for (A, B, C) { #[inline(always)] fn lt(&self, other: &(A, B, C)) -> bool { |
