diff options
| author | Markus Pettersson <markus.pettersson@mullvad.net> | 2023-12-11 16:37:35 +0100 |
|---|---|---|
| committer | Markus Pettersson <markus.pettersson@mullvad.net> | 2023-12-15 09:45:08 +0100 |
| commit | 8a053ab50624892dbefcb6cd386aee650651a48b (patch) | |
| tree | cfc78253895980bfe403c05087a8e5cb1620be6c | |
| parent | 8686fc2792906c8e5cb0dcc49845efd7690f98fa (diff) | |
| download | mullvadvpn-8a053ab50624892dbefcb6cd386aee650651a48b.tar.xz mullvadvpn-8a053ab50624892dbefcb6cd386aee650651a48b.zip | |
[Clippy] Fix unused `async`
| -rw-r--r-- | test/test-manager/src/mullvad_daemon.rs | 2 | ||||
| -rw-r--r-- | test/test-manager/src/run_tests.rs | 4 | ||||
| -rw-r--r-- | test/test-rpc/src/transport.rs | 2 | ||||
| -rw-r--r-- | test/test-runner/src/main.rs | 2 | ||||
| -rw-r--r-- | test/test-runner/src/net.rs | 4 | ||||
| -rw-r--r-- | test/test-runner/src/sys.rs | 1 |
6 files changed, 8 insertions, 7 deletions
diff --git a/test/test-manager/src/mullvad_daemon.rs b/test/test-manager/src/mullvad_daemon.rs index 2bfff38dde..e467940d58 100644 --- a/test/test-manager/src/mullvad_daemon.rs +++ b/test/test-manager/src/mullvad_daemon.rs @@ -76,7 +76,7 @@ impl RpcClientProvider { } } -pub async fn new_rpc_client( +pub fn new_rpc_client( connection_handle: ConnectionHandle, mullvad_daemon_transport: GrpcForwarder, ) -> RpcClientProvider { diff --git a/test/test-manager/src/run_tests.rs b/test/test-manager/src/run_tests.rs index f0ff402034..4a296ce288 100644 --- a/test/test-manager/src/run_tests.rs +++ b/test/test-manager/src/run_tests.rs @@ -35,7 +35,7 @@ pub async fn run( let serial_stream = tokio_serial::SerialStream::open(&tokio_serial::new(pty_path, BAUD)).unwrap(); let (runner_transport, mullvad_daemon_transport, mut connection_handle, completion_handle) = - test_rpc::transport::create_client_transports(serial_stream).await?; + test_rpc::transport::create_client_transports(serial_stream)?; if !skip_wait { connection_handle.wait_for_server().await?; @@ -45,7 +45,7 @@ pub async fn run( let client = ServiceClient::new(connection_handle.clone(), runner_transport); let mullvad_client = - mullvad_daemon::new_rpc_client(connection_handle, mullvad_daemon_transport).await; + mullvad_daemon::new_rpc_client(connection_handle, mullvad_daemon_transport); let mut tests: Vec<_> = inventory::iter::<tests::TestMetadata>().collect(); tests.sort_by_key(|test| test.priority.unwrap_or(0)); diff --git a/test/test-rpc/src/transport.rs b/test/test-rpc/src/transport.rs index 6c8b7a7060..753420900d 100644 --- a/test/test-rpc/src/transport.rs +++ b/test/test-rpc/src/transport.rs @@ -162,7 +162,7 @@ pub fn create_server_transports( (runner_forwarder_1, daemon_rx, completion_handle) } -pub async fn create_client_transports( +pub fn create_client_transports( serial_stream: impl AsyncRead + AsyncWrite + Unpin + Send + 'static, ) -> Result< ( diff --git a/test/test-runner/src/main.rs b/test/test-runner/src/main.rs index fe85e6f89f..c67876526b 100644 --- a/test/test-runner/src/main.rs +++ b/test/test-runner/src/main.rs @@ -177,7 +177,7 @@ impl Service for TestServer { _: context::Context, interface: String, ) -> Result<IpAddr, test_rpc::Error> { - net::get_interface_ip(&interface).await + net::get_interface_ip(&interface) } async fn get_default_interface(self, _: context::Context) -> Result<String, test_rpc::Error> { diff --git a/test/test-runner/src/net.rs b/test/test-runner/src/net.rs index a4a7a2db47..1de728a744 100644 --- a/test/test-runner/src/net.rs +++ b/test/test-runner/src/net.rs @@ -202,7 +202,7 @@ pub async fn send_ping( } #[cfg(unix)] -pub async fn get_interface_ip(interface: &str) -> Result<IpAddr, test_rpc::Error> { +pub fn get_interface_ip(interface: &str) -> Result<IpAddr, test_rpc::Error> { // TODO: IPv6 use std::net::Ipv4Addr; @@ -225,7 +225,7 @@ pub async fn get_interface_ip(interface: &str) -> Result<IpAddr, test_rpc::Error } #[cfg(target_os = "windows")] -pub async fn get_interface_ip(interface: &str) -> Result<IpAddr, test_rpc::Error> { +pub fn get_interface_ip(interface: &str) -> Result<IpAddr, test_rpc::Error> { // TODO: IPv6 get_interface_ip_for_family(interface, talpid_windows::net::AddressFamily::Ipv4) diff --git a/test/test-runner/src/sys.rs b/test/test-runner/src/sys.rs index 7363e38e72..ecc767d398 100644 --- a/test/test-runner/src/sys.rs +++ b/test/test-runner/src/sys.rs @@ -379,6 +379,7 @@ pub async fn set_daemon_log_level(verbosity_level: Verbosity) -> Result<(), test } #[cfg(target_os = "macos")] +#[allow(clippy::unused_async)] pub async fn set_daemon_log_level(_verbosity_level: Verbosity) -> Result<(), test_rpc::Error> { // TODO: Not implemented log::warn!("Setting log level is not implemented on macOS"); |
