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/ptr.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/ptr.rs')
| -rw-r--r-- | src/libcore/ptr.rs | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/libcore/ptr.rs b/src/libcore/ptr.rs index 1a5ff39b305..77e4143d090 100644 --- a/src/libcore/ptr.rs +++ b/src/libcore/ptr.rs @@ -15,7 +15,7 @@ use libc; use libc::{c_void, size_t}; use sys; -#[cfg(notest)] use cmp::{Eq, Ord}; +#[cfg(not(test))] use cmp::{Eq, Ord}; use uint; pub mod libc_ { @@ -243,7 +243,7 @@ impl<T> Ptr<T> for *mut T { } // Equality for pointers -#[cfg(notest)] +#[cfg(not(test))] impl<T> Eq for *const T { #[inline(always)] fn eq(&self, other: &*const T) -> bool { @@ -258,7 +258,7 @@ impl<T> Eq for *const T { } // Comparison for pointers -#[cfg(notest)] +#[cfg(not(test))] impl<T> Ord for *const T { #[inline(always)] fn lt(&self, other: &*const T) -> bool { @@ -295,7 +295,7 @@ impl<T> Ord for *const T { } // Equality for region pointers -#[cfg(notest)] +#[cfg(not(test))] impl<'self,T:Eq> Eq for &'self T { #[inline(always)] fn eq(&self, other: & &'self T) -> bool { @@ -308,7 +308,7 @@ impl<'self,T:Eq> Eq for &'self T { } // Comparison for region pointers -#[cfg(notest)] +#[cfg(not(test))] impl<'self,T:Ord> Ord for &'self T { #[inline(always)] fn lt(&self, other: & &'self T) -> bool { |