diff options
author | Android Build Coastguard Worker <android-build-coastguard-worker@google.com> | 2024-02-02 23:55:54 +0000 |
---|---|---|
committer | Android Build Coastguard Worker <android-build-coastguard-worker@google.com> | 2024-02-02 23:55:54 +0000 |
commit | 2514666b0bb5163801538e414c11cc693b11f9ce (patch) | |
tree | caccc1006471d8620c56689dc9fb5fc21d997982 | |
parent | 54e35a9e423ca68419ca5697b8f6f326b06d65b5 (diff) | |
parent | e05a4c03ef5f3606abe6ef3d58ad08f44a4dc5d2 (diff) | |
download | tokio-simpleperf-release.tar.gz |
Snap for 11400057 from e05a4c03ef5f3606abe6ef3d58ad08f44a4dc5d2 to simpleperf-releasesimpleperf-release
Change-Id: I06cce89a7f0fe56181b5876a096d652213c0d4d7
-rw-r--r-- | Android.bp | 1 | ||||
-rw-r--r-- | Cargo.toml | 4 | ||||
-rw-r--r-- | Cargo.toml.orig | 4 | ||||
-rw-r--r-- | tests/io_async_fd.rs | 11 |
4 files changed, 14 insertions, 6 deletions
@@ -2,6 +2,7 @@ // Do not modify this file as changes will be overridden on upgrade. package { + default_team: "trendy_team_android_rust", default_applicable_licenses: ["external_rust_crates_tokio_license"], } @@ -205,10 +205,10 @@ version = "1.1.1" optional = true [target."cfg(unix)".dev-dependencies.libc] -version = "0.2.145" +version = "0.2.149" [target."cfg(unix)".dev-dependencies.nix] -version = "0.26" +version = "0.27.1" features = [ "fs", "socket", diff --git a/Cargo.toml.orig b/Cargo.toml.orig index 19384b7..069bb13 100644 --- a/Cargo.toml.orig +++ b/Cargo.toml.orig @@ -122,8 +122,8 @@ libc = { version = "0.2.145", optional = true } signal-hook-registry = { version = "1.1.1", optional = true } [target.'cfg(unix)'.dev-dependencies] -libc = { version = "0.2.145" } -nix = { version = "0.26", default-features = false, features = ["fs", "socket"] } +libc = { version = "0.2.149" } +nix = { version = "0.27.1", default-features = false, features = ["fs", "socket"] } [target.'cfg(windows)'.dependencies.windows-sys] version = "0.48" diff --git a/tests/io_async_fd.rs b/tests/io_async_fd.rs index 7abd592..49b5a68 100644 --- a/tests/io_async_fd.rs +++ b/tests/io_async_fd.rs @@ -1,7 +1,7 @@ #![warn(rust_2018_idioms)] #![cfg(all(unix, feature = "full"))] -use std::os::unix::io::{AsRawFd, RawFd}; +use std::os::unix::io::{AsRawFd, IntoRawFd, RawFd}; use std::sync::{ atomic::{AtomicBool, Ordering}, Arc, @@ -132,7 +132,14 @@ fn socketpair() -> (FileDescriptor, FileDescriptor) { SockFlag::empty(), ) .expect("socketpair"); - let fds = (FileDescriptor { fd: fd_a }, FileDescriptor { fd: fd_b }); + let fds = ( + FileDescriptor { + fd: fd_a.into_raw_fd(), + }, + FileDescriptor { + fd: fd_b.into_raw_fd(), + }, + ); set_nonblocking(fds.0.fd); set_nonblocking(fds.1.fd); |