diff options
| author | bors <bors@rust-lang.org> | 2023-05-16 04:03:26 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2023-05-16 04:03:26 +0000 |
| commit | 3ea9ad532474343426e564b997891e459cda89a6 (patch) | |
| tree | 654fc3cec3be01ae0690c87de6c5aa9ec074acbd /library/std/src | |
| parent | 76e79ca0260a95bd3993c4738df6f9d7c79676ea (diff) | |
| parent | af5de855a33256ea6125f5654296698e507f86e0 (diff) | |
| download | rust-3ea9ad532474343426e564b997891e459cda89a6.tar.gz rust-3ea9ad532474343426e564b997891e459cda89a6.zip | |
Auto merge of #111134 - GilShoshan94:remove-send-bound-on-error, r=dtolnay
Remove unnecessary Send bound Hi, While working on a [PR on Tokio](https://github.com/tokio-rs/tokio/pull/5666), I took inspiration from the std channel mpsc and stumbled on a `Send` bound for a `Error` impl. Tokio's maintainer `@Darksonn` pointed out to me that `Error` used to required the `Send` bound long time ago (here https://github.com/rust-lang/rust/pull/23541). In the meantime, the `Send` bound `Error` got removed (see https://github.com/rust-lang/rust/pull/21312 and https://github.com/rust-lang/rust/pull/23799). So here a PR to removed this bound for `SendError<T>`, `TrySendError<T>` and `SendTimeoutError<T>`.
Diffstat (limited to 'library/std/src')
| -rw-r--r-- | library/std/src/sync/mpmc/error.rs | 2 | ||||
| -rw-r--r-- | library/std/src/sync/mpsc/mod.rs | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/library/std/src/sync/mpmc/error.rs b/library/std/src/sync/mpmc/error.rs index 1b8a1f38797..33b2bff8534 100644 --- a/library/std/src/sync/mpmc/error.rs +++ b/library/std/src/sync/mpmc/error.rs @@ -35,7 +35,7 @@ impl<T> fmt::Display for SendTimeoutError<T> { } } -impl<T: Send> error::Error for SendTimeoutError<T> {} +impl<T> error::Error for SendTimeoutError<T> {} impl<T> From<SendError<T>> for SendTimeoutError<T> { fn from(err: SendError<T>) -> SendTimeoutError<T> { diff --git a/library/std/src/sync/mpsc/mod.rs b/library/std/src/sync/mpsc/mod.rs index 6e3c28f10bb..0e0c87d1c74 100644 --- a/library/std/src/sync/mpsc/mod.rs +++ b/library/std/src/sync/mpsc/mod.rs @@ -1124,7 +1124,7 @@ impl<T> fmt::Display for SendError<T> { } #[stable(feature = "rust1", since = "1.0.0")] -impl<T: Send> error::Error for SendError<T> { +impl<T> error::Error for SendError<T> { #[allow(deprecated)] fn description(&self) -> &str { "sending on a closed channel" @@ -1152,7 +1152,7 @@ impl<T> fmt::Display for TrySendError<T> { } #[stable(feature = "rust1", since = "1.0.0")] -impl<T: Send> error::Error for TrySendError<T> { +impl<T> error::Error for TrySendError<T> { #[allow(deprecated)] fn description(&self) -> &str { match *self { |
