Skip to content

Commit 3eb7b5c

Browse files
committed
De-export ops, cmp, num. Part of #3583.
1 parent 0792ebe commit 3eb7b5c

File tree

4 files changed

+17
-22
lines changed

4 files changed

+17
-22
lines changed

src/libcore/cmp.rs

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,8 +17,6 @@ and `Eq` to overload the `==` and `!=` operators.
1717
pub use nounittest::*;
1818
pub use unittest::*;
1919

20-
export Ord, Eq;
21-
2220
/// Interfaces used for comparison.
2321
2422
// Awful hack to work around duplicate lang items in core test.

src/libcore/core.rc

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -206,11 +206,8 @@ mod uniq;
206206
// Ubiquitous-utility-type modules
207207

208208
#[cfg(notest)]
209-
#[legacy_exports]
210209
mod ops;
211-
#[legacy_exports]
212210
mod cmp;
213-
#[legacy_exports]
214211
mod num;
215212
#[legacy_exports]
216213
mod hash;

src/libcore/num.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
//! An interface for numeric types
22
3-
trait Num {
3+
pub trait Num {
44
// FIXME: Trait composition. (#2616)
55
pure fn add(other: &self) -> self;
66
pure fn sub(other: &self) -> self;

src/libcore/ops.rs

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -1,82 +1,82 @@
11
// Core operators and kinds.
22

33
#[lang="const"]
4-
trait Const {
4+
pub trait Const {
55
// Empty.
66
}
77

88
#[lang="copy"]
9-
trait Copy {
9+
pub trait Copy {
1010
// Empty.
1111
}
1212

1313
#[lang="send"]
14-
trait Send {
14+
pub trait Send {
1515
// Empty.
1616
}
1717

1818
#[lang="owned"]
19-
trait Owned {
19+
pub trait Owned {
2020
// Empty.
2121
}
2222

2323
#[lang="add"]
24-
trait Add<RHS,Result> {
24+
pub trait Add<RHS,Result> {
2525
pure fn add(rhs: &RHS) -> Result;
2626
}
2727

2828
#[lang="sub"]
29-
trait Sub<RHS,Result> {
29+
pub trait Sub<RHS,Result> {
3030
pure fn sub(rhs: &RHS) -> Result;
3131
}
3232

3333
#[lang="mul"]
34-
trait Mul<RHS,Result> {
34+
pub trait Mul<RHS,Result> {
3535
pure fn mul(rhs: &RHS) -> Result;
3636
}
3737

3838
#[lang="div"]
39-
trait Div<RHS,Result> {
39+
pub trait Div<RHS,Result> {
4040
pure fn div(rhs: &RHS) -> Result;
4141
}
4242

4343
#[lang="modulo"]
44-
trait Modulo<RHS,Result> {
44+
pub trait Modulo<RHS,Result> {
4545
pure fn modulo(rhs: &RHS) -> Result;
4646
}
4747

4848
#[lang="neg"]
49-
trait Neg<Result> {
49+
pub trait Neg<Result> {
5050
pure fn neg() -> Result;
5151
}
5252

5353
#[lang="bitand"]
54-
trait BitAnd<RHS,Result> {
54+
pub trait BitAnd<RHS,Result> {
5555
pure fn bitand(rhs: &RHS) -> Result;
5656
}
5757

5858
#[lang="bitor"]
59-
trait BitOr<RHS,Result> {
59+
pub trait BitOr<RHS,Result> {
6060
pure fn bitor(rhs: &RHS) -> Result;
6161
}
6262

6363
#[lang="bitxor"]
64-
trait BitXor<RHS,Result> {
64+
pub trait BitXor<RHS,Result> {
6565
pure fn bitxor(rhs: &RHS) -> Result;
6666
}
6767

6868
#[lang="shl"]
69-
trait Shl<RHS,Result> {
69+
pub trait Shl<RHS,Result> {
7070
pure fn shl(rhs: &RHS) -> Result;
7171
}
7272

7373
#[lang="shr"]
74-
trait Shr<RHS,Result> {
74+
pub trait Shr<RHS,Result> {
7575
pure fn shr(rhs: &RHS) -> Result;
7676
}
7777

7878
#[lang="index"]
79-
trait Index<Index,Result> {
79+
pub trait Index<Index,Result> {
8080
pure fn index(+index: Index) -> Result;
8181
}
8282

0 commit comments

Comments
 (0)