Merge branch 'master' into cleanup-stream

src/stream/from_fn.rs

@@ -28,6 +28,7 @@ impl<F> Unpin for FromFn<F> {}
 /// #
 /// use async_std::prelude::*;
 /// use async_std::stream;
+/// use async_std::sync::{Arc, Mutex};
 ///
 /// let mut count = 0u8;
 /// let s = stream::from_fn(|| {

src/sync/mod.rs

@@ -155,9 +155,7 @@
 //! ```
 //! # async_std::task::block_on(async {
 //! #
-//! use std::sync::Arc;
+//! use async_std::sync::{Arc, Mutex};
-//!
-//! use async_std::sync::Mutex;
 //! use async_std::task;
 //!
 //! let m1 = Arc::new(Mutex::new(0));

src/sync/mutex.rs

@@ -19,9 +19,7 @@ use crate::task::{Context, Poll};
 /// ```
 /// # async_std::task::block_on(async {
 /// #
-/// use std::sync::Arc;
+/// use async_std::sync::{Arc, Mutex};
-///
-/// use async_std::sync::Mutex;
 /// use async_std::task;
 ///
 /// let m = Arc::new(Mutex::new(0));
@@ -77,9 +75,7 @@ impl<T> Mutex<T> {
     /// ```
     /// # async_std::task::block_on(async {
     /// #
-    /// use std::sync::Arc;
+    /// use async_std::sync::{Arc, Mutex};
-    ///
-    /// use async_std::sync::Mutex;
     /// use async_std::task;
     ///
     /// let m1 = Arc::new(Mutex::new(10));
@@ -155,9 +151,7 @@ impl<T> Mutex<T> {
     /// ```
     /// # async_std::task::block_on(async {
     /// #
-    /// use std::sync::Arc;
+    /// use async_std::sync::{Arc, Mutex};
-    ///
-    /// use async_std::sync::Mutex;
     /// use async_std::task;
     ///
     /// let m1 = Arc::new(Mutex::new(10));