fix clippy and CI

Author: dignifiedquire

.github/workflows/ci.yml

@@ -42,7 +42,7 @@ jobs:
       uses: actions-rs/cargo@v1
       with:
         command: test
-        args: --all
+        args: --all --no-default-features --features file-transport smtp-transport
 
   check_fmt_and_docs:
     name: Checking fmt and docs
@@ -64,13 +64,15 @@ jobs:
       run: cargo doc
 
   clippy_check:
-    name: Clippy check
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v1
-      - name: Install rust
-        run: rustup update beta && rustup default beta
-      - name: Install clippy
-        run: rustup component add clippy
-      - name: clippy
-        run: cargo clippy --all
+      - uses: actions-rs/toolchain@v1
+        with:
+            toolchain: nightly
+            components: clippy
+            override: true
+      - uses: actions-rs/clippy-check@v1
+        with:
+          token: ${{ secrets.GITHUB_TOKEN }}
+          args: --all-features

src/file/mod.rs

@@ -9,7 +9,6 @@ use async_std::fs::File;
 use async_std::path::Path;
 use async_std::prelude::*;
 use async_trait::async_trait;
-use serde_json;
 
 use crate::file::error::FileResult;
 use crate::Envelope;

src/lib.rs

@@ -8,8 +8,7 @@
     unstable_features,
     unused_import_braces,
     missing_debug_implementations,
-    clippy::result_unwrap_used,
-    clippy::option_unwrap_used
+    clippy::unwrap_used
 )]
 
 pub mod error;

src/sendmail/mod.rs

@@ -40,7 +40,7 @@ impl SendmailTransport {
     }
 }
 
-#[allow(clippy::option_unwrap_used)]
+#[allow(clippy::unwrap_used)]
 #[async_trait]
 impl<'a> Transport<'a> for SendmailTransport {
     type Result = SendmailResult;

src/smtp/commands.rs

@@ -285,7 +285,7 @@ impl AuthCommand {
         challenge: Option<String>,
     ) -> Result<AuthCommand, Error> {
         let response = if mechanism.supports_initial_response() || challenge.is_some() {
-            Some(mechanism.response(&credentials, challenge.as_ref().map(String::as_str))?)
+            Some(mechanism.response(&credentials, challenge.as_deref())?)
         } else {
             None
         };

src/smtp/extension.rs

@@ -133,7 +133,7 @@ impl ServerInfo {
             }
 
             let split: Vec<&str> = line.split_whitespace().collect();
-            match split.get(0).map(|s| *s) {
+            match split.get(0).copied() {
                 Some("8BITMIME") => {
                     features.insert(Extension::EightBitMime);
                 }

src/smtp/response.rs

@@ -166,10 +166,10 @@ impl Response {
 
     /// Tells if the response is positive
     pub fn is_positive(&self) -> bool {
-        match self.code.severity {
-            Severity::PositiveCompletion | Severity::PositiveIntermediate => true,
-            _ => false,
-        }
+        matches!(
+            self.code.severity,
+            Severity::PositiveCompletion | Severity::PositiveIntermediate
+        )
     }
 
     /// Tests code equality

src/smtp/smtp_client.rs

@@ -407,7 +407,7 @@ impl<'a> SmtpTransport {
                     try_smtp!(client.command(StarttlsCommand).await, self);
                 }
 
-                let client = std::mem::replace(&mut self.client, InnerClient::default());
+                let client = std::mem::take(&mut self.client);
                 let ssl_client = client.upgrade_tls_stream(tls_parameters).await?;
                 self.client = ssl_client;
 
@@ -552,11 +552,7 @@ impl<'a> Transport<'a> for SmtpTransport {
                 "{}: conn_use={}, status=sent ({})",
                 message_id,
                 self.state.connection_reuse_count,
-                result
-                    .message
-                    .iter()
-                    .next()
-                    .unwrap_or(&"no response".to_string())
+                result.message.get(0).unwrap_or(&"no response".to_string())
             );
         }