summaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorLinus Färnstrand <linus@mullvad.net>2024-01-04 14:55:23 +0100
committerLinus Färnstrand <linus@mullvad.net>2024-01-04 18:06:21 +0100
commitd0ac040f21d28debd40573e814073e68e721bf1e (patch)
treef70cd8246317a272cf1f2c32cd2f4aedb6e075a7
parentb3c7168e673eaeff30fca3553e0070fe9e9d86e2 (diff)
downloadmullvadvpn-d0ac040f21d28debd40573e814073e68e721bf1e.tar.xz
mullvadvpn-d0ac040f21d28debd40573e814073e68e721bf1e.zip
Fix code not following new linting rules in testing framework
-rw-r--r--test/test-manager/src/logging.rs4
-rw-r--r--test/test-manager/src/network_monitor.rs2
-rw-r--r--test/test-manager/src/vm/update.rs2
-rw-r--r--test/test-rpc/src/logging.rs5
-rw-r--r--test/test-rpc/src/transport.rs2
-rw-r--r--test/test-runner/src/logging.rs4
6 files changed, 10 insertions, 9 deletions
diff --git a/test/test-manager/src/logging.rs b/test/test-manager/src/logging.rs
index c11fdf28bf..56f7401d65 100644
--- a/test/test-manager/src/logging.rs
+++ b/test/test-manager/src/logging.rs
@@ -79,12 +79,12 @@ impl Logger {
}
impl log::Log for Logger {
- fn enabled(&self, metadata: &log::Metadata) -> bool {
+ fn enabled(&self, metadata: &log::Metadata<'_>) -> bool {
let inner = self.inner.lock().unwrap();
inner.env_logger.enabled(metadata)
}
- fn log(&self, record: &log::Record) {
+ fn log(&self, record: &log::Record<'_>) {
if !self.enabled(record.metadata()) {
return;
}
diff --git a/test/test-manager/src/network_monitor.rs b/test/test-manager/src/network_monitor.rs
index 7f74f0f425..c48a660ba0 100644
--- a/test/test-manager/src/network_monitor.rs
+++ b/test/test-manager/src/network_monitor.rs
@@ -31,7 +31,7 @@ pub struct ParsedPacket {
impl PacketCodec for Codec {
type Item = Option<ParsedPacket>;
- fn decode(&mut self, packet: pcap::Packet) -> Self::Item {
+ fn decode(&mut self, packet: pcap::Packet<'_>) -> Self::Item {
if self.no_frame {
// skip utun header specifying an address family
#[cfg(target_os = "macos")]
diff --git a/test/test-manager/src/vm/update.rs b/test/test-manager/src/vm/update.rs
index f2ffef0051..ccc0c9b4a3 100644
--- a/test/test-manager/src/vm/update.rs
+++ b/test/test-manager/src/vm/update.rs
@@ -59,7 +59,7 @@ pub fn packages(config: &VmConfig, guest_ip: std::net::IpAddr) -> Result<Update>
// Pretty-printing for an `Update` action.
impl fmt::Display for Update {
- fn fmt(&self, formatter: &mut fmt::Formatter) -> fmt::Result {
+ fn fmt(&self, formatter: &mut fmt::Formatter<'_>) -> fmt::Result {
match self {
Update::Nothing => write!(formatter, "Nothing was updated"),
Update::Logs(output) => output
diff --git a/test/test-rpc/src/logging.rs b/test/test-rpc/src/logging.rs
index 85f25c8060..a2156f6d9b 100644
--- a/test/test-rpc/src/logging.rs
+++ b/test/test-rpc/src/logging.rs
@@ -1,5 +1,6 @@
use colored::Colorize;
use serde::{Deserialize, Serialize};
+use std::fmt;
pub type Result<T> = std::result::Result<T, Error>;
@@ -19,8 +20,8 @@ pub enum Output {
Other(String),
}
-impl std::fmt::Display for Output {
- fn fmt(&self, f: &mut std::fmt::Formatter) -> std::fmt::Result {
+impl fmt::Display for Output {
+ fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
match self {
Output::Error(s) => f.write_fmt(format_args!("{}", s.as_str().red())),
Output::Warning(s) => f.write_fmt(format_args!("{}", s.as_str().yellow())),
diff --git a/test/test-rpc/src/transport.rs b/test/test-rpc/src/transport.rs
index 291e08eb53..6a9f8b4588 100644
--- a/test/test-rpc/src/transport.rs
+++ b/test/test-rpc/src/transport.rs
@@ -107,7 +107,7 @@ impl ConnectionHandle {
}
/// Returns a future that is notified when `reset_connected_state` is called.
- pub fn notified_reset(&self) -> Notified {
+ pub fn notified_reset(&self) -> Notified<'_> {
self.reset_notify.notified()
}
diff --git a/test/test-runner/src/logging.rs b/test/test-runner/src/logging.rs
index 224c329775..98f033e13a 100644
--- a/test/test-runner/src/logging.rs
+++ b/test/test-runner/src/logging.rs
@@ -29,11 +29,11 @@ pub static LOGGER: Lazy<StdOutBuffer> = Lazy::new(|| {
pub struct StdOutBuffer(pub Mutex<Receiver<Output>>, pub Sender<Output>);
impl log::Log for StdOutBuffer {
- fn enabled(&self, metadata: &Metadata) -> bool {
+ fn enabled(&self, metadata: &Metadata<'_>) -> bool {
metadata.level() <= Level::Info
}
- fn log(&self, record: &Record) {
+ fn log(&self, record: &Record<'_>) {
if self.enabled(record.metadata()) {
match record.metadata().level() {
Level::Error => {