cargo fmt

Signed-off-by: Matthias Beyer <mail@beyermatthias.de>

16 files changed, 112 insertions, 114 deletions

diff --git a/mqtt-tester/src/behaviour/connack_flags_are_set_as_reserved.rs b/mqtt-tester/src/behaviour/connack_flags_are_set_as_reserved.rs
index 5ca0a98..2801cc4 100644
--- a/mqtt-tester/src/behaviour/connack_flags_are_set_as_reserved.rs
+++ b/mqtt-tester/src/behaviour/connack_flags_are_set_as_reserved.rs
@@ -6,12 +6,11 @@
 
 use miette::Context;
 
-use crate::{
-    behaviour_test::BehaviourTest,
-    command::{Input, Output},
-    executable::ClientExecutableCommand,
-    report::ReportResult,
-};
+use crate::behaviour_test::BehaviourTest;
+use crate::command::Input;
+use crate::command::Output;
+use crate::executable::ClientExecutableCommand;
+use crate::report::ReportResult;
 
 pub struct ConnackFlagsAreSetAsReserved;
 
diff --git a/mqtt-tester/src/behaviour/first_packet_from_client_is_connect.rs b/mqtt-tester/src/behaviour/first_packet_from_client_is_connect.rs
index acebb3c..4563eaf 100644
--- a/mqtt-tester/src/behaviour/first_packet_from_client_is_connect.rs
+++ b/mqtt-tester/src/behaviour/first_packet_from_client_is_connect.rs
@@ -7,12 +7,11 @@
 use miette::Context;
 use mqtt_format::v3::packet::MPacket;
 
-use crate::{
-    behaviour_test::BehaviourTest,
-    command::{Input, Output},
-    executable::ClientExecutableCommand,
-    report::ReportResult,
-};
+use crate::behaviour_test::BehaviourTest;
+use crate::command::Input;
+use crate::command::Output;
+use crate::executable::ClientExecutableCommand;
+use crate::report::ReportResult;
 
 pub struct FirstPacketFromClientIsConnect;
 
diff --git a/mqtt-tester/src/behaviour/invalid_first_packet_is_rejected.rs b/mqtt-tester/src/behaviour/invalid_first_packet_is_rejected.rs
index 0eae173..4883c49 100644
--- a/mqtt-tester/src/behaviour/invalid_first_packet_is_rejected.rs
+++ b/mqtt-tester/src/behaviour/invalid_first_packet_is_rejected.rs
@@ -5,14 +5,14 @@
 //
 
 use miette::Context;
-use mqtt_format::v3::{packet::MConnect, strings::MString};
+use mqtt_format::v3::packet::MConnect;
+use mqtt_format::v3::strings::MString;
 
-use crate::{
-    behaviour_test::BehaviourTest,
-    command::{Input, Output},
-    executable::ClientExecutableCommand,
-    report::ReportResult,
-};
+use crate::behaviour_test::BehaviourTest;
+use crate::command::Input;
+use crate::command::Output;
+use crate::executable::ClientExecutableCommand;
+use crate::report::ReportResult;
 
 pub struct InvalidFirstPacketIsRejected;
 
diff --git a/mqtt-tester/src/behaviour/invalid_utf8_is_rejected.rs b/mqtt-tester/src/behaviour/invalid_utf8_is_rejected.rs
index 617a76e..388ecda 100644
--- a/mqtt-tester/src/behaviour/invalid_utf8_is_rejected.rs
+++ b/mqtt-tester/src/behaviour/invalid_utf8_is_rejected.rs
@@ -5,14 +5,14 @@
 //
 
 use miette::Context;
-use mqtt_format::v3::{connect_return::MConnectReturnCode, packet::MConnack};
+use mqtt_format::v3::connect_return::MConnectReturnCode;
+use mqtt_format::v3::packet::MConnack;
 
-use crate::{
-    behaviour_test::BehaviourTest,
-    command::{Input, Output},
-    executable::ClientExecutableCommand,
-    report::ReportResult,
-};
+use crate::behaviour_test::BehaviourTest;
+use crate::command::Input;
+use crate::command::Output;
+use crate::executable::ClientExecutableCommand;
+use crate::report::ReportResult;
 
 pub struct InvalidUtf8IsRejected;
 
diff --git a/mqtt-tester/src/behaviour/publish_qos_2_is_acked.rs b/mqtt-tester/src/behaviour/publish_qos_2_is_acked.rs
index 0ef2e17..6d1e7a9 100644
--- a/mqtt-tester/src/behaviour/publish_qos_2_is_acked.rs
+++ b/mqtt-tester/src/behaviour/publish_qos_2_is_acked.rs
@@ -5,20 +5,18 @@
 //
 
 use miette::Context;
-use mqtt_format::v3::{
-    connect_return::MConnectReturnCode,
-    identifier::MPacketIdentifier,
-    packet::{MConnack, MPublish},
-    qos::MQualityOfService,
-    strings::MString,
-};
+use mqtt_format::v3::connect_return::MConnectReturnCode;
+use mqtt_format::v3::identifier::MPacketIdentifier;
+use mqtt_format::v3::packet::MConnack;
+use mqtt_format::v3::packet::MPublish;
+use mqtt_format::v3::qos::MQualityOfService;
+use mqtt_format::v3::strings::MString;
 
-use crate::{
-    behaviour_test::BehaviourTest,
-    command::{Input, Output},
-    executable::ClientExecutableCommand,
-    report::ReportResult,
-};
+use crate::behaviour_test::BehaviourTest;
+use crate::command::Input;
+use crate::command::Output;
+use crate::executable::ClientExecutableCommand;
+use crate::report::ReportResult;
 
 pub struct PublishQos2IsAcked;
 
diff --git a/mqtt-tester/src/behaviour/publish_qos_zero_with_ident_fails.rs b/mqtt-tester/src/behaviour/publish_qos_zero_with_ident_fails.rs
index d913ddd..fba3567 100644
--- a/mqtt-tester/src/behaviour/publish_qos_zero_with_ident_fails.rs
+++ b/mqtt-tester/src/behaviour/publish_qos_zero_with_ident_fails.rs
@@ -5,20 +5,18 @@
 //
 
 use miette::Context;
-use mqtt_format::v3::{
-    connect_return::MConnectReturnCode,
-    identifier::MPacketIdentifier,
-    packet::{MConnack, MPublish},
-    qos::MQualityOfService,
-    strings::MString,
-};
+use mqtt_format::v3::connect_return::MConnectReturnCode;
+use mqtt_format::v3::identifier::MPacketIdentifier;
+use mqtt_format::v3::packet::MConnack;
+use mqtt_format::v3::packet::MPublish;
+use mqtt_format::v3::qos::MQualityOfService;
+use mqtt_format::v3::strings::MString;
 
-use crate::{
-    behaviour_test::BehaviourTest,
-    command::{Input, Output},
-    executable::ClientExecutableCommand,
-    report::ReportResult,
-};
+use crate::behaviour_test::BehaviourTest;
+use crate::command::Input;
+use crate::command::Output;
+use crate::executable::ClientExecutableCommand;
+use crate::report::ReportResult;
 
 pub struct PublishQosZeroWithIdentFails;
 
diff --git a/mqtt-tester/src/behaviour/receiving_server_packet.rs b/mqtt-tester/src/behaviour/receiving_server_packet.rs
index 0df9842..34ea777 100644
--- a/mqtt-tester/src/behaviour/receiving_server_packet.rs
+++ b/mqtt-tester/src/behaviour/receiving_server_packet.rs
@@ -5,19 +5,17 @@
 //
 
 use miette::Context;
-use mqtt_format::v3::{
-    connect_return::MConnectReturnCode,
-    identifier::MPacketIdentifier,
-    packet::{MConnack, MSubscribe},
-    subscription_request::MSubscriptionRequests,
-};
+use mqtt_format::v3::connect_return::MConnectReturnCode;
+use mqtt_format::v3::identifier::MPacketIdentifier;
+use mqtt_format::v3::packet::MConnack;
+use mqtt_format::v3::packet::MSubscribe;
+use mqtt_format::v3::subscription_request::MSubscriptionRequests;
 
-use crate::{
-    behaviour_test::BehaviourTest,
-    command::{Input, Output},
-    executable::ClientExecutableCommand,
-    report::ReportResult,
-};
+use crate::behaviour_test::BehaviourTest;
+use crate::command::Input;
+use crate::command::Output;
+use crate::executable::ClientExecutableCommand;
+use crate::report::ReportResult;
 
 pub struct ReceivingServerPacket;
 
diff --git a/mqtt-tester/src/behaviour/utf8_with_nullchar_is_rejected.rs b/mqtt-tester/src/behaviour/utf8_with_nullchar_is_rejected.rs
index 676c0e2..91c87f3 100644
--- a/mqtt-tester/src/behaviour/utf8_with_nullchar_is_rejected.rs
+++ b/mqtt-tester/src/behaviour/utf8_with_nullchar_is_rejected.rs
@@ -5,17 +5,16 @@
 //
 
 use miette::Context;
-use mqtt_format::v3::{
-    connect_return::MConnectReturnCode, header::MPacketKind, packet::MConnack,
-    qos::MQualityOfService,
-};
+use mqtt_format::v3::connect_return::MConnectReturnCode;
+use mqtt_format::v3::header::MPacketKind;
+use mqtt_format::v3::packet::MConnack;
+use mqtt_format::v3::qos::MQualityOfService;
 
-use crate::{
-    behaviour_test::BehaviourTest,
-    command::{Input, Output},
-    executable::ClientExecutableCommand,
-    report::ReportResult,
-};
+use crate::behaviour_test::BehaviourTest;
+use crate::command::Input;
+use crate::command::Output;
+use crate::executable::ClientExecutableCommand;
+use crate::report::ReportResult;
 
 pub struct Utf8WithNullcharIsRejected;
 
diff --git a/mqtt-tester/src/behaviour/wait_for_connect.rs b/mqtt-tester/src/behaviour/wait_for_connect.rs
index 7737b96..3c79d4e 100644
--- a/mqtt-tester/src/behaviour/wait_for_connect.rs
+++ b/mqtt-tester/src/behaviour/wait_for_connect.rs
@@ -5,14 +5,14 @@
 //
 
 use miette::Context;
-use mqtt_format::v3::{connect_return::MConnectReturnCode, packet::MConnack};
-
-use crate::{
-    behaviour_test::BehaviourTest,
-    command::{Input, Output},
-    executable::ClientExecutableCommand,
-    report::ReportResult,
-};
+use mqtt_format::v3::connect_return::MConnectReturnCode;
+use mqtt_format::v3::packet::MConnack;
+
+use crate::behaviour_test::BehaviourTest;
+use crate::command::Input;
+use crate::command::Output;
+use crate::executable::ClientExecutableCommand;
+use crate::report::ReportResult;
 
 pub struct WaitForConnect;
 
diff --git a/mqtt-tester/src/behaviour_test.rs b/mqtt-tester/src/behaviour_test.rs
index 9885d51..57f59fb 100644
--- a/mqtt-tester/src/behaviour_test.rs
+++ b/mqtt-tester/src/behaviour_test.rs
@@ -4,11 +4,10 @@
 //   file, You can obtain one at http://mozilla.org/MPL/2.0/.
 //
 
-use crate::{
-    command::{Input, Output},
-    executable::ClientExecutableCommand,
-    report::ReportResult,
-};
+use crate::command::Input;
+use crate::command::Output;
+use crate::executable::ClientExecutableCommand;
+use crate::report::ReportResult;
 
 #[async_trait::async_trait]
 pub trait BehaviourTest {
diff --git a/mqtt-tester/src/client_report.rs b/mqtt-tester/src/client_report.rs
index 17c91b1..301a1d8 100644
--- a/mqtt-tester/src/client_report.rs
+++ b/mqtt-tester/src/client_report.rs
@@ -8,16 +8,17 @@ use std::path::PathBuf;
 use std::sync::Arc;
 
 use futures::FutureExt;
-
 use miette::Context;
-use mqtt_format::v3::packet::{MConnect, MPacket};
+use mqtt_format::v3::packet::MConnect;
+use mqtt_format::v3::packet::MPacket;
 
 use crate::behaviour_test::BehaviourTest;
 use crate::executable::ClientExecutable;
 use crate::invariant::connect_packet_protocol_name::ConnectPacketProtocolName;
 use crate::invariant::no_username_means_no_password::NoUsernameMeansNoPassword;
 use crate::packet_invariant::PacketInvariant;
-use crate::report::{Report, ReportResult};
+use crate::report::Report;
+use crate::report::ReportResult;
 
 pub async fn create_client_report(
     client_exe_path: PathBuf,
diff --git a/mqtt-tester/src/command.rs b/mqtt-tester/src/command.rs
index e0b531a..516267f 100644
--- a/mqtt-tester/src/command.rs
+++ b/mqtt-tester/src/command.rs
@@ -6,16 +6,18 @@
 
 use std::sync::Arc;
 
-use bytes::{BufMut, BytesMut};
+use bytes::BufMut;
+use bytes::BytesMut;
 use miette::IntoDiagnostic;
 use mqtt_format::v3::packet::MPacket;
-use tokio::{
-    io::{AsyncReadExt, AsyncWriteExt},
-    process::{ChildStdin, ChildStdout},
-};
+use tokio::io::AsyncReadExt;
+use tokio::io::AsyncWriteExt;
+use tokio::process::ChildStdin;
+use tokio::process::ChildStdout;
 use tracing::Instrument;
 
-use crate::{packet_invariant::PacketInvariant, report::ReportResult};
+use crate::packet_invariant::PacketInvariant;
+use crate::report::ReportResult;
 
 pub struct Command {
     inner: tokio::process::Command,
diff --git a/mqtt-tester/src/invariant/connect_packet_protocol_name.rs b/mqtt-tester/src/invariant/connect_packet_protocol_name.rs
index c9848ec..19b637d 100644
--- a/mqtt-tester/src/invariant/connect_packet_protocol_name.rs
+++ b/mqtt-tester/src/invariant/connect_packet_protocol_name.rs
@@ -4,15 +4,13 @@
 //   file, You can obtain one at http://mozilla.org/MPL/2.0/.
 //
 
-use mqtt_format::v3::{
-    packet::{MConnect, MPacket},
-    strings::MString,
-};
+use mqtt_format::v3::packet::MConnect;
+use mqtt_format::v3::packet::MPacket;
+use mqtt_format::v3::strings::MString;
 
-use crate::{
-    packet_invariant::PacketInvariant,
-    report::{Report, ReportResult},
-};
+use crate::packet_invariant::PacketInvariant;
+use crate::report::Report;
+use crate::report::ReportResult;
 
 pub struct ConnectPacketProtocolName;
 
diff --git a/mqtt-tester/src/invariant/no_username_means_no_password.rs b/mqtt-tester/src/invariant/no_username_means_no_password.rs
index 9253bdc..81d02a3 100644
--- a/mqtt-tester/src/invariant/no_username_means_no_password.rs
+++ b/mqtt-tester/src/invariant/no_username_means_no_password.rs
@@ -4,12 +4,12 @@
 //   file, You can obtain one at http://mozilla.org/MPL/2.0/.
 //
 
-use mqtt_format::v3::packet::{MConnect, MPacket};
+use mqtt_format::v3::packet::MConnect;
+use mqtt_format::v3::packet::MPacket;
 
-use crate::{
-    packet_invariant::PacketInvariant,
-    report::{Report, ReportResult},
-};
+use crate::packet_invariant::PacketInvariant;
+use crate::report::Report;
+use crate::report::ReportResult;
 
 pub struct NoUsernameMeansNoPassword;
 
diff --git a/mqtt-tester/src/main.rs b/mqtt-tester/src/main.rs
index 9a68848..e5d9ff8 100644
--- a/mqtt-tester/src/main.rs
+++ b/mqtt-tester/src/main.rs
@@ -13,13 +13,17 @@ mod invariant;
 mod packet_invariant;
 mod report;
 
-use std::{path::PathBuf, process::exit};
+use std::path::PathBuf;
+use std::process::exit;
 
-use clap::{Parser, Subcommand};
+use clap::Parser;
+use clap::Subcommand;
 use client_report::create_client_report;
 use miette::IntoDiagnostic;
-use report::{print_report, ReportResult};
-use tracing_subscriber::{layer::SubscriberExt, util::SubscriberInitExt};
+use report::print_report;
+use report::ReportResult;
+use tracing_subscriber::layer::SubscriberExt;
+use tracing_subscriber::util::SubscriberInitExt;
 
 #[derive(Parser, Debug)]
 #[clap(author, version)]
diff --git a/mqtt-tester/src/report.rs b/mqtt-tester/src/report.rs
index d7e7531..17aecfa 100644
--- a/mqtt-tester/src/report.rs
+++ b/mqtt-tester/src/report.rs
@@ -51,7 +51,10 @@ impl std::fmt::Debug for Report {
 }
 
 pub fn print_report(report: &Report, mut writer: impl Write) -> Result<(), std::io::Error> {
-    use ansi_term::Colour::{Blue, Green, Red, Yellow};
+    use ansi_term::Colour::Blue;
+    use ansi_term::Colour::Green;
+    use ansi_term::Colour::Red;
+    use ansi_term::Colour::Yellow;
     write!(writer, "{} ... ", Blue.paint(&report.name))?;
 
     match report.result {