about summary refs log tree commit diff
path: root/src/libstd/lib.rs
diff options
context:
space:
mode:
authorAlex Crichton <alex@alexcrichton.com>2014-12-21 00:04:08 -0800
committerAlex Crichton <alex@alexcrichton.com>2014-12-21 09:27:33 -0800
commitfc40812b0f7a07834b2ad557ec3d5a0e98e80f85 (patch)
treeb99f28c97d822711a4cb0220093a9da0bacaa731 /src/libstd/lib.rs
parent4ae3107e72b3ae06f2c1f987d6ccc6087c7097ce (diff)
parent1b42e890bf99d37a9e6447912c75c5b5e4695c4e (diff)
downloadrust-fc40812b0f7a07834b2ad557ec3d5a0e98e80f85.tar.gz
rust-fc40812b0f7a07834b2ad557ec3d5a0e98e80f85.zip
rollup merge of #20006: alexcrichton/no-more-empty-modules
This commit modifies rustdoc to not require these empty modules to be public in
the standard library. The modules still remain as a location to attach
documentation to, but the modules themselves are now private (don't have to
commit to an API). The documentation for the standard library now shows all of
the primitive types on the main index page.
Diffstat (limited to 'src/libstd/lib.rs')
-rw-r--r--src/libstd/lib.rs11
1 files changed, 6 insertions, 5 deletions
diff --git a/src/libstd/lib.rs b/src/libstd/lib.rs
index 7de3e1c961a..8274baeacfa 100644
--- a/src/libstd/lib.rs
+++ b/src/libstd/lib.rs
@@ -135,7 +135,6 @@ extern crate libc;
 // NB: These reexports are in the order they should be listed in rustdoc
 
 pub use core::any;
-pub use core::bool;
 pub use core::borrow;
 pub use core::cell;
 pub use core::clone;
@@ -150,10 +149,6 @@ pub use core::mem;
 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;
 pub use core::result;
 pub use core::option;
 
@@ -243,6 +238,12 @@ pub mod comm;
 pub mod rt;
 mod failure;
 
+// Documentation for primitive types
+
+mod bool;
+mod unit;
+mod tuple;
+
 // A curious inner-module that's not exported that contains the binding
 // 'std' so that macro-expanded references to std::error and such
 // can be resolved within libstd.