Auto merge of rust-lang#51478 - crlf0710:patch-2, r=QuietMisdreavus

bors · bors · commit 0d763178e537 · 2018-06-11T13:24:00.000Z
Add #[doc(inline)] in std::task

Add #[doc(inline)] in `std::task` to make the nightly docs seem right.
diff --git a/src/libstd/lib.rs b/src/libstd/lib.rs
@@ -467,7 +467,9 @@ pub use core::hint;
            issue = "50547")]
 pub mod task {
     //! Types and Traits for working with asynchronous tasks.
+    #[doc(inline)]
     pub use core::task::*;
+    #[doc(inline)]
     pub use alloc_crate::task::*;
 }
 

Original file line number	Diff line number	Diff line change
`@@ -467,7 +467,9 @@ pub use core::hint;`
`467`	`467`	`issue = "50547")]`
`468`	`468`	`pub mod task {`
`469`	`469`	`//! Types and Traits for working with asynchronous tasks.`
	`470`	`+ #[doc(inline)]`
`470`	`471`	`pub use core::task::*;`
	`472`	`+ #[doc(inline)]`
`471`	`473`	`pub use alloc_crate::task::*;`
`472`	`474`	`}`
`473`	`475`