diff options
| author | bors <bors@rust-lang.org> | 2014-05-20 13:21:18 -0700 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2014-05-20 13:21:18 -0700 |
| commit | 4dff9cbf58bb7a274a693eb7d19006402945fc7e (patch) | |
| tree | c8eefbda7bfb2a21f240a3ba4ab9e3ffc7e57898 /src/libstd | |
| parent | f9bd6b4e3900da77f06ebad04ae6bada1e26e042 (diff) | |
| parent | c9ab33a8fde708c8a4cf70b03f5d69370220665c (diff) | |
| download | rust-4dff9cbf58bb7a274a693eb7d19006402945fc7e.tar.gz rust-4dff9cbf58bb7a274a693eb7d19006402945fc7e.zip | |
auto merge of #14304 : brson/rust/moredocs, r=kballard
Includes module docs for `cell`.
Diffstat (limited to 'src/libstd')
| -rw-r--r-- | src/libstd/lib.rs | 15 |
1 files changed, 8 insertions, 7 deletions
diff --git a/src/libstd/lib.rs b/src/libstd/lib.rs index a45f8a83a24..a9ec9c1ddc5 100644 --- a/src/libstd/lib.rs +++ b/src/libstd/lib.rs @@ -16,9 +16,8 @@ //! //! ## Intrinsic types and operations //! -//! The [`ptr`](../core/ptr/index.html), [`mem`](../core/mem/index.html), -//! and [`cast`](../core/cast/index.html) modules deal with unsafe pointers, -//! memory manipulation, and coercion. +//! The [`ptr`](../core/ptr/index.html) and [`mem`](../core/mem/index.html) +//! modules deal with unsafe pointers and memory manipulation. //! [`kinds`](../core/kinds/index.html) defines the special built-in traits, //! and [`raw`](../core/raw/index.html) the runtime representation of Rust types. //! These are some of the lowest-level building blocks of Rust @@ -135,24 +134,26 @@ extern crate libc; #[cfg(test)] pub use realstd::cmp; #[cfg(test)] pub use realstd::ty; -#[cfg(not(test))] pub use core::cmp; -#[cfg(not(test))] pub use core::kinds; -#[cfg(not(test))] pub use core::ops; -#[cfg(not(test))] pub use core::ty; + +// NB: These reexports are in the order they should be listed in rustdoc pub use core::any; pub use core::bool; pub use core::cell; pub use core::char; pub use core::clone; +#[cfg(not(test))] pub use core::cmp; pub use core::container; pub use core::default; pub use core::intrinsics; pub use core::iter; +#[cfg(not(test))] pub use core::kinds; pub use core::mem; +#[cfg(not(test))] pub use core::ops; pub use core::ptr; pub use core::raw; pub use core::tuple; +#[cfg(not(test))] pub use core::ty; pub use core::result; pub use alloc::owned; |
