qinheping
diff --git a/‎std/src/lib.rs‎
Lines changed: 3 additions & 1 deletion b/‎std/src/lib.rs‎
Lines changed: 3 additions & 1 deletion
diff --git a/‎std/src/sync/mod.rs‎
Lines changed: 8 additions & 1 deletion b/‎std/src/sync/mod.rs‎
Lines changed: 8 additions & 1 deletion
diff --git a/‎std/src/sync/mpmc/error.rs‎
Lines changed: 5 additions & 0 deletions b/‎std/src/sync/mpmc/error.rs‎
Lines changed: 5 additions & 0 deletions
@@ -153,7 +153,7 @@
 //! the [`io`], [`fs`], and [`net`] modules.
 //!
 //! The [`thread`] module contains Rust's threading abstractions. [`sync`]
-//! contains further primitive shared memory types, including [`atomic`] and
+//! contains further primitive shared memory types, including [`atomic`], [`mpmc`] and
 //! [`mpsc`], which contains the channel types for message passing.
 //!
 //! # Use before and after `main()`
@@ -177,6 +177,7 @@
 //! - after-main use of thread-locals, which also affects additional features:
 //!   - [`thread::current()`]
 //!   - [`thread::scope()`]
+//!   - [`sync::mpmc`]
 //!   - [`sync::mpsc`]
 //! - before-main stdio file descriptors are not guaranteed to be open on unix platforms
 //!
@@ -202,6 +203,7 @@
 //! [`atomic`]: sync::atomic
 //! [`for`]: ../book/ch03-05-control-flow.html#looping-through-a-collection-with-for
 //! [`str`]: prim@str
+//! [`mpmc`]: sync::mpmc
 //! [`mpsc`]: sync::mpsc
 //! [`std::cmp`]: cmp
 //! [`std::slice`]: mod@slice
 
@@ -133,6 +133,11 @@
 //!   inter-thread synchronisation mechanism, at the cost of some
 //!   extra memory.
 //!
+//! - [`mpmc`]: Multi-producer, multi-consumer queues, used for
+//!   message-based communication. Can provide a lightweight
+//!   inter-thread synchronisation mechanism, at the cost of some
+//!   extra memory.
+//!
 //! - [`Mutex`]: Mutual Exclusion mechanism, which ensures that at
 //!   most one thread at a time is able to access some data.
 //!
@@ -153,6 +158,7 @@
 //! [`Arc`]: crate::sync::Arc
 //! [`Barrier`]: crate::sync::Barrier
 //! [`Condvar`]: crate::sync::Condvar
+//! [`mpmc`]: crate::sync::mpmc
 //! [`mpsc`]: crate::sync::mpsc
 //! [`Mutex`]: crate::sync::Mutex
 //! [`Once`]: crate::sync::Once
@@ -193,12 +199,13 @@ pub use self::rwlock::{MappedRwLockReadGuard, MappedRwLockWriteGuard};
 #[stable(feature = "rust1", since = "1.0.0")]
 pub use self::rwlock::{RwLock, RwLockReadGuard, RwLockWriteGuard};
 
+#[unstable(feature = "mpmc_channel", issue = "126840")]
+pub mod mpmc;
 pub mod mpsc;
 
 mod barrier;
 mod condvar;
 mod lazy_lock;
-mod mpmc;
 mod mutex;
 pub(crate) mod once;
 mod once_lock;
 
@@ -7,6 +7,7 @@ use crate::{error, fmt};
 ///
 /// [`send_timeout`]: super::Sender::send_timeout
 #[derive(PartialEq, Eq, Clone, Copy)]
+#[unstable(feature = "mpmc_channel", issue = "126840")]
 pub enum SendTimeoutError<T> {
     /// The message could not be sent because the channel is full and the operation timed out.
     ///
@@ -18,12 +19,14 @@ pub enum SendTimeoutError<T> {
     Disconnected(T),
 }
 
+#[unstable(feature = "mpmc_channel", issue = "126840")]
 impl<T> fmt::Debug for SendTimeoutError<T> {
     fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
         "SendTimeoutError(..)".fmt(f)
     }
 }
 
+#[unstable(feature = "mpmc_channel", issue = "126840")]
 impl<T> fmt::Display for SendTimeoutError<T> {
     fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
         match *self {
@@ -33,8 +36,10 @@ impl<T> fmt::Display for SendTimeoutError<T> {
     }
 }
 
+#[unstable(feature = "mpmc_channel", issue = "126840")]
 impl<T> error::Error for SendTimeoutError<T> {}
 
+#[unstable(feature = "mpmc_channel", issue = "126840")]
 impl<T> From<SendError<T>> for SendTimeoutError<T> {
     fn from(err: SendError<T>) -> SendTimeoutError<T> {
         match err {
Original file line number	Diff line number	Diff line change
`@@ -7,6 +7,7 @@ use crate::{error, fmt};`
`7`	`7`	`///`
`8`	`8`	/// [`send_timeout`]: super::Sender::send_timeout
`9`	`9`	`#[derive(PartialEq, Eq, Clone, Copy)]`
	`10`	`+#[unstable(feature = "mpmc_channel", issue = "126840")]`
`10`	`11`	`pub enum SendTimeoutError<T> {`
`11`	`12`	`/// The message could not be sent because the channel is full and the operation timed out.`
`12`	`13`	`///`
`@@ -18,12 +19,14 @@ pub enum SendTimeoutError<T> {`
`18`	`19`	`Disconnected(T),`
`19`	`20`	`}`
`20`	`21`
	`22`	`+#[unstable(feature = "mpmc_channel", issue = "126840")]`
`21`	`23`	`impl<T> fmt::Debug for SendTimeoutError<T> {`
`22`	`24`	`fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {`
`23`	`25`	`"SendTimeoutError(..)".fmt(f)`
`24`	`26`	`}`
`25`	`27`	`}`
`26`	`28`
	`29`	`+#[unstable(feature = "mpmc_channel", issue = "126840")]`
`27`	`30`	`impl<T> fmt::Display for SendTimeoutError<T> {`
`28`	`31`	`fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {`
`29`	`32`	`match *self {`
`@@ -33,8 +36,10 @@ impl<T> fmt::Display for SendTimeoutError<T> {`
`33`	`36`	`}`
`34`	`37`	`}`
`35`	`38`
	`39`	`+#[unstable(feature = "mpmc_channel", issue = "126840")]`
`36`	`40`	`impl<T> error::Error for SendTimeoutError<T> {}`
`37`	`41`
	`42`	`+#[unstable(feature = "mpmc_channel", issue = "126840")]`
`38`	`43`	`impl<T> From<SendError<T>> for SendTimeoutError<T> {`
`39`	`44`	`fn from(err: SendError<T>) -> SendTimeoutError<T> {`
`40`	`45`	`match err {`