fix clippy errors

Author: ssrlive

.github/workflows/ci.yml

@@ -37,6 +37,7 @@ jobs:
         id: rust-version
       - run: cargo generate-lockfile
       - run: cargo fetch
+      - run: cargo fmt --check
       - run: cargo clippy --all-targets -- -D warnings
       - run: cargo test --features vendored
 

Cargo.toml

@@ -21,7 +21,7 @@ alpn = ["security-framework/alpn"]
 have_min_max_version = []
 
 [target.'cfg(target_vendor = "apple")'.dependencies]
-security-framework = "2.0.0"
+security-framework = "3"
 security-framework-sys = "2.0.0"
 libc = "0.2"
 

src/imp/schannel.rs

@@ -14,7 +14,7 @@ use crate::{TlsAcceptorBuilder, TlsConnectorBuilder};
 
 const SEC_E_NO_CREDENTIALS: u32 = 0x8009030E;
 
-static PROTOCOLS: &'static [Protocol] = &[
+static PROTOCOLS: &[Protocol] = &[
     Protocol::Ssl3,
     Protocol::Tls10,
     Protocol::Tls11,
@@ -104,7 +104,7 @@ impl Identity {
         }
 
         let mut store = Memory::new()?.into_store();
-        let mut cert_iter = pem::PemBlock::new(pem).into_iter();
+        let mut cert_iter = pem::PemBlock::new(pem);
         let leaf = cert_iter.next().ok_or_else(|| {
             io::Error::new(
                 io::ErrorKind::InvalidInput,
@@ -127,7 +127,7 @@ impl Identity {
             Ok(container) => container,
             Err(_) => options.new_keyset(true).acquire(type_)?,
         };
-        container.import().import_pkcs8_pem(&key)?;
+        container.import().import_pkcs8_pem(key)?;
 
         cert.set_key_prov_info()
             .container(&name)
@@ -205,6 +205,7 @@ impl<S> MidHandshakeTlsStream<S>
 where
     S: io::Read + io::Write,
 {
+    #[allow(clippy::result_large_err)]
     pub fn handshake(self) -> Result<TlsStream<S>, HandshakeError<S>> {
         match self.0.handshake() {
             Ok(s) => Ok(TlsStream(s)),
@@ -213,6 +214,7 @@ where
     }
 }
 
+#[allow(clippy::large_enum_variant)]
 pub enum HandshakeError<S> {
     Failure(Error),
     WouldBlock(MidHandshakeTlsStream<S>),
@@ -271,6 +273,7 @@ impl TlsConnector {
         })
     }
 
+    #[allow(clippy::result_large_err)]
     pub fn connect<S>(&self, domain: &str, stream: S) -> Result<TlsStream<S>, HandshakeError<S>>
     where
         S: io::Read + io::Write,
@@ -292,10 +295,8 @@ impl TlsConnector {
         } else if self.disable_built_in_roots {
             let roots_copy = self.roots.clone();
             builder.verify_callback(move |res| {
-                if let Err(err) = res.result() {
-                    // Propagate previous error encountered during normal cert validation.
-                    return Err(err);
-                }
+                // Propagate previous error encountered during normal cert validation.
+                res.result()?;
 
                 if let Some(chain) = res.chain() {
                     if chain
@@ -306,8 +307,7 @@ impl TlsConnector {
                     }
                 }
 
-                Err(io::Error::new(
-                    io::ErrorKind::Other,
+                Err(io::Error::other(
                     "unable to find any user-specified roots in the final cert chain",
                 ))
             });
@@ -343,6 +343,7 @@ impl TlsAcceptor {
         })
     }
 
+    #[allow(clippy::result_large_err)]
     pub fn accept<S>(&self, stream: S) -> Result<TlsStream<S>, HandshakeError<S>>
     where
         S: io::Read + io::Write,
@@ -472,7 +473,7 @@ mod pem {
                 Some(end) => end + begin + 1,
                 None => last,
             };
-            return Some(&self.pem_block[begin..self.cur_end].as_bytes());
+            Some(&self.pem_block.as_bytes()[begin..self.cur_end])
         }
     }
 

src/imp/security_framework.rs

@@ -153,7 +153,7 @@ impl Identity {
 
         let cert = items
             .certificates
-            .get(0)
+            .first()
             .ok_or_else(|| Error(base::Error::from(errSecParam)))?;
         let ident = SecIdentity::with_certificate(&[keychain], cert)?;
         Ok(Identity {

src/lib.rs

@@ -246,6 +246,7 @@ where
     /// Note that the error may not be fatal. For example if the underlying
     /// stream is an asynchronous one then `HandshakeError::WouldBlock` may
     /// just mean to wait for more I/O to happen later.
+    #[allow(clippy::result_large_err)]
     pub fn handshake(self) -> result::Result<TlsStream<S>, HandshakeError<S>> {
         match self.0.handshake() {
             Ok(s) => Ok(TlsStream(s)),
@@ -256,6 +257,7 @@ where
 
 /// An error returned from `ClientBuilder::handshake`.
 #[derive(Debug)]
+#[allow(clippy::large_enum_variant)]
 pub enum HandshakeError<S> {
     /// A fatal error.
     Failure(Error),
@@ -500,6 +502,7 @@ impl TlsConnector {
     ///
     /// The domain is ignored if both SNI and hostname verification are
     /// disabled.
+    #[allow(clippy::result_large_err)]
     pub fn connect<S>(
         &self,
         domain: &str,
@@ -616,6 +619,7 @@ impl TlsAcceptor {
     /// the handshake, a `HandshakeError::WouldBlock` error will be returned
     /// which can be used to restart the handshake when the socket is ready
     /// again.
+    #[allow(clippy::result_large_err)]
     pub fn accept<S>(&self, stream: S) -> result::Result<TlsStream<S>, HandshakeError<S>>
     where
         S: io::Read + io::Write,