diff options
| author | bors <bors@rust-lang.org> | 2014-07-04 03:06:19 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2014-07-04 03:06:19 +0000 |
| commit | d623a8bf3c530b900a69c059568079d5cbb4d6b8 (patch) | |
| tree | 9078faea458feb6ca1b2099a865002ce0e1d7b72 /src/libstd/lib.rs | |
| parent | 5b11610ced12e42f3de4d7f41fe47bbf07dd5af2 (diff) | |
| parent | 7c92735f08711cf15dd2dbdbd6119d49ae765807 (diff) | |
| download | rust-d623a8bf3c530b900a69c059568079d5cbb4d6b8.tar.gz rust-d623a8bf3c530b900a69c059568079d5cbb4d6b8.zip | |
auto merge of #15321 : huonw/rust/nil-prim, r=alexcrichton
This adds a primitive page for () like http://doc.rust-lang.org/master/std/uint/primitive.uint.html . I would prefer the modules to be `std::tuple::unit`, but rustdoc only searches at the top level (filed as #15320).
Diffstat (limited to 'src/libstd/lib.rs')
| -rw-r--r-- | src/libstd/lib.rs | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/src/libstd/lib.rs b/src/libstd/lib.rs index 145e812ff88..0e6f848fce8 100644 --- a/src/libstd/lib.rs +++ b/src/libstd/lib.rs @@ -160,6 +160,9 @@ pub use core::ptr; pub use core::raw; pub use core::simd; pub use core::tuple; +// FIXME #15320: primitive documentation needs top-level modules, this +// should be `std::tuple::unit`. +pub use core::unit; #[cfg(not(test))] pub use core::ty; pub use core::result; pub use core::option; |