about summary refs log tree commit diff
diff options
context:
space:
mode:
authorSimon Sapin <simon.sapin@exyr.org>2018-04-02 10:38:07 +0200
committerSimon Sapin <simon.sapin@exyr.org>2018-04-12 22:52:47 +0200
commit1569f8f812c97002fa54dd6a5778109766a320e1 (patch)
treeb168996afb8bcee053dd2add55f423f5b06ac7bf
parent6c537493d01694cc6e0a614dff12c475055aa2b4 (diff)
downloadrust-1569f8f812c97002fa54dd6a5778109766a320e1.tar.gz
rust-1569f8f812c97002fa54dd6a5778109766a320e1.zip
Inline docs for the heap module’s reexports
-rw-r--r--src/liballoc/heap.rs2
-rw-r--r--src/libstd/heap.rs2
2 files changed, 3 insertions, 1 deletions
diff --git a/src/liballoc/heap.rs b/src/liballoc/heap.rs
index 9296a113071..000c0123d9f 100644
--- a/src/liballoc/heap.rs
+++ b/src/liballoc/heap.rs
@@ -19,7 +19,9 @@ use core::intrinsics::{min_align_of_val, size_of_val};
 use core::mem::{self, ManuallyDrop};
 use core::usize;
 
+#[doc(inline)]
 pub use core::heap::*;
+
 #[doc(hidden)]
 pub mod __core {
     pub use core::*;
diff --git a/src/libstd/heap.rs b/src/libstd/heap.rs
index 4a391372c3a..2cf06018087 100644
--- a/src/libstd/heap.rs
+++ b/src/libstd/heap.rs
@@ -14,7 +14,7 @@
 
 pub use alloc::heap::Heap;
 pub use alloc_system::System;
-pub use core::heap::*;
+#[doc(inline)] pub use core::heap::*;
 
 #[cfg(not(test))]
 #[doc(hidden)]