diff options
| author | Chris Wailes <chriswailes@google.com> | 2022-12-12 20:36:45 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2022-12-12 20:36:45 +0000 |
| commit | 6bdeb1c26a556fa7994e36aaaf217a6b0cbe93a3 (patch) | |
| tree | e998a08be3480510c29f02cb4fd43fd4a6a02a1f | |
| parent | c521e9b0e17f138a27edcdcedf8e160b90f43ed0 (diff) | |
| parent | 391c6ef43e472ae0a345399108daf874b0aae670 (diff) | |
| download | tokio-6bdeb1c26a556fa7994e36aaaf217a6b0cbe93a3.tar.gz | |
Merge "Remove upstreamed patch" am: b669ae94fd am: 391c6ef43e
Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/tokio/+/2346407
Change-Id: I4cd12b7bb80729b15b5f2e7c8d8cd07fb11b13ba
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
| -rw-r--r-- | patches/sync_broadcast.patch | 12 |
1 files changed, 0 insertions, 12 deletions
diff --git a/patches/sync_broadcast.patch b/patches/sync_broadcast.patch deleted file mode 100644 index c63a4a7..0000000 --- a/patches/sync_broadcast.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff --git a/tests/sync_broadcast.rs b/tests/sync_broadcast.rs -index 5f79800..9ef7927 100644 ---- a/tests/sync_broadcast.rs -+++ b/tests/sync_broadcast.rs -@@ -286,6 +286,7 @@ fn capacity_too_big() { - } - - #[test] -+#[cfg(not(target_os = "android"))] - fn panic_in_clone() { - use std::panic::{self, AssertUnwindSafe}; - |