Upgrade tokio to 1.23.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: Id69553d5e858bddcde0de5b9e72d6bb3c08bafb5

1 files changed, 69 insertions, 81 deletions

diff --git a/Android.bp b/Android.bp
index cf507e3..c430388 100644
--- a/Android.bp
+++ b/Android.bp
@@ -23,7 +23,7 @@ rust_library {
     host_supported: true,
     crate_name: "tokio",
     cargo_env_compat: true,
-    cargo_pkg_version: "1.14.0",
+    cargo_pkg_version: "1.23.0",
     srcs: ["src/lib.rs"],
     edition: "2018",
     features: [
@@ -38,12 +38,12 @@ rust_library {
         "num_cpus",
         "rt",
         "rt-multi-thread",
+        "socket2",
         "sync",
         "time",
         "tokio-macros",
-        "winapi",
+        "windows-sys",
     ],
-    cfgs: ["tokio_track_caller"],
     rustlibs: [
         "libbytes",
         "liblibc",
@@ -51,6 +51,7 @@ rust_library {
         "libmio",
         "libnum_cpus",
         "libpin_project_lite",
+        "libsocket2",
     ],
     proc_macros: ["libtokio_macros"],
     apex_available: [
@@ -64,7 +65,7 @@ rust_library {
 }
 
 rust_defaults {
-    name: "tokio_defaults_tokio",
+    name: "tokio_defaults_tests",
     crate_name: "tokio",
     cargo_env_compat: true,
     test_suites: ["general-tests"],
@@ -108,7 +109,7 @@ rust_defaults {
 
 rust_test {
     name: "tokio_test_tests__require_full",
-    defaults: ["tokio_defaults_tokio"],
+    defaults: ["tokio_defaults_tests"],
     host_supported: true,
     srcs: ["tests/_require_full.rs"],
     test_options: {
@@ -118,7 +119,7 @@ rust_test {
 
 rust_test {
     name: "tokio_test_tests_buffered",
-    defaults: ["tokio_defaults_tokio"],
+    defaults: ["tokio_defaults_tests"],
     host_supported: true,
     srcs: ["tests/buffered.rs"],
     test_options: {
@@ -128,7 +129,7 @@ rust_test {
 
 rust_test {
     name: "tokio_test_tests_io_async_fd",
-    defaults: ["tokio_defaults_tokio"],
+    defaults: ["tokio_defaults_tests"],
     host_supported: true,
     srcs: ["tests/io_async_fd.rs"],
     test_options: {
@@ -138,7 +139,7 @@ rust_test {
 
 rust_test {
     name: "tokio_test_tests_io_async_read",
-    defaults: ["tokio_defaults_tokio"],
+    defaults: ["tokio_defaults_tests"],
     host_supported: true,
     srcs: ["tests/io_async_read.rs"],
     test_options: {
@@ -148,7 +149,7 @@ rust_test {
 
 rust_test {
     name: "tokio_test_tests_io_chain",
-    defaults: ["tokio_defaults_tokio"],
+    defaults: ["tokio_defaults_tests"],
     host_supported: true,
     srcs: ["tests/io_chain.rs"],
     test_options: {
@@ -158,7 +159,7 @@ rust_test {
 
 rust_test {
     name: "tokio_test_tests_io_copy",
-    defaults: ["tokio_defaults_tokio"],
+    defaults: ["tokio_defaults_tests"],
     host_supported: true,
     srcs: ["tests/io_copy.rs"],
     test_options: {
@@ -168,7 +169,7 @@ rust_test {
 
 rust_test {
     name: "tokio_test_tests_io_copy_bidirectional",
-    defaults: ["tokio_defaults_tokio"],
+    defaults: ["tokio_defaults_tests"],
     host_supported: true,
     srcs: ["tests/io_copy_bidirectional.rs"],
     test_options: {
@@ -178,7 +179,7 @@ rust_test {
 
 rust_test {
     name: "tokio_test_tests_io_driver",
-    defaults: ["tokio_defaults_tokio"],
+    defaults: ["tokio_defaults_tests"],
     host_supported: true,
     srcs: ["tests/io_driver.rs"],
     test_options: {
@@ -188,7 +189,7 @@ rust_test {
 
 rust_test {
     name: "tokio_test_tests_io_driver_drop",
-    defaults: ["tokio_defaults_tokio"],
+    defaults: ["tokio_defaults_tests"],
     host_supported: true,
     srcs: ["tests/io_driver_drop.rs"],
     test_options: {
@@ -198,7 +199,7 @@ rust_test {
 
 rust_test {
     name: "tokio_test_tests_io_lines",
-    defaults: ["tokio_defaults_tokio"],
+    defaults: ["tokio_defaults_tests"],
     host_supported: true,
     srcs: ["tests/io_lines.rs"],
     test_options: {
@@ -208,7 +209,7 @@ rust_test {
 
 rust_test {
     name: "tokio_test_tests_io_mem_stream",
-    defaults: ["tokio_defaults_tokio"],
+    defaults: ["tokio_defaults_tests"],
     host_supported: true,
     srcs: ["tests/io_mem_stream.rs"],
     test_options: {
@@ -218,7 +219,7 @@ rust_test {
 
 rust_test {
     name: "tokio_test_tests_io_read",
-    defaults: ["tokio_defaults_tokio"],
+    defaults: ["tokio_defaults_tests"],
     host_supported: true,
     srcs: ["tests/io_read.rs"],
     test_options: {
@@ -228,7 +229,7 @@ rust_test {
 
 rust_test {
     name: "tokio_test_tests_io_read_buf",
-    defaults: ["tokio_defaults_tokio"],
+    defaults: ["tokio_defaults_tests"],
     host_supported: true,
     srcs: ["tests/io_read_buf.rs"],
     test_options: {
@@ -238,7 +239,7 @@ rust_test {
 
 rust_test {
     name: "tokio_test_tests_io_read_exact",
-    defaults: ["tokio_defaults_tokio"],
+    defaults: ["tokio_defaults_tests"],
     host_supported: true,
     srcs: ["tests/io_read_exact.rs"],
     test_options: {
@@ -248,7 +249,7 @@ rust_test {
 
 rust_test {
     name: "tokio_test_tests_io_read_line",
-    defaults: ["tokio_defaults_tokio"],
+    defaults: ["tokio_defaults_tests"],
     host_supported: true,
     srcs: ["tests/io_read_line.rs"],
     test_options: {
@@ -258,7 +259,7 @@ rust_test {
 
 rust_test {
     name: "tokio_test_tests_io_read_to_end",
-    defaults: ["tokio_defaults_tokio"],
+    defaults: ["tokio_defaults_tests"],
     host_supported: true,
     srcs: ["tests/io_read_to_end.rs"],
     test_options: {
@@ -268,7 +269,7 @@ rust_test {
 
 rust_test {
     name: "tokio_test_tests_io_read_to_string",
-    defaults: ["tokio_defaults_tokio"],
+    defaults: ["tokio_defaults_tests"],
     host_supported: true,
     srcs: ["tests/io_read_to_string.rs"],
     test_options: {
@@ -278,7 +279,7 @@ rust_test {
 
 rust_test {
     name: "tokio_test_tests_io_read_until",
-    defaults: ["tokio_defaults_tokio"],
+    defaults: ["tokio_defaults_tests"],
     host_supported: true,
     srcs: ["tests/io_read_until.rs"],
     test_options: {
@@ -288,7 +289,7 @@ rust_test {
 
 rust_test {
     name: "tokio_test_tests_io_split",
-    defaults: ["tokio_defaults_tokio"],
+    defaults: ["tokio_defaults_tests"],
     host_supported: true,
     srcs: ["tests/io_split.rs"],
     test_options: {
@@ -298,7 +299,7 @@ rust_test {
 
 rust_test {
     name: "tokio_test_tests_io_take",
-    defaults: ["tokio_defaults_tokio"],
+    defaults: ["tokio_defaults_tests"],
     host_supported: true,
     srcs: ["tests/io_take.rs"],
     test_options: {
@@ -308,7 +309,7 @@ rust_test {
 
 rust_test {
     name: "tokio_test_tests_io_write",
-    defaults: ["tokio_defaults_tokio"],
+    defaults: ["tokio_defaults_tests"],
     host_supported: true,
     srcs: ["tests/io_write.rs"],
     test_options: {
@@ -318,7 +319,7 @@ rust_test {
 
 rust_test {
     name: "tokio_test_tests_io_write_all",
-    defaults: ["tokio_defaults_tokio"],
+    defaults: ["tokio_defaults_tests"],
     host_supported: true,
     srcs: ["tests/io_write_all.rs"],
     test_options: {
@@ -328,7 +329,7 @@ rust_test {
 
 rust_test {
     name: "tokio_test_tests_io_write_buf",
-    defaults: ["tokio_defaults_tokio"],
+    defaults: ["tokio_defaults_tests"],
     host_supported: true,
     srcs: ["tests/io_write_buf.rs"],
     test_options: {
@@ -338,7 +339,7 @@ rust_test {
 
 rust_test {
     name: "tokio_test_tests_io_write_int",
-    defaults: ["tokio_defaults_tokio"],
+    defaults: ["tokio_defaults_tests"],
     host_supported: true,
     srcs: ["tests/io_write_int.rs"],
     test_options: {
@@ -348,7 +349,7 @@ rust_test {
 
 rust_test {
     name: "tokio_test_tests_macros_join",
-    defaults: ["tokio_defaults_tokio"],
+    defaults: ["tokio_defaults_tests"],
     host_supported: true,
     srcs: ["tests/macros_join.rs"],
     test_options: {
@@ -358,7 +359,7 @@ rust_test {
 
 rust_test {
     name: "tokio_test_tests_macros_pin",
-    defaults: ["tokio_defaults_tokio"],
+    defaults: ["tokio_defaults_tests"],
     host_supported: true,
     srcs: ["tests/macros_pin.rs"],
     test_options: {
@@ -368,7 +369,7 @@ rust_test {
 
 rust_test {
     name: "tokio_test_tests_macros_select",
-    defaults: ["tokio_defaults_tokio"],
+    defaults: ["tokio_defaults_tests"],
     host_supported: true,
     srcs: ["tests/macros_select.rs"],
     test_options: {
@@ -378,7 +379,7 @@ rust_test {
 
 rust_test {
     name: "tokio_test_tests_macros_test",
-    defaults: ["tokio_defaults_tokio"],
+    defaults: ["tokio_defaults_tests"],
     host_supported: true,
     srcs: ["tests/macros_test.rs"],
     test_options: {
@@ -388,7 +389,7 @@ rust_test {
 
 rust_test {
     name: "tokio_test_tests_macros_try_join",
-    defaults: ["tokio_defaults_tokio"],
+    defaults: ["tokio_defaults_tests"],
     host_supported: true,
     srcs: ["tests/macros_try_join.rs"],
     test_options: {
@@ -398,7 +399,7 @@ rust_test {
 
 rust_test {
     name: "tokio_test_tests_net_bind_resource",
-    defaults: ["tokio_defaults_tokio"],
+    defaults: ["tokio_defaults_tests"],
     host_supported: true,
     srcs: ["tests/net_bind_resource.rs"],
     test_options: {
@@ -408,7 +409,7 @@ rust_test {
 
 rust_test {
     name: "tokio_test_tests_net_lookup_host",
-    defaults: ["tokio_defaults_tokio"],
+    defaults: ["tokio_defaults_tests"],
     host_supported: true,
     srcs: ["tests/net_lookup_host.rs"],
     test_options: {
@@ -418,7 +419,7 @@ rust_test {
 
 rust_test {
     name: "tokio_test_tests_no_rt",
-    defaults: ["tokio_defaults_tokio"],
+    defaults: ["tokio_defaults_tests"],
     host_supported: true,
     srcs: ["tests/no_rt.rs"],
     test_options: {
@@ -428,7 +429,7 @@ rust_test {
 
 rust_test {
     name: "tokio_test_tests_process_kill_on_drop",
-    defaults: ["tokio_defaults_tokio"],
+    defaults: ["tokio_defaults_tests"],
     host_supported: true,
     srcs: ["tests/process_kill_on_drop.rs"],
     test_options: {
@@ -438,7 +439,7 @@ rust_test {
 
 rust_test {
     name: "tokio_test_tests_rt_basic",
-    defaults: ["tokio_defaults_tokio"],
+    defaults: ["tokio_defaults_tests"],
     host_supported: true,
     srcs: ["tests/rt_basic.rs"],
     test_options: {
@@ -448,18 +449,17 @@ rust_test {
 
 rust_test {
     name: "tokio_test_tests_rt_common",
-    defaults: ["tokio_defaults_tokio"],
+    defaults: ["tokio_defaults_tests"],
     host_supported: true,
     srcs: ["tests/rt_common.rs"],
     test_options: {
-        tags: ["no-remote"],
         unit_test: true,
     },
 }
 
 rust_test {
     name: "tokio_test_tests_rt_threaded",
-    defaults: ["tokio_defaults_tokio"],
+    defaults: ["tokio_defaults_tests"],
     host_supported: true,
     srcs: ["tests/rt_threaded.rs"],
     test_options: {
@@ -469,7 +469,7 @@ rust_test {
 
 rust_test {
     name: "tokio_test_tests_sync_barrier",
-    defaults: ["tokio_defaults_tokio"],
+    defaults: ["tokio_defaults_tests"],
     host_supported: true,
     srcs: ["tests/sync_barrier.rs"],
     test_options: {
@@ -479,7 +479,7 @@ rust_test {
 
 rust_test {
     name: "tokio_test_tests_sync_broadcast",
-    defaults: ["tokio_defaults_tokio"],
+    defaults: ["tokio_defaults_tests"],
     host_supported: true,
     srcs: ["tests/sync_broadcast.rs"],
     test_options: {
@@ -489,7 +489,7 @@ rust_test {
 
 rust_test {
     name: "tokio_test_tests_sync_errors",
-    defaults: ["tokio_defaults_tokio"],
+    defaults: ["tokio_defaults_tests"],
     host_supported: true,
     srcs: ["tests/sync_errors.rs"],
     test_options: {
@@ -498,18 +498,8 @@ rust_test {
 }
 
 rust_test {
-    name: "tokio_test_tests_sync_mpsc",
-    defaults: ["tokio_defaults_tokio"],
-    host_supported: true,
-    srcs: ["tests/sync_mpsc.rs"],
-    test_options: {
-        unit_test: true,
-    },
-}
-
-rust_test {
     name: "tokio_test_tests_sync_mutex",
-    defaults: ["tokio_defaults_tokio"],
+    defaults: ["tokio_defaults_tests"],
     host_supported: true,
     srcs: ["tests/sync_mutex.rs"],
     test_options: {
@@ -519,7 +509,7 @@ rust_test {
 
 rust_test {
     name: "tokio_test_tests_sync_mutex_owned",
-    defaults: ["tokio_defaults_tokio"],
+    defaults: ["tokio_defaults_tests"],
     host_supported: true,
     srcs: ["tests/sync_mutex_owned.rs"],
     test_options: {
@@ -529,7 +519,7 @@ rust_test {
 
 rust_test {
     name: "tokio_test_tests_sync_notify",
-    defaults: ["tokio_defaults_tokio"],
+    defaults: ["tokio_defaults_tests"],
     host_supported: true,
     srcs: ["tests/sync_notify.rs"],
     test_options: {
@@ -539,7 +529,7 @@ rust_test {
 
 rust_test {
     name: "tokio_test_tests_sync_oneshot",
-    defaults: ["tokio_defaults_tokio"],
+    defaults: ["tokio_defaults_tests"],
     host_supported: true,
     srcs: ["tests/sync_oneshot.rs"],
     test_options: {
@@ -549,7 +539,7 @@ rust_test {
 
 rust_test {
     name: "tokio_test_tests_sync_rwlock",
-    defaults: ["tokio_defaults_tokio"],
+    defaults: ["tokio_defaults_tests"],
     host_supported: true,
     srcs: ["tests/sync_rwlock.rs"],
     test_options: {
@@ -559,7 +549,7 @@ rust_test {
 
 rust_test {
     name: "tokio_test_tests_sync_semaphore",
-    defaults: ["tokio_defaults_tokio"],
+    defaults: ["tokio_defaults_tests"],
     host_supported: true,
     srcs: ["tests/sync_semaphore.rs"],
     test_options: {
@@ -569,7 +559,7 @@ rust_test {
 
 rust_test {
     name: "tokio_test_tests_sync_semaphore_owned",
-    defaults: ["tokio_defaults_tokio"],
+    defaults: ["tokio_defaults_tests"],
     host_supported: true,
     srcs: ["tests/sync_semaphore_owned.rs"],
     test_options: {
@@ -579,7 +569,7 @@ rust_test {
 
 rust_test {
     name: "tokio_test_tests_sync_watch",
-    defaults: ["tokio_defaults_tokio"],
+    defaults: ["tokio_defaults_tests"],
     host_supported: true,
     srcs: ["tests/sync_watch.rs"],
     test_options: {
@@ -589,7 +579,7 @@ rust_test {
 
 rust_test {
     name: "tokio_test_tests_task_abort",
-    defaults: ["tokio_defaults_tokio"],
+    defaults: ["tokio_defaults_tests"],
     host_supported: true,
     srcs: ["tests/task_abort.rs"],
     test_options: {
@@ -599,7 +589,7 @@ rust_test {
 
 rust_test {
     name: "tokio_test_tests_task_blocking",
-    defaults: ["tokio_defaults_tokio"],
+    defaults: ["tokio_defaults_tests"],
     host_supported: true,
     srcs: ["tests/task_blocking.rs"],
     test_options: {
@@ -609,7 +599,7 @@ rust_test {
 
 rust_test {
     name: "tokio_test_tests_task_local",
-    defaults: ["tokio_defaults_tokio"],
+    defaults: ["tokio_defaults_tests"],
     host_supported: true,
     srcs: ["tests/task_local.rs"],
     test_options: {
@@ -619,7 +609,7 @@ rust_test {
 
 rust_test {
     name: "tokio_test_tests_task_local_set",
-    defaults: ["tokio_defaults_tokio"],
+    defaults: ["tokio_defaults_tests"],
     host_supported: true,
     srcs: ["tests/task_local_set.rs"],
     test_options: {
@@ -629,7 +619,7 @@ rust_test {
 
 rust_test {
     name: "tokio_test_tests_tcp_accept",
-    defaults: ["tokio_defaults_tokio"],
+    defaults: ["tokio_defaults_tests"],
     host_supported: true,
     srcs: ["tests/tcp_accept.rs"],
     test_options: {
@@ -639,18 +629,17 @@ rust_test {
 
 rust_test {
     name: "tokio_test_tests_tcp_connect",
-    defaults: ["tokio_defaults_tokio"],
+    defaults: ["tokio_defaults_tests"],
     host_supported: true,
     srcs: ["tests/tcp_connect.rs"],
     test_options: {
-        tags: ["no-remote"],
         unit_test: true,
     },
 }
 
 rust_test {
     name: "tokio_test_tests_tcp_echo",
-    defaults: ["tokio_defaults_tokio"],
+    defaults: ["tokio_defaults_tests"],
     host_supported: true,
     srcs: ["tests/tcp_echo.rs"],
     test_options: {
@@ -660,7 +649,7 @@ rust_test {
 
 rust_test {
     name: "tokio_test_tests_tcp_into_split",
-    defaults: ["tokio_defaults_tokio"],
+    defaults: ["tokio_defaults_tests"],
     host_supported: true,
     srcs: ["tests/tcp_into_split.rs"],
     test_options: {
@@ -670,7 +659,7 @@ rust_test {
 
 rust_test {
     name: "tokio_test_tests_tcp_into_std",
-    defaults: ["tokio_defaults_tokio"],
+    defaults: ["tokio_defaults_tests"],
     host_supported: true,
     srcs: ["tests/tcp_into_std.rs"],
     test_options: {
@@ -680,7 +669,7 @@ rust_test {
 
 rust_test {
     name: "tokio_test_tests_tcp_peek",
-    defaults: ["tokio_defaults_tokio"],
+    defaults: ["tokio_defaults_tests"],
     host_supported: true,
     srcs: ["tests/tcp_peek.rs"],
     test_options: {
@@ -690,7 +679,7 @@ rust_test {
 
 rust_test {
     name: "tokio_test_tests_tcp_shutdown",
-    defaults: ["tokio_defaults_tokio"],
+    defaults: ["tokio_defaults_tests"],
     host_supported: true,
     srcs: ["tests/tcp_shutdown.rs"],
     test_options: {
@@ -700,18 +689,17 @@ rust_test {
 
 rust_test {
     name: "tokio_test_tests_tcp_socket",
-    defaults: ["tokio_defaults_tokio"],
+    defaults: ["tokio_defaults_tests"],
     host_supported: true,
     srcs: ["tests/tcp_socket.rs"],
     test_options: {
-        tags: ["no-remote"],
         unit_test: true,
     },
 }
 
 rust_test {
     name: "tokio_test_tests_tcp_split",
-    defaults: ["tokio_defaults_tokio"],
+    defaults: ["tokio_defaults_tests"],
     host_supported: true,
     srcs: ["tests/tcp_split.rs"],
     test_options: {
@@ -721,7 +709,7 @@ rust_test {
 
 rust_test {
     name: "tokio_test_tests_time_rt",
-    defaults: ["tokio_defaults_tokio"],
+    defaults: ["tokio_defaults_tests"],
     host_supported: true,
     srcs: ["tests/time_rt.rs"],
     test_options: {
@@ -731,7 +719,7 @@ rust_test {
 
 rust_test {
     name: "tokio_test_tests_udp",
-    defaults: ["tokio_defaults_tokio"],
+    defaults: ["tokio_defaults_tests"],
     host_supported: true,
     srcs: ["tests/udp.rs"],
     test_options: {
@@ -741,7 +729,7 @@ rust_test {
 
 rust_test {
     name: "tokio_test_tests_uds_cred",
-    defaults: ["tokio_defaults_tokio"],
+    defaults: ["tokio_defaults_tests"],
     host_supported: true,
     srcs: ["tests/uds_cred.rs"],
     test_options: {
@@ -751,7 +739,7 @@ rust_test {
 
 rust_test {
     name: "tokio_test_tests_uds_split",
-    defaults: ["tokio_defaults_tokio"],
+    defaults: ["tokio_defaults_tests"],
     host_supported: true,
     srcs: ["tests/uds_split.rs"],
     test_options: {