Merge branch 'rust-1.80-fixes-test-manager'

4 files changed, 21 insertions, 27 deletions

diff --git a/test/Cargo.toml b/test/Cargo.toml
index 386bab87c4..4f8b1931be 100644
--- a/test/Cargo.toml
+++ b/test/Cargo.toml
@@ -21,7 +21,7 @@ members = [
 non_ascii_idents = "forbid"
 
 # Deny old style Rust
-rust_2018_idioms = "deny"
+rust_2018_idioms = { level = "deny", priority = -1 }
 macro_use_extern_crate = "deny"
 absolute_paths_not_starting_with_crate = "deny"
 
diff --git a/test/test-manager/src/tests/helpers.rs b/test/test-manager/src/tests/helpers.rs
index adefedcf98..cde1176781 100644
--- a/test/test-manager/src/tests/helpers.rs
+++ b/test/test-manager/src/tests/helpers.rs
@@ -349,8 +349,8 @@ pub async fn ensure_logged_in(
 /// - `Result::Ok(new_state)` if the daemon successfully connected to a tunnel
 /// - `Result::Err` if:
 ///     - The daemon failed to even begin connecting. Then [`Error::Rpc`] is returned.
-///     - The daemon started to connect but ended up in the [`TunnelState::Error`] state.
-///     Then [`Error::UnexpectedErrorState`] is returned
+///     - The daemon started to connect but ended up in the [`TunnelState::Error`] state. Then
+///       [`Error::UnexpectedErrorState`] is returned
 pub async fn connect_and_wait(
     mullvad_client: &mut MullvadProxyClient,
 ) -> Result<TunnelState, Error> {
diff --git a/test/test-manager/test_macro/src/lib.rs b/test/test-manager/test_macro/src/lib.rs
index 7e19990b97..0249f9db6c 100644
--- a/test/test-manager/test_macro/src/lib.rs
+++ b/test/test-manager/test_macro/src/lib.rs
@@ -7,39 +7,33 @@ use test_rpc::meta::Os;
 ///
 /// The `test_function` macro will inject two arguments to your function:
 ///
-/// * `rpc` - a [`test_rpc::client::ServiceClient]` used to make
-/// remote-procedure calls inside the virtual machine running the test. This can
-/// be used to perform arbitrary network requests, inspect the local file
-/// system, rebooting ..
+/// * `rpc` - a [`test_rpc::client::ServiceClient]` used to make remote-procedure calls inside the
+///   virtual machine running the test. This can be used to perform arbitrary network requests,
+///   inspect the local file system, rebooting ..
 ///
-/// * `mullvad_client` - a [`mullvad_management_interface::MullvadProxyClient`]
-/// which provides a bi-directional communication channel with the
-/// `mullvad-daemon` running inside of the virtual machine. All RPC-calls as
-/// defined in [`mullvad_management_interface::MullvadProxyClient`] are
-/// available on `mullvad_client`.
+/// * `mullvad_client` - a [`mullvad_management_interface::MullvadProxyClient`] which provides a
+///   bi-directional communication channel with the `mullvad-daemon` running inside of the virtual
+///   machine. All RPC-calls as defined in [`mullvad_management_interface::MullvadProxyClient`] are
+///   available on `mullvad_client`.
 ///
 /// # Arguments
 ///
 /// The `test_function` macro takes 4 optional arguments
 ///
-/// * `priority` - The order in which tests will be run where low numbers run
-/// before high numbers and tests with the same number run in undefined order.
-/// `priority` defaults to 0.
+/// * `priority` - The order in which tests will be run where low numbers run before high numbers
+///   and tests with the same number run in undefined order. `priority` defaults to 0.
 ///
-/// * `cleanup` - If the cleanup function will run after the test is finished
-/// and among other things reset the settings to the default value for the
-/// daemon.
-/// `cleanup` defaults to true.
+/// * `cleanup` - If the cleanup function will run after the test is finished and among other things
+///   reset the settings to the default value for the daemon. `cleanup` defaults to true.
 ///
-/// * `must_succeed` - If the testing suite stops running if this test fails.
-/// `must_succeed` defaults to false.
+/// * `must_succeed` - If the testing suite stops running if this test fails. `must_succeed`
+///   defaults to false.
 ///
-/// * `always_run` - If the test should always run regardless of what test
-/// filters are provided by the user.
-/// `always_run` defaults to false.
+/// * `always_run` - If the test should always run regardless of what test filters are provided by
+///   the user. `always_run` defaults to false.
 ///
-/// * `target_os` - The test should only run on the specified OS. This can currently be
-/// set to `linux`, `windows`, or `macos`.
+/// * `target_os` - The test should only run on the specified OS. This can currently be set to
+///   `linux`, `windows`, or `macos`.
 ///
 /// # Examples
 ///
diff --git a/test/test-rpc/src/client.rs b/test/test-rpc/src/client.rs
index 4c56601d75..0c621e8936 100644
--- a/test/test-rpc/src/client.rs
+++ b/test/test-rpc/src/client.rs
@@ -326,7 +326,7 @@ impl ServiceClient {
     /// # Returns
     /// - `Result::Ok(env)` if the current environment variables could be read.
     /// - `Result::Err(Error)` if communication with the daemon failed or the environment values
-    /// could not be parsed.
+    ///   could not be parsed.
     pub async fn get_daemon_environment(&self) -> Result<HashMap<String, String>, Error> {
         let env = self
             .client