From 24af7de14c5e1767a64157ed16398e3ae2acb3e1 Mon Sep 17 00:00:00 2001
From: Steven Fackler <sfackler@gmail.com>
Date: Fri, 5 Jun 2020 13:33:13 -0700
Subject: [PATCH] fix clippy

---
 .github/workflows/ci.yml | 2 +-
 openssl/src/envelope.rs  | 1 +
 openssl/src/error.rs     | 1 +
 openssl/src/stack.rs     | 2 +-
 4 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 28b62e97..49c1acfd 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -54,7 +54,7 @@ jobs:
         with:
           path: target
           key: clippy-target-${{ runner.os }}-${{ steps.rust-version.outputs.version }}-${{ hashFiles('Cargo.lock') }}
-      - name: Run clippy clippy
+      - name: Run clippy
         run: cargo clippy --all --all-targets
 
   min-version:
diff --git a/openssl/src/envelope.rs b/openssl/src/envelope.rs
index 22a14117..bd4e1b43 100644
--- a/openssl/src/envelope.rs
+++ b/openssl/src/envelope.rs
@@ -92,6 +92,7 @@ impl Seal {
     }
 
     /// Returns the initialization vector, if the cipher uses one.
+    #[allow(clippy::option_as_ref_deref)]
     pub fn iv(&self) -> Option<&[u8]> {
         self.iv.as_ref().map(|v| &**v)
     }
diff --git a/openssl/src/error.rs b/openssl/src/error.rs
index c1ef043e..55567e2b 100644
--- a/openssl/src/error.rs
+++ b/openssl/src/error.rs
@@ -229,6 +229,7 @@ impl Error {
     }
 
     /// Returns additional data describing the error.
+    #[allow(clippy::option_as_ref_deref)]
     pub fn data(&self) -> Option<&str> {
         self.data.as_ref().map(|s| &**s)
     }
diff --git a/openssl/src/stack.rs b/openssl/src/stack.rs
index fc2eafae..d70be351 100644
--- a/openssl/src/stack.rs
+++ b/openssl/src/stack.rs
@@ -46,7 +46,7 @@ unsafe impl<T: Stackable + Sync> Sync for Stack<T> {}
 impl<T: Stackable> Drop for Stack<T> {
     fn drop(&mut self) {
         unsafe {
-            while let Some(_) = self.pop() {}
+            while self.pop().is_some() {}
             OPENSSL_sk_free(self.0 as *mut _);
         }
     }