diff options
| author | Jonas Schievink <jonasschievink@gmail.com> | 2020-09-25 02:29:34 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-09-25 02:29:34 +0200 |
| commit | 452c86e3e118a940c1121e18491caf1a0c39271f (patch) | |
| tree | 39fd602656ee948c1193535dea4f8465295a12d3 | |
| parent | d766c239bdd7df8d3658c6b08b06e163b36c05bb (diff) | |
| parent | 16eee2a04a4c3a93d398728d7a0c05a8afb6ca94 (diff) | |
| download | rust-452c86e3e118a940c1121e18491caf1a0c39271f.tar.gz rust-452c86e3e118a940c1121e18491caf1a0c39271f.zip | |
Rollup merge of #76978 - duckymirror:mpsc-from-doc, r=jyn514
Documented From impls in std/sync/mpsc/mod.rs This is for #51430. r? @steveklabnik
| -rw-r--r-- | library/std/src/sync/mpsc/mod.rs | 15 |
1 files changed, 15 insertions, 0 deletions
diff --git a/library/std/src/sync/mpsc/mod.rs b/library/std/src/sync/mpsc/mod.rs index 073f969bbe2..dc13c9433f1 100644 --- a/library/std/src/sync/mpsc/mod.rs +++ b/library/std/src/sync/mpsc/mod.rs @@ -1531,6 +1531,11 @@ impl<T: Send> error::Error for TrySendError<T> { #[stable(feature = "mpsc_error_conversions", since = "1.24.0")] impl<T> From<SendError<T>> for TrySendError<T> { + /// Converts a `SendError<T>` into a `TrySendError<T>`. + /// + /// This conversion always returns a `TrySendError::Disconnected` containing the data in the `SendError<T>`. + /// + /// No data is allocated on the heap. fn from(err: SendError<T>) -> TrySendError<T> { match err { SendError(t) => TrySendError::Disconnected(t), @@ -1576,6 +1581,11 @@ impl error::Error for TryRecvError { #[stable(feature = "mpsc_error_conversions", since = "1.24.0")] impl From<RecvError> for TryRecvError { + /// Converts a `RecvError` into a `TryRecvError`. + /// + /// This conversion always returns `TryRecvError::Disconnected`. + /// + /// No data is allocated on the heap. fn from(err: RecvError) -> TryRecvError { match err { RecvError => TryRecvError::Disconnected, @@ -1606,6 +1616,11 @@ impl error::Error for RecvTimeoutError { #[stable(feature = "mpsc_error_conversions", since = "1.24.0")] impl From<RecvError> for RecvTimeoutError { + /// Converts a `RecvError` into a `RecvTimeoutError`. + /// + /// This conversion always returns `RecvTimeoutError::Disconnected`. + /// + /// No data is allocated on the heap. fn from(err: RecvError) -> RecvTimeoutError { match err { RecvError => RecvTimeoutError::Disconnected, |
