From a77df93fec1b865e952e7a931ea3cd129aca6a46 Mon Sep 17 00:00:00 2001
From: Jeff Vander Stoep <jeffv@google.com>
Date: Mon, 6 Feb 2023 09:15:26 +0100
Subject: Upgrade tokio to 1.25.0

This project was upgraded with external_updater.
Usage: tools/external_updater/updater.sh update rust/crates/tokio
For more info, check https://cs.android.com/android/platform/superproject/+/master:tools/external_updater/README.md

Test: TreeHugger
Change-Id: Ibe4881eebae2509ecb442aa1c803461d9348eaa3
---
 src/io/split.rs | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

(limited to 'src/io/split.rs')

diff --git a/src/io/split.rs b/src/io/split.rs
index 2e0da95..f067b65 100644
--- a/src/io/split.rs
+++ b/src/io/split.rs
@@ -75,7 +75,10 @@ impl<T> ReadHalf<T> {
     /// This can be checked ahead of time by comparing the stream ID
     /// of the two halves.
     #[track_caller]
-    pub fn unsplit(self, wr: WriteHalf<T>) -> T {
+    pub fn unsplit(self, wr: WriteHalf<T>) -> T
+    where
+        T: Unpin,
+    {
         if self.is_pair_of(&wr) {
             drop(wr);
 
-- 
cgit v1.2.3