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

Merge pull request #2310 from alex/clipp-warnings 

Resolve clippy warnings from nightly
parents 8d60e211 30607429

.github/workflows/ci.yml

+1 −0
Original line number Diff line number Diff line
@@ -160,6 +160,7 @@ jobs: 
            - name: openssl

              version: 3.2.0

            - name: openssl

              old: true

              version: 1.1.1w

            - name: openssl

              version: 1.1.0l

openssl/src/asn1.rs

+2 −2
Original line number Diff line number Diff line
@@ -247,7 +247,7 @@ impl PartialEq<Asn1Time> for Asn1TimeRef { 
}



#[cfg(any(ossl102, boringssl))]

impl<'a> PartialEq<Asn1Time> for &'a Asn1TimeRef {

impl PartialEq<Asn1Time> for &Asn1TimeRef {

    fn eq(&self, other: &Asn1Time) -> bool {

        self.diff(other)

            .map(|t| t.days == 0 && t.secs == 0)
@@ -270,7 +270,7 @@ impl PartialOrd<Asn1Time> for Asn1TimeRef { 
}



#[cfg(any(ossl102, boringssl))]

impl<'a> PartialOrd<Asn1Time> for &'a Asn1TimeRef {

impl PartialOrd<Asn1Time> for &Asn1TimeRef {

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

        self.compare(other).ok()

    }

openssl/src/bio.rs

+1 −1
Original line number Diff line number Diff line
@@ -9,7 +9,7 @@ use crate::util; 


pub struct MemBioSlice<'a>(*mut ffi::BIO, PhantomData<&'a [u8]>);



impl<'a> Drop for MemBioSlice<'a> {

impl Drop for MemBioSlice<'_> {

    fn drop(&mut self) {

        unsafe {

            ffi::BIO_free_all(self.0);

openssl/src/bn.rs

+11 −11
Original line number Diff line number Diff line
@@ -1272,7 +1272,7 @@ macro_rules! delegate { 
    };

}



impl<'a, 'b> Add<&'b BigNumRef> for &'a BigNumRef {

impl Add<&BigNumRef> for &BigNumRef {

    type Output = BigNum;



    fn add(self, oth: &BigNumRef) -> BigNum {
@@ -1284,7 +1284,7 @@ impl<'a, 'b> Add<&'b BigNumRef> for &'a BigNumRef { 


delegate!(Add, add);



impl<'a, 'b> Sub<&'b BigNumRef> for &'a BigNumRef {

impl Sub<&BigNumRef> for &BigNumRef {

    type Output = BigNum;



    fn sub(self, oth: &BigNumRef) -> BigNum {
@@ -1296,7 +1296,7 @@ impl<'a, 'b> Sub<&'b BigNumRef> for &'a BigNumRef { 


delegate!(Sub, sub);



impl<'a, 'b> Mul<&'b BigNumRef> for &'a BigNumRef {

impl Mul<&BigNumRef> for &BigNumRef {

    type Output = BigNum;



    fn mul(self, oth: &BigNumRef) -> BigNum {
@@ -1309,7 +1309,7 @@ impl<'a, 'b> Mul<&'b BigNumRef> for &'a BigNumRef { 


delegate!(Mul, mul);



impl<'a, 'b> Div<&'b BigNumRef> for &'a BigNumRef {

impl<'b> Div<&'b BigNumRef> for &BigNumRef {

    type Output = BigNum;



    fn div(self, oth: &'b BigNumRef) -> BigNum {
@@ -1322,7 +1322,7 @@ impl<'a, 'b> Div<&'b BigNumRef> for &'a BigNumRef { 


delegate!(Div, div);



impl<'a, 'b> Rem<&'b BigNumRef> for &'a BigNumRef {

impl<'b> Rem<&'b BigNumRef> for &BigNumRef {

    type Output = BigNum;



    fn rem(self, oth: &'b BigNumRef) -> BigNum {
@@ -1335,7 +1335,7 @@ impl<'a, 'b> Rem<&'b BigNumRef> for &'a BigNumRef { 


delegate!(Rem, rem);



impl<'a> Shl<i32> for &'a BigNumRef {

impl Shl<i32> for &BigNumRef {

    type Output = BigNum;



    fn shl(self, n: i32) -> BigNum {
@@ -1345,7 +1345,7 @@ impl<'a> Shl<i32> for &'a BigNumRef { 
    }

}



impl<'a> Shl<i32> for &'a BigNum {

impl Shl<i32> for &BigNum {

    type Output = BigNum;



    fn shl(self, n: i32) -> BigNum {
@@ -1353,7 +1353,7 @@ impl<'a> Shl<i32> for &'a BigNum { 
    }

}



impl<'a> Shr<i32> for &'a BigNumRef {

impl Shr<i32> for &BigNumRef {

    type Output = BigNum;



    fn shr(self, n: i32) -> BigNum {
@@ -1363,7 +1363,7 @@ impl<'a> Shr<i32> for &'a BigNumRef { 
    }

}



impl<'a> Shr<i32> for &'a BigNum {

impl Shr<i32> for &BigNum {

    type Output = BigNum;



    fn shr(self, n: i32) -> BigNum {
@@ -1371,7 +1371,7 @@ impl<'a> Shr<i32> for &'a BigNum { 
    }

}



impl<'a> Neg for &'a BigNumRef {

impl Neg for &BigNumRef {

    type Output = BigNum;



    fn neg(self) -> BigNum {
@@ -1379,7 +1379,7 @@ impl<'a> Neg for &'a BigNumRef { 
    }

}



impl<'a> Neg for &'a BigNum {

impl Neg for &BigNum {

    type Output = BigNum;



    fn neg(self) -> BigNum {

openssl/src/derive.rs

+3 −3
Original line number Diff line number Diff line
@@ -61,8 +61,8 @@ use openssl_macros::corresponds; 
/// A type used to derive a shared secret between two keys.

pub struct Deriver<'a>(*mut ffi::EVP_PKEY_CTX, PhantomData<&'a ()>);



unsafe impl<'a> Sync for Deriver<'a> {}

unsafe impl<'a> Send for Deriver<'a> {}

unsafe impl Sync for Deriver<'_> {}

unsafe impl Send for Deriver<'_> {}



#[allow(clippy::len_without_is_empty)]

impl<'a> Deriver<'a> {
@@ -163,7 +163,7 @@ impl<'a> Deriver<'a> { 
    }

}



impl<'a> Drop for Deriver<'a> {

impl Drop for Deriver<'_> {

    fn drop(&mut self) {

        unsafe {

            ffi::EVP_PKEY_CTX_free(self.0);