diff options
| author | Dylan DPC <99973273+Dylan-DPC@users.noreply.github.com> | 2023-09-17 11:23:23 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-09-17 11:23:23 +0000 |
| commit | 7cbe7fa6bffbf580bfa8fc6cbda68fdce21286e8 (patch) | |
| tree | 06d6f36cb619713744c50e6d94f6fa222844b9fa /library/std/src | |
| parent | cdd182cbb2d11bb25d2dabdd752cc5980e0ac059 (diff) | |
| parent | a38ea96825ae9ea66812445c9a953aeb95403702 (diff) | |
| download | rust-7cbe7fa6bffbf580bfa8fc6cbda68fdce21286e8.tar.gz rust-7cbe7fa6bffbf580bfa8fc6cbda68fdce21286e8.zip | |
Rollup merge of #114965 - benschulz:mpsc-drop, r=dtolnay
Remove Drop impl of mpsc Receiver and (Sync)Sender This change removes the empty `Drop` implementations for `mpsc::Receiver`, `mpsc::Sender` and `mpsc::SyncSender`. These implementations do not specify `#[may_dangle]`, so by removing them we make `mpsc` types play nice with drop check. This was previously attempted in [#105243](https://github.com/rust-lang/rust/pull/105243#issuecomment-1337188646) but then [abandoned due to a test failure](https://github.com/rust-lang/rust/pull/105243#issuecomment-1337227970). I've aligned the test with those for `Mutex` and `RwLock`.
Diffstat (limited to 'library/std/src')
| -rw-r--r-- | library/std/src/sync/mpsc/mod.rs | 15 |
1 files changed, 0 insertions, 15 deletions
diff --git a/library/std/src/sync/mpsc/mod.rs b/library/std/src/sync/mpsc/mod.rs index f92bb1a4b1f..d353c7bd5de 100644 --- a/library/std/src/sync/mpsc/mod.rs +++ b/library/std/src/sync/mpsc/mod.rs @@ -626,11 +626,6 @@ impl<T> Clone for Sender<T> { } } -#[stable(feature = "rust1", since = "1.0.0")] -impl<T> Drop for Sender<T> { - fn drop(&mut self) {} -} - #[stable(feature = "mpsc_debug", since = "1.8.0")] impl<T> fmt::Debug for Sender<T> { fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result { @@ -755,11 +750,6 @@ impl<T> Clone for SyncSender<T> { } } -#[stable(feature = "rust1", since = "1.0.0")] -impl<T> Drop for SyncSender<T> { - fn drop(&mut self) {} -} - #[stable(feature = "mpsc_debug", since = "1.8.0")] impl<T> fmt::Debug for SyncSender<T> { fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result { @@ -1096,11 +1086,6 @@ impl<T> IntoIterator for Receiver<T> { } } -#[stable(feature = "rust1", since = "1.0.0")] -impl<T> Drop for Receiver<T> { - fn drop(&mut self) {} -} - #[stable(feature = "mpsc_debug", since = "1.8.0")] impl<T> fmt::Debug for Receiver<T> { fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result { |