bjoernager/rust
bjoernager/rust
1
Fork 0
Code Activity

Change std::kinds to std::markers; flatten std::kinds::marker

Browse source 
[breaking-change]
This commit is contained in:
Nick Cameron 2015-01-06 14:03:46 +13:00
parent 6539cb417f
commit 503709708c
154 changed files with 635 additions and 623 deletions
Download patch file Download diff file Expand all files Collapse all files

11
src/libstd/lib.rs
View file

@ -18,7 +18,7 @@
//!
//! The [`ptr`](ptr/index.html) and [`mem`](mem/index.html)
//! modules deal with unsafe pointers and memory manipulation.
//! [`kinds`](kinds/index.html) defines the special built-in traits,
//! [`markers`](markers/index.html) defines the special built-in traits,
//! and [`raw`](raw/index.html) the runtime representation of Rust types.
//! These are some of the lowest-level building blocks in Rust.
//!
@ -151,7 +151,7 @@ extern crate libc;
// Make std testable by not duplicating lang items. See #2912
#[cfg(test)] extern crate "std" as realstd;
#[cfg(test)] pub use realstd::kinds;
#[cfg(test)] pub use realstd::markers;
#[cfg(test)] pub use realstd::ops;
#[cfg(test)] pub use realstd::cmp;
#[cfg(test)] pub use realstd::boxed;
@ -168,7 +168,8 @@ pub use core::default;
pub use core::finally;
pub use core::intrinsics;
pub use core::iter;
#[cfg(not(test))] pub use core::kinds;
#[cfg(stage0)] #[cfg(not(test))] pub use core::markers as kinds;
#[cfg(not(test))] pub use core::markers;
pub use core::mem;
#[cfg(not(test))] pub use core::ops;
pub use core::ptr;
@ -311,7 +312,9 @@ mod std {
pub use vec; // used for vec![]
pub use cell; // used for tls!
pub use thread_local; // used for thread_local!
pub use kinds; // used for tls!
#[cfg(stage0)]
pub use markers as kinds;
pub use markers; // used for tls!
pub use ops; // used for bitflags!
// The test runner calls ::std::os::args() but really wants realstd