cargo clippy --fix

Author: michaelklishin

src/commons.rs

@@ -232,7 +232,7 @@ impl From<&SupportedProtocol> for String {
 impl fmt::Display for SupportedProtocol {
     fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
         let proto: String = self.into();
-        write!(f, "{}", proto)
+        write!(f, "{proto}")
     }
 }
 
@@ -360,7 +360,7 @@ impl Display for QueueType {
             QueueType::Quorum => write!(f, "quorum"),
             QueueType::Stream => write!(f, "stream"),
             QueueType::Delayed => write!(f, "delayed"),
-            QueueType::Unsupported(s) => write!(f, "{}", s),
+            QueueType::Unsupported(s) => write!(f, "{s}"),
         }
     }
 }

src/formatting.rs

@@ -98,7 +98,7 @@ impl Display for TagMap {
 impl Display for DeprecatedFeatureList {
     fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
         for df in &self.0 {
-            writeln!(f, "{}", df)?;
+            writeln!(f, "{df}")?;
         }
 
         Ok(())
@@ -142,7 +142,7 @@ impl Display for FeatureFlag {
 impl Display for FeatureFlagList {
     fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
         for ff in &self.0 {
-            writeln!(f, "{}", ff)?;
+            writeln!(f, "{ff}")?;
         }
 
         Ok(())
@@ -152,7 +152,7 @@ impl Display for FeatureFlagList {
 impl Display for MessageList {
     fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
         for msg in &self.0 {
-            writeln!(f, "{}", msg)?;
+            writeln!(f, "{msg}")?;
         }
 
         Ok(())
@@ -230,9 +230,9 @@ pub fn fmt_list_as_json_array(f: &mut fmt::Formatter<'_>, xs: &[String]) -> fmt:
             let mut xs = xs.to_owned();
             let last_element = xs.pop().unwrap();
             for elem in xs {
-                write!(f, "{}, ", elem)?;
+                write!(f, "{elem}, ")?;
             }
-            write!(f, "{}", last_element)?;
+            write!(f, "{last_element}")?;
             write!(f, "]")?;
             Ok(())
         }
@@ -248,9 +248,9 @@ pub fn fmt_comma_separated_list(f: &mut fmt::Formatter<'_>, xs: &[String]) -> fm
             let mut xs = xs.to_owned();
             let last_element = xs.pop().unwrap();
             for elem in xs {
-                write!(f, "{}, ", elem)?;
+                write!(f, "{elem}, ")?;
             }
-            write!(f, "{}", last_element)?;
+            write!(f, "{last_element}")?;
             Ok(())
         }
     }
@@ -265,9 +265,9 @@ pub fn fmt_vertical_list_with_bullets(f: &mut fmt::Formatter<'_>, xs: &[String])
             let mut xs = xs.to_owned();
             let last_element = xs.pop().unwrap();
             for elem in xs {
-                writeln!(f, "* {}", elem)?;
+                writeln!(f, "* {elem}")?;
             }
-            write!(f, "* {}", last_element)?;
+            write!(f, "* {last_element}")?;
             Ok(())
         }
     }
@@ -282,9 +282,9 @@ pub fn fmt_vertical_list_without_bullets(f: &mut fmt::Formatter<'_>, xs: &[Strin
             let mut xs = xs.to_owned();
             let last_element = xs.pop().unwrap();
             for elem in xs {
-                writeln!(f, "{}", elem)?;
+                writeln!(f, "{elem}")?;
             }
-            write!(f, "{}", last_element)?;
+            write!(f, "{last_element}")?;
             Ok(())
         }
     }
@@ -350,7 +350,7 @@ pub fn display_tag_list_option(opt: &Option<TagList>) -> String {
             let mut s = String::new();
             let iter = val.0.clone().into_iter();
             for t in iter {
-                let line = format!("{}\n", t);
+                let line = format!("{t}\n");
                 s += line.as_str()
             }
 

src/responses.rs

@@ -378,7 +378,7 @@ impl fmt::Display for NodeMemoryBreakdown {
         ];
 
         for (k, v) in data {
-            writeln!(f, "{}: {}", k, v)?;
+            writeln!(f, "{k}: {v}")?;
         }
 
         Ok(())

src/utils.rs

@@ -18,7 +18,7 @@ pub fn percentage(a: u64, b: u64) -> f64 {
 
 pub fn percentage_as_text(a: u64, b: u64) -> String {
     let p = percentage(a, b);
-    format!("{:.2}%", p)
+    format!("{p:.2}%")
 }
 
 #[macro_export]

tests/async_binding_tests.rs

@@ -32,20 +32,20 @@ async fn test_async_list_all_bindings() {
     let result1 = rc
         .declare_queue(vh_name, &QueueParams::new_durable_classic_queue(cq, None))
         .await;
-    assert!(result1.is_ok(), "declare_queue returned {:?}", result1);
+    assert!(result1.is_ok(), "declare_queue returned {result1:?}");
 
     let result2 = rc.bind_queue(vh_name, cq, fanout, None, None).await;
-    assert!(result2.is_ok(), "bind_queue returned {:?}", result2);
+    assert!(result2.is_ok(), "bind_queue returned {result2:?}");
 
     let result3 = rc.list_bindings().await;
-    assert!(result3.is_ok(), "list_bindings returned {:?}", result3);
+    assert!(result3.is_ok(), "list_bindings returned {result3:?}");
     let vec = result3.unwrap();
     assert!(vec
         .iter()
         .any(|b| b.destination == cq && b.source == fanout));
 
     let result4 = rc.list_bindings_in(vh_name).await;
-    assert!(result4.is_ok(), "list_bindings_in returned {:?}", result4);
+    assert!(result4.is_ok(), "list_bindings_in returned {result4:?}");
     let vec = result4.unwrap();
     assert!(vec
         .iter()
@@ -66,16 +66,15 @@ async fn test_async_list_only_queue_bindings() {
     let result1 = rc
         .declare_queue(vh_name, &QueueParams::new_durable_classic_queue(cq, None))
         .await;
-    assert!(result1.is_ok(), "declare_queue returned {:?}", result1);
+    assert!(result1.is_ok(), "declare_queue returned {result1:?}");
 
     let result2 = rc.bind_queue(vh_name, cq, fanout, None, None).await;
-    assert!(result2.is_ok(), "bind_queue returned {:?}", result2);
+    assert!(result2.is_ok(), "bind_queue returned {result2:?}");
 
     let result3 = rc.list_queue_bindings(vh_name, cq).await;
     assert!(
         result3.is_ok(),
-        "list_queue_bindings returned {:?}",
-        result3
+        "list_queue_bindings returned {result3:?}"
     );
     let vec = result3.unwrap();
     assert!(vec
@@ -104,28 +103,27 @@ async fn test_async_list_only_exchange_bindings() {
             &ExchangeParams::fanout(fanout2, false, false, None),
         )
         .await;
-    assert!(result1.is_ok(), "declare_exchange returned {:?}", result1);
+    assert!(result1.is_ok(), "declare_exchange returned {result1:?}");
 
     let result2 = rc
         .bind_exchange(vh_name, fanout1, fanout2, None, None)
         .await;
-    assert!(result2.is_ok(), "bind_exchange returned {:?}", result2);
+    assert!(result2.is_ok(), "bind_exchange returned {result2:?}");
 
     let result3 = rc
         .declare_queue(vh_name, &QueueParams::new_durable_classic_queue(cq, None))
         .await;
-    assert!(result3.is_ok(), "declare_queue returned {:?}", result3);
+    assert!(result3.is_ok(), "declare_queue returned {result3:?}");
 
     let result4 = rc.bind_queue(vh_name, cq, fanout1, None, None).await;
-    assert!(result4.is_ok(), "bind_queue returned {:?}", result4);
+    assert!(result4.is_ok(), "bind_queue returned {result4:?}");
 
     let result5 = rc
         .list_exchange_bindings_with_source(vh_name, fanout2)
         .await;
     assert!(
         result5.is_ok(),
-        "list_exchange_bindings_with_source returned {:?}",
-        result5
+        "list_exchange_bindings_with_source returned {result5:?}"
     );
     let vec = result5.unwrap();
     assert!(!vec
@@ -143,8 +141,7 @@ async fn test_async_list_only_exchange_bindings() {
         .await;
     assert!(
         result6.is_ok(),
-        "list_exchange_bindings_with_destination returned {:?}",
-        result6
+        "list_exchange_bindings_with_destination returned {result6:?}"
     );
     let vec = result6.unwrap();
     assert!(!vec
@@ -173,16 +170,15 @@ async fn test_async_delete_queue_bindings() {
     let result1 = rc
         .declare_queue(vh_name, &QueueParams::new_durable_classic_queue(cq, None))
         .await;
-    assert!(result1.is_ok(), "declare_queue returned {:?}", result1);
+    assert!(result1.is_ok(), "declare_queue returned {result1:?}");
 
     let result2 = rc.bind_queue(vh_name, cq, fanout, Some("foo"), None).await;
-    assert!(result2.is_ok(), "bind_queue returned {:?}", result2);
+    assert!(result2.is_ok(), "bind_queue returned {result2:?}");
 
     let result3 = rc.list_queue_bindings(vh_name, cq).await;
     assert!(
         result3.is_ok(),
-        "list_queue_bindings returned {:?}",
-        result3
+        "list_queue_bindings returned {result3:?}"
     );
     let vec = result3.unwrap();
     assert!(vec
@@ -203,13 +199,12 @@ async fn test_async_delete_queue_bindings() {
             Some(m),
         )
         .await;
-    assert!(result4.is_ok(), "delete_binding returned {:?}", result4);
+    assert!(result4.is_ok(), "delete_binding returned {result4:?}");
 
     let result5 = rc.list_queue_bindings(vh_name, cq).await;
     assert!(
         result5.is_ok(),
-        "list_queue_bindings returned {:?}",
-        result5
+        "list_queue_bindings returned {result5:?}"
     );
     let vec = result5.unwrap();
     assert!(!vec
@@ -234,15 +229,14 @@ async fn test_async_delete_exchange_bindings() {
     let result2 = rc
         .bind_exchange(vh_name, direct, fanout, Some("foo"), None)
         .await;
-    assert!(result2.is_ok(), "bind_queue returned {:?}", result2);
+    assert!(result2.is_ok(), "bind_queue returned {result2:?}");
 
     let result3 = rc
         .list_exchange_bindings_with_destination(vh_name, direct)
         .await;
     assert!(
         result3.is_ok(),
-        "list_exchange_bindings_with_destination returned {:?}",
-        result3
+        "list_exchange_bindings_with_destination returned {result3:?}"
     );
     let vec = result3.unwrap();
     assert!(vec
@@ -263,15 +257,14 @@ async fn test_async_delete_exchange_bindings() {
             Some(m),
         )
         .await;
-    assert!(result4.is_ok(), "delete_binding returned {:?}", result4);
+    assert!(result4.is_ok(), "delete_binding returned {result4:?}");
 
     let result5 = rc
         .list_exchange_bindings_with_destination(vh_name, direct)
         .await;
     assert!(
         result5.is_ok(),
-        "list_exchange_bindings_with_destination returned {:?}",
-        result5
+        "list_exchange_bindings_with_destination returned {result5:?}"
     );
     let vec = result5.unwrap();
     assert!(!vec

tests/async_channel_tests.rs

@@ -30,7 +30,7 @@ async fn test_list_channels() {
     assert!(ch.is_open());
 
     let result1 = rc.list_channels().await;
-    assert!(result1.is_ok(), "list_channels returned {:?}", result1);
+    assert!(result1.is_ok(), "list_channels returned {result1:?}");
 
     // just to be explicit
     ch.close().await.unwrap();
@@ -51,7 +51,7 @@ async fn test_list_virtual_host_channels() {
 
     let vh_name = "/";
     let result1 = rc.list_channels_in(vh_name).await;
-    assert!(result1.is_ok(), "list_channels_in returned {:?}", result1);
+    assert!(result1.is_ok(), "list_channels_in returned {result1:?}");
 
     // just to be explicit
     ch.close().await.unwrap();

tests/async_connection_tests.rs

@@ -29,7 +29,7 @@ async fn test_async_list_connections() {
     assert!(conn.is_open());
 
     let result1 = rc.list_connections().await;
-    assert!(result1.is_ok(), "list_connections returned {:?}", result1);
+    assert!(result1.is_ok(), "list_connections returned {result1:?}");
 
     conn.close().await.unwrap();
 }
@@ -42,8 +42,7 @@ async fn test_async_list_user_connections() {
     let result1 = rc.list_user_connections(USERNAME).await;
     assert!(
         result1.is_ok(),
-        "list_user_connections returned {:?}",
-        result1
+        "list_user_connections returned {result1:?}"
     );
 }
 
@@ -61,8 +60,7 @@ async fn test_async_list_virtual_host_connections() {
     let result1 = rc.list_connections_in(vh).await;
     assert!(
         result1.is_ok(),
-        "list_connections_in returned {:?}",
-        result1
+        "list_connections_in returned {result1:?}"
     );
 
     rc.delete_vhost(vh, true).await.unwrap();
@@ -76,8 +74,7 @@ async fn test_async_list_stream_connections() {
     let result1 = rc.list_stream_connections().await;
     assert!(
         result1.is_ok(),
-        "list_stream_connections returned {:?}",
-        result1
+        "list_stream_connections returned {result1:?}"
     );
 }
 
@@ -90,8 +87,7 @@ async fn test_async_list_virtual_host_stream_connections() {
     let result1 = rc.list_stream_connections_in(vh_name).await;
     assert!(
         result1.is_ok(),
-        "list_stream_connections returned {:?}",
-        result1
+        "list_stream_connections returned {result1:?}"
     );
 }
 
@@ -112,8 +108,7 @@ async fn test_async_close_user_connections() {
         .await;
     assert!(
         result1.is_ok(),
-        "close_user_connections returned {:?}",
-        result1
+        "close_user_connections returned {result1:?}"
     );
 
     tokio::time::sleep(Duration::from_millis(50)).await;

tests/async_consumer_tests.rs

@@ -22,7 +22,7 @@ async fn test_async_list_consumers() {
     let rc = Client::new(&endpoint, USERNAME, PASSWORD);
 
     let result1 = rc.list_consumers().await;
-    assert!(result1.is_ok(), "list_consumers returned {:?}", result1);
+    assert!(result1.is_ok(), "list_consumers returned {result1:?}");
 }
 
 #[tokio::test]
@@ -35,7 +35,7 @@ async fn test_async_list_vhost_consumers() {
     assert!(result1.is_ok());
 
     let result2 = rc.list_consumers_in(vh_params.name).await;
-    assert!(result2.is_ok(), "list_consumers_in returned {:?}", result2);
+    assert!(result2.is_ok(), "list_consumers_in returned {result2:?}");
 
     rc.delete_vhost(vh_params.name, true).await.unwrap();
 }