Merge pull request fussybeaver#213 from edmorley/fix-clippy-tests

Fix Clippy warnings in examples and tests

Author: fussybeaver

.circleci/config.yml

@@ -45,7 +45,7 @@ jobs:
       - checkout
       - setup_remote_docker
       - run: docker build -t bollard .
-      - run: docker run -ti --rm bollard bash -c "rustup component add clippy && cargo clippy -- -Dwarnings -Aclippy::upper_case_acronyms"
+      - run: docker run -ti --rm bollard bash -c "rustup component add clippy && cargo clippy --all-targets -- -Dwarnings -Aclippy::upper_case_acronyms"
   test_audit:
     docker:
       - image: docker:20.10.11

examples/attach_container.rs

@@ -18,7 +18,7 @@ use tokio::io::AsyncWriteExt;
 use tokio::task::spawn;
 use tokio::time::sleep;
 
-const IMAGE: &'static str = "alpine:3";
+const IMAGE: &str = "alpine:3";
 
 #[tokio::main]
 async fn main() -> Result<(), Box<dyn std::error::Error + 'static>> {
@@ -88,7 +88,7 @@ async fn main() -> Result<(), Box<dyn std::error::Error + 'static>> {
 
         // pipe docker attach output into stdout
         while let Some(Ok(output)) = output.next().await {
-            stdout.write(output.into_bytes().as_ref())?;
+            stdout.write_all(output.into_bytes().as_ref())?;
             stdout.flush()?;
         }
     }

examples/error.rs

@@ -13,6 +13,4 @@ fn run() -> Result<(), Box<dyn std::error::Error>> {
 
 fn main() {
     run().unwrap();
-
-    ()
 }

examples/exec.rs

@@ -8,7 +8,7 @@ use bollard::image::CreateImageOptions;
 use futures_util::stream::StreamExt;
 use futures_util::TryStreamExt;
 
-const IMAGE: &'static str = "alpine:3";
+const IMAGE: &str = "alpine:3";
 
 #[tokio::main]
 async fn main() -> Result<(), Box<dyn std::error::Error + 'static>> {

examples/exec_term.rs

@@ -17,7 +17,7 @@ use tokio::io::AsyncWriteExt;
 use tokio::task::spawn;
 use tokio::time::sleep;
 
-const IMAGE: &'static str = "alpine:3";
+const IMAGE: &str = "alpine:3";
 
 #[tokio::main]
 async fn main() -> Result<(), Box<dyn std::error::Error + 'static>> {
@@ -98,7 +98,7 @@ async fn main() -> Result<(), Box<dyn std::error::Error + 'static>> {
 
         // pipe docker exec output into stdout
         while let Some(Ok(output)) = output.next().await {
-            stdout.write(output.into_bytes().as_ref())?;
+            stdout.write_all(output.into_bytes().as_ref())?;
             stdout.flush()?;
         }
     }

examples/info.rs

@@ -10,7 +10,7 @@ use std::default::Default;
 use futures_util::stream;
 use futures_util::stream::StreamExt;
 
-async fn conc(arg: (Docker, &ContainerSummary)) -> () {
+async fn conc(arg: (Docker, &ContainerSummary)) {
     let (docker, container) = arg;
     println!(
         "{:?}",

examples/kafka.rs

@@ -9,8 +9,8 @@ use futures_util::stream::select;
 use futures_util::stream::StreamExt;
 use futures_util::stream::TryStreamExt;
 
-const KAFKA_IMAGE: &'static str = "confluentinc/cp-kafka:5.0.1";
-const ZOOKEEPER_IMAGE: &'static str = "confluentinc/cp-zookeeper:5.0.1";
+const KAFKA_IMAGE: &str = "confluentinc/cp-kafka:5.0.1";
+const ZOOKEEPER_IMAGE: &str = "confluentinc/cp-zookeeper:5.0.1";
 
 #[tokio::main]
 async fn main() -> Result<(), Box<dyn std::error::Error + 'static>> {

examples/top.rs

@@ -48,13 +48,13 @@ async fn main() -> Result<(), Box<dyn std::error::Error + 'static>> {
     {
         if let Some(p) = p.get(0) {
             print!("{}", name);
-            for mut v in p.to_vec() {
+            for mut v in p.iter().cloned() {
                 if v.len() > 30 {
                     v.truncate(30);
                 }
                 print!("\t{}", v);
             }
-            print!("\n");
+            println!();
         }
     }
 

src/docker.rs

@@ -403,7 +403,9 @@ impl Docker {
 
         let mut root_store = rustls::RootCertStore::empty();
         for cert in rustls_native_certs::load_native_certs()? {
-            root_store.add(&rustls::Certificate(cert.0)).map_err(|err| NoNativeCertsError{ err })?;
+            root_store
+                .add(&rustls::Certificate(cert.0))
+                .map_err(|err| NoNativeCertsError { err })?;
         }
 
         root_store.add_server_trust_anchors(webpki_roots::TLS_SERVER_ROOTS.0.iter().map(|ta| {

src/read.rs

@@ -142,25 +142,24 @@ where
                         src.truncate(src.len() - 1); // Remove the newline
                         src.unsplit(remainder);
                         Ok(None)
-                    },
+                    }
                     Ok(json) => {
                         // Newline delimited json
                         src.unsplit(remainder);
                         src.advance(pos + 1);
                         Ok(json)
-                    },
-                    Err(e) => Err(e)
+                    }
+                    Err(e) => Err(e),
                 }
-            
             } else {
-                // No newline delimited json. 
+                // No newline delimited json.
                 match decode_json_from_slice(src) {
                     Ok(None) => Ok(None),
                     Ok(json) => {
                         src.clear();
                         Ok(json)
-                    },
-                    Err(e) => Err(e)
+                    }
+                    Err(e) => Err(e),
                 }
             }
         } else {
@@ -341,7 +340,10 @@ mod tests {
         let mut buf = BytesMut::from(&b"\"foo\\nbar\""[..]);
         let mut codec: JsonLineDecoder<String> = JsonLineDecoder::new();
 
-        assert_eq!(codec.decode(&mut buf).unwrap(), Some(String::from("foo\nbar")));
+        assert_eq!(
+            codec.decode(&mut buf).unwrap(),
+            Some(String::from("foo\nbar"))
+        );
     }
 
     #[test]