diff options
| author | Alex Crichton <alex@alexcrichton.com> | 2014-04-30 20:24:32 -0700 |
|---|---|---|
| committer | Alex Crichton <alex@alexcrichton.com> | 2014-05-07 08:13:06 -0700 |
| commit | ead6e16a600526b6125ad482d5e17e1f900730ce (patch) | |
| tree | 66afae4efd86281c8e2c34d44f54738928711e55 | |
| parent | ec8a805b6dafc78e692b0a0f8de1a56c5f0dcc0f (diff) | |
| download | rust-ead6e16a600526b6125ad482d5e17e1f900730ce.tar.gz rust-ead6e16a600526b6125ad482d5e17e1f900730ce.zip | |
core: Inherit the ops module
| -rw-r--r-- | src/libcore/lib.rs | 1 | ||||
| -rw-r--r-- | src/libcore/ops.rs (renamed from src/libstd/ops.rs) | 0 | ||||
| -rw-r--r-- | src/libstd/lib.rs | 2 |
3 files changed, 2 insertions, 1 deletions
diff --git a/src/libcore/lib.rs b/src/libcore/lib.rs index 630f84f6579..42df97040f1 100644 --- a/src/libcore/lib.rs +++ b/src/libcore/lib.rs @@ -31,3 +31,4 @@ pub mod ptr; /* Core language traits */ pub mod kinds; +pub mod ops; diff --git a/src/libstd/ops.rs b/src/libcore/ops.rs index 4c31face2e3..4c31face2e3 100644 --- a/src/libstd/ops.rs +++ b/src/libcore/ops.rs diff --git a/src/libstd/lib.rs b/src/libstd/lib.rs index 350bb4bbaec..0ef623a558f 100644 --- a/src/libstd/lib.rs +++ b/src/libstd/lib.rs @@ -134,6 +134,7 @@ extern crate core; #[cfg(test)] pub use owned = realstd::owned; #[cfg(not(test))] pub use kinds = core::kinds; +#[cfg(not(test))] pub use ops = core::ops; pub use core::cast; pub use core::intrinsics; @@ -204,7 +205,6 @@ pub mod gc; /* Core language traits */ -#[cfg(not(test))] pub mod ops; #[cfg(not(test))] pub mod cmp; #[cfg(not(test))] pub mod ty; #[cfg(not(test))] pub mod owned; |