diff options
| author | Alex Crichton <alex@alexcrichton.com> | 2014-05-07 08:20:22 -0700 |
|---|---|---|
| committer | Alex Crichton <alex@alexcrichton.com> | 2014-05-07 11:03:12 -0700 |
| commit | 07caa224501817c93be3f5c57a013ed5db6c04e1 (patch) | |
| tree | 4a7df32c0c34f78282e842b308c2751f3d3cd5ee /src/libstd/lib.rs | |
| parent | a289ebefb8c3584d91484f0bb62f696dffadda02 (diff) | |
| download | rust-07caa224501817c93be3f5c57a013ed5db6c04e1.tar.gz rust-07caa224501817c93be3f5c57a013ed5db6c04e1.zip | |
Test fixes and rebase conflicts
Diffstat (limited to 'src/libstd/lib.rs')
| -rw-r--r-- | src/libstd/lib.rs | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/src/libstd/lib.rs b/src/libstd/lib.rs index abcc1f099b4..72d41ae1dd2 100644 --- a/src/libstd/lib.rs +++ b/src/libstd/lib.rs @@ -133,9 +133,10 @@ extern crate core; #[cfg(test)] pub use ty = realstd::ty; #[cfg(test)] pub use owned = realstd::owned; +#[cfg(not(test))] pub use cmp = core::cmp; #[cfg(not(test))] pub use kinds = core::kinds; #[cfg(not(test))] pub use ops = core::ops; -#[cfg(not(test))] pub use cmp = core::cmp; +#[cfg(not(test))] pub use owned = core::owned; #[cfg(not(test))] pub use ty = core::ty; pub use core::any; @@ -206,10 +207,6 @@ pub mod ascii; pub mod rc; pub mod gc; -/* Core language traits */ - -#[cfg(not(test))] pub mod owned; - /* Common traits */ pub mod from_str; |