Skip to content

Commit 180202f

Browse files
committed
libcore: Fix core test
1 parent 0c6e470 commit 180202f

File tree

3 files changed

+27
-17
lines changed

3 files changed

+27
-17
lines changed

src/libcore/cmp.rs

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,14 +16,17 @@ trait Eq {
1616
pure fn eq(&&other: self) -> bool;
1717
}
1818

19+
#[cfg(notest)]
1920
pure fn lt<T: Ord>(v1: &T, v2: &T) -> bool {
2021
v1.lt(*v2)
2122
}
2223

24+
#[cfg(notest)]
2325
pure fn le<T: Ord Eq>(v1: &T, v2: &T) -> bool {
2426
v1.lt(*v2) || v1.eq(*v2)
2527
}
2628

29+
#[cfg(notest)]
2730
pure fn eq<T: Eq>(v1: &T, v2: &T) -> bool {
2831
v1.eq(*v2)
2932
}

src/libcore/int-template.rs

Lines changed: 12 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
11
import T = inst::T;
2-
import cmp::{Eq, Ord};
32
import num::from_int;
43

54
export min_value, max_value;
@@ -63,19 +62,23 @@ pure fn abs(i: T) -> T {
6362
if is_negative(i) { -i } else { i }
6463
}
6564

66-
impl T: Ord {
67-
pure fn lt(&&other: T) -> bool {
68-
return self < other;
65+
#[cfg(notest)]
66+
mod impls {
67+
import cmp::{Eq, Ord};
68+
69+
impl T: Ord {
70+
pure fn lt(&&other: T) -> bool {
71+
return self < other;
72+
}
6973
}
70-
}
7174

72-
impl T: Eq {
73-
pure fn eq(&&other: T) -> bool {
74-
return self == other;
75+
impl T: Eq {
76+
pure fn eq(&&other: T) -> bool {
77+
return self == other;
78+
}
7579
}
7680
}
7781

78-
7982
impl T: num::Num {
8083
pure fn add(&&other: T) -> T { return self + other; }
8184
pure fn sub(&&other: T) -> T { return self - other; }

src/libcore/uint-template.rs

Lines changed: 12 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
11
import T = inst::T;
2-
import cmp::{Eq, Ord};
32

43
export min_value, max_value;
54
export min, max;
@@ -56,15 +55,20 @@ pure fn compl(i: T) -> T {
5655
max_value ^ i
5756
}
5857

59-
impl T: Ord {
60-
pure fn lt(&&other: T) -> bool {
61-
return self < other;
58+
#[cfg(notest)]
59+
mod impls {
60+
import cmp::{Eq, Ord};
61+
62+
impl T: Ord {
63+
pure fn lt(&&other: T) -> bool {
64+
return self < other;
65+
}
6266
}
63-
}
6467

65-
impl T: Eq {
66-
pure fn eq(&&other: T) -> bool {
67-
return self == other;
68+
impl T: Eq {
69+
pure fn eq(&&other: T) -> bool {
70+
return self == other;
71+
}
6872
}
6973
}
7074

0 commit comments

Comments
 (0)