Skip to content

Commit

Permalink
Resolve clippy warnings from nightly
Browse files Browse the repository at this point in the history
  • Loading branch information
alex committed Oct 5, 2024
1 parent 8d60e21 commit 3060742
Show file tree
Hide file tree
Showing 11 changed files with 37 additions and 36 deletions.
1 change: 1 addition & 0 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions openssl/src/asn1.rs
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand All @@ -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()
}
Expand Down
2 changes: 1 addition & 1 deletion openssl/src/bio.rs
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down
22 changes: 11 additions & 11 deletions openssl/src/bn.rs
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand All @@ -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 {
Expand All @@ -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 {
Expand All @@ -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 {
Expand All @@ -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 {
Expand All @@ -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 {
Expand All @@ -1345,15 +1345,15 @@ 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 {
self.deref().shl(n)
}
}

impl<'a> Shr<i32> for &'a BigNumRef {
impl Shr<i32> for &BigNumRef {
type Output = BigNum;

fn shr(self, n: i32) -> BigNum {
Expand All @@ -1363,23 +1363,23 @@ 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 {
self.deref().shr(n)
}
}

impl<'a> Neg for &'a BigNumRef {
impl Neg for &BigNumRef {
type Output = BigNum;

fn neg(self) -> BigNum {
self.to_owned().unwrap().neg()
}
}

impl<'a> Neg for &'a BigNum {
impl Neg for &BigNum {
type Output = BigNum;

fn neg(self) -> BigNum {
Expand Down
6 changes: 3 additions & 3 deletions openssl/src/derive.rs
Original file line number Diff line number Diff line change
Expand Up @@ -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> {
Expand Down Expand Up @@ -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);
Expand Down
12 changes: 6 additions & 6 deletions openssl/src/encrypt.rs
Original file line number Diff line number Diff line change
Expand Up @@ -56,10 +56,10 @@ pub struct Encrypter<'a> {
_p: PhantomData<&'a ()>,
}

unsafe impl<'a> Sync for Encrypter<'a> {}
unsafe impl<'a> Send for Encrypter<'a> {}
unsafe impl Sync for Encrypter<'_> {}
unsafe impl Send for Encrypter<'_> {}

impl<'a> Drop for Encrypter<'a> {
impl Drop for Encrypter<'_> {
fn drop(&mut self) {
unsafe {
ffi::EVP_PKEY_CTX_free(self.pctx);
Expand Down Expand Up @@ -260,10 +260,10 @@ pub struct Decrypter<'a> {
_p: PhantomData<&'a ()>,
}

unsafe impl<'a> Sync for Decrypter<'a> {}
unsafe impl<'a> Send for Decrypter<'a> {}
unsafe impl Sync for Decrypter<'_> {}
unsafe impl Send for Decrypter<'_> {}

impl<'a> Drop for Decrypter<'a> {
impl Drop for Decrypter<'_> {
fn drop(&mut self) {
unsafe {
ffi::EVP_PKEY_CTX_free(self.pctx);
Expand Down
2 changes: 1 addition & 1 deletion openssl/src/ocsp.rs
Original file line number Diff line number Diff line change
Expand Up @@ -122,7 +122,7 @@ pub struct OcspStatus<'a> {
pub next_update: &'a Asn1GeneralizedTimeRef,
}

impl<'a> OcspStatus<'a> {
impl OcspStatus<'_> {
/// Checks validity of the `this_update` and `next_update` fields.
///
/// The `nsec` parameter specifies an amount of slack time that will be used when comparing
Expand Down
10 changes: 5 additions & 5 deletions openssl/src/sign.rs
Original file line number Diff line number Diff line change
Expand Up @@ -365,7 +365,7 @@ impl Signer<'_> {
}
}

impl<'a> Write for Signer<'a> {
impl Write for Signer<'_> {
fn write(&mut self, buf: &[u8]) -> io::Result<usize> {
self.update(buf)?;
Ok(buf.len())
Expand All @@ -384,10 +384,10 @@ pub struct Verifier<'a> {
pkey_pd: PhantomData<&'a ()>,
}

unsafe impl<'a> Sync for Verifier<'a> {}
unsafe impl<'a> Send for Verifier<'a> {}
unsafe impl Sync for Verifier<'_> {}
unsafe impl Send for Verifier<'_> {}

impl<'a> Drop for Verifier<'a> {
impl Drop for Verifier<'_> {
fn drop(&mut self) {
// pkey_ctx is owned by the md_ctx, so no need to explicitly free it.
unsafe {
Expand Down Expand Up @@ -566,7 +566,7 @@ impl<'a> Verifier<'a> {
}
}

impl<'a> Write for Verifier<'a> {
impl Write for Verifier<'_> {
fn write(&mut self, buf: &[u8]) -> io::Result<usize> {
self.update(buf)?;
Ok(buf.len())
Expand Down
6 changes: 3 additions & 3 deletions openssl/src/ssl/test/mod.rs
Original file line number Diff line number Diff line change
Expand Up @@ -1367,20 +1367,20 @@ fn stateless() {

pub struct Outgoing<'a>(&'a mut Vec<u8>);

impl<'a> Drop for Outgoing<'a> {
impl Drop for Outgoing<'_> {
fn drop(&mut self) {
self.0.clear();
}
}

impl<'a> ::std::ops::Deref for Outgoing<'a> {
impl ::std::ops::Deref for Outgoing<'_> {
type Target = [u8];
fn deref(&self) -> &[u8] {
self.0
}
}

impl<'a> AsRef<[u8]> for Outgoing<'a> {
impl AsRef<[u8]> for Outgoing<'_> {
fn as_ref(&self) -> &[u8] {
self.0
}
Expand Down
4 changes: 2 additions & 2 deletions openssl/src/stack.rs
Original file line number Diff line number Diff line change
Expand Up @@ -343,7 +343,7 @@ impl<'a, T: Stackable> DoubleEndedIterator for Iter<'a, T> {
}
}

impl<'a, T: Stackable> ExactSizeIterator for Iter<'a, T> {}
impl<T: Stackable> ExactSizeIterator for Iter<'_, T> {}

/// A mutable iterator over the stack's contents.
pub struct IterMut<'a, T: Stackable> {
Expand Down Expand Up @@ -377,4 +377,4 @@ impl<'a, T: Stackable> DoubleEndedIterator for IterMut<'a, T> {
}
}

impl<'a, T: Stackable> ExactSizeIterator for IterMut<'a, T> {}
impl<T: Stackable> ExactSizeIterator for IterMut<'_, T> {}
4 changes: 2 additions & 2 deletions openssl/src/x509/mod.rs
Original file line number Diff line number Diff line change
Expand Up @@ -135,7 +135,7 @@ impl X509StoreContextRef {
{
struct Cleanup<'a>(&'a mut X509StoreContextRef);

impl<'a> Drop for Cleanup<'a> {
impl Drop for Cleanup<'_> {
fn drop(&mut self) {
unsafe {
ffi::X509_STORE_CTX_cleanup(self.0.as_ptr());
Expand Down Expand Up @@ -873,7 +873,7 @@ impl Eq for X509 {}
/// A context object required to construct certain `X509` extension values.
pub struct X509v3Context<'a>(ffi::X509V3_CTX, PhantomData<(&'a X509Ref, &'a ConfRef)>);

impl<'a> X509v3Context<'a> {
impl X509v3Context<'_> {
pub fn as_ptr(&self) -> *mut ffi::X509V3_CTX {
&self.0 as *const _ as *mut _
}
Expand Down

0 comments on commit 3060742

Please sign in to comment.