Unverified Commit 9e790732 authored by Alex Gaynor's avatar Alex Gaynor Committed by GitHub
Browse files

Merge pull request #2052 from wiktor-k/fix-clippy 

Fix clippy warnings produced by newer Rust
parents 10cee24f 32734b75

openssl-sys/src/lib.rs

+1 −1
Original line number Diff line number Diff line
@@ -11,7 +11,7 @@ 
#![recursion_limit = "128"] // configure fixed limit across all rust versions



extern crate libc;

pub use libc::*;

pub use libc::c_int;



#[cfg(feature = "unstable_boringssl")]

extern crate bssl_sys;

openssl/src/bn.rs

+1 −1
Original line number Diff line number Diff line
@@ -1229,7 +1229,7 @@ impl Ord for BigNumRef { 


impl PartialOrd for BigNum {

    fn partial_cmp(&self, oth: &BigNum) -> Option<Ordering> {

        self.deref().partial_cmp(oth.deref())

        Some(self.cmp(oth))

    }

}

openssl/src/x509/mod.rs

+1 −1
Original line number Diff line number Diff line
@@ -832,7 +832,7 @@ impl Ord for X509 { 


impl PartialOrd for X509 {

    fn partial_cmp(&self, other: &Self) -> Option<cmp::Ordering> {

        X509Ref::partial_cmp(self, other)

        Some(self.cmp(other))

    }

}

systest/Cargo.toml

+1 −1
Original line number Diff line number Diff line
@@ -9,7 +9,7 @@ libc = "0.2" 
openssl-sys = { path = "../openssl-sys" }



[build-dependencies]

ctest2 = "0.4"

ctest2 = "0.4.7"



[features]

vendored = ['openssl-sys/vendored']