min
/
boring2
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Clippy

This commit is contained in:
Kornel 2024-11-28 18:46:22 +00:00 committed by Rushil Mehra
parent 7ac0d2105c
commit 81e84c26a2
9 changed files with 31 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
boring/Cargo.toml
View File

@ -10,6 +10,7 @@ readme = "README.md"
keywords = ["crypto", "tls", "ssl", "dtls"] keywords = ["crypto", "tls", "ssl", "dtls"]
categories = ["cryptography", "api-bindings"] categories = ["cryptography", "api-bindings"]
edition = { workspace = true } edition = { workspace = true }
rust-version = "1.70"
[package.metadata.docs.rs] [package.metadata.docs.rs]
features = ["rpk", "pq-experimental", "underscore-wildcards"] features = ["rpk", "pq-experimental", "underscore-wildcards"]

4
boring/src/asn1.rs
View File

@ -240,7 +240,7 @@ impl PartialEq<Asn1Time> for Asn1TimeRef {
} }
} }
impl<'a> PartialEq<Asn1Time> for &'a Asn1TimeRef { impl PartialEq<Asn1Time> for &Asn1TimeRef {
fn eq(&self, other: &Asn1Time) -> bool { fn eq(&self, other: &Asn1Time) -> bool {
self.diff(other) self.diff(other)
.map(|t| t.days == 0 && t.secs == 0) .map(|t| t.days == 0 && t.secs == 0)
@ -260,7 +260,7 @@ impl PartialOrd<Asn1Time> for Asn1TimeRef {
} }
} }
impl<'a> PartialOrd<Asn1Time> for &'a Asn1TimeRef { impl PartialOrd<Asn1Time> for &Asn1TimeRef {
fn partial_cmp(&self, other: &Asn1Time) -> Option<Ordering> { fn partial_cmp(&self, other: &Asn1Time) -> Option<Ordering> {
self.compare(other).ok() self.compare(other).ok()
} }

2
boring/src/bio.rs
View File

@ -9,7 +9,7 @@ use crate::error::ErrorStack;
pub struct MemBioSlice<'a>(*mut ffi::BIO, PhantomData<&'a [u8]>); pub struct MemBioSlice<'a>(*mut ffi::BIO, PhantomData<&'a [u8]>);
impl<'a> Drop for MemBioSlice<'a> { impl Drop for MemBioSlice<'_> {
fn drop(&mut self) { fn drop(&mut self) {
unsafe { unsafe {
ffi::BIO_free_all(self.0); ffi::BIO_free_all(self.0);

22
boring/src/bn.rs
View File

@ -1126,7 +1126,7 @@ macro_rules! delegate {
}; };
} }
impl<'a, 'b> Add<&'b BigNumRef> for &'a BigNumRef { impl Add<&BigNumRef> for &BigNumRef {
type Output = BigNum; type Output = BigNum;
fn add(self, oth: &BigNumRef) -> BigNum { fn add(self, oth: &BigNumRef) -> BigNum {
@ -1138,7 +1138,7 @@ impl<'a, 'b> Add<&'b BigNumRef> for &'a BigNumRef {
delegate!(Add, add); delegate!(Add, add);
impl<'a, 'b> Sub<&'b BigNumRef> for &'a BigNumRef { impl Sub<&BigNumRef> for &BigNumRef {
type Output = BigNum; type Output = BigNum;
fn sub(self, oth: &BigNumRef) -> BigNum { fn sub(self, oth: &BigNumRef) -> BigNum {
@ -1150,7 +1150,7 @@ impl<'a, 'b> Sub<&'b BigNumRef> for &'a BigNumRef {
delegate!(Sub, sub); delegate!(Sub, sub);
impl<'a, 'b> Mul<&'b BigNumRef> for &'a BigNumRef { impl Mul<&BigNumRef> for &BigNumRef {
type Output = BigNum; type Output = BigNum;
fn mul(self, oth: &BigNumRef) -> BigNum { fn mul(self, oth: &BigNumRef) -> BigNum {
@ -1163,7 +1163,7 @@ impl<'a, 'b> Mul<&'b BigNumRef> for &'a BigNumRef {
delegate!(Mul, mul); delegate!(Mul, mul);
impl<'a, 'b> Div<&'b BigNumRef> for &'a BigNumRef { impl<'b> Div<&'b BigNumRef> for &BigNumRef {
type Output = BigNum; type Output = BigNum;
fn div(self, oth: &'b BigNumRef) -> BigNum { fn div(self, oth: &'b BigNumRef) -> BigNum {
@ -1176,7 +1176,7 @@ impl<'a, 'b> Div<&'b BigNumRef> for &'a BigNumRef {
delegate!(Div, div); delegate!(Div, div);
impl<'a, 'b> Rem<&'b BigNumRef> for &'a BigNumRef { impl<'b> Rem<&'b BigNumRef> for &BigNumRef {
type Output = BigNum; type Output = BigNum;
fn rem(self, oth: &'b BigNumRef) -> BigNum { fn rem(self, oth: &'b BigNumRef) -> BigNum {
@ -1189,7 +1189,7 @@ impl<'a, 'b> Rem<&'b BigNumRef> for &'a BigNumRef {
delegate!(Rem, rem); delegate!(Rem, rem);
impl<'a> Shl<i32> for &'a BigNumRef { impl Shl<i32> for &BigNumRef {
type Output = BigNum; type Output = BigNum;
fn shl(self, n: i32) -> BigNum { fn shl(self, n: i32) -> BigNum {
@ -1199,7 +1199,7 @@ impl<'a> Shl<i32> for &'a BigNumRef {
} }
} }
impl<'a> Shl<i32> for &'a BigNum { impl Shl<i32> for &BigNum {
type Output = BigNum; type Output = BigNum;
fn shl(self, n: i32) -> BigNum { fn shl(self, n: i32) -> BigNum {
@ -1207,7 +1207,7 @@ impl<'a> Shl<i32> for &'a BigNum {
} }
} }
impl<'a> Shr<i32> for &'a BigNumRef { impl Shr<i32> for &BigNumRef {
type Output = BigNum; type Output = BigNum;
fn shr(self, n: i32) -> BigNum { fn shr(self, n: i32) -> BigNum {
@ -1217,7 +1217,7 @@ impl<'a> Shr<i32> for &'a BigNumRef {
} }
} }
impl<'a> Shr<i32> for &'a BigNum { impl Shr<i32> for &BigNum {
type Output = BigNum; type Output = BigNum;
fn shr(self, n: i32) -> BigNum { fn shr(self, n: i32) -> BigNum {
@ -1225,7 +1225,7 @@ impl<'a> Shr<i32> for &'a BigNum {
} }
} }
impl<'a> Neg for &'a BigNumRef { impl Neg for &BigNumRef {
type Output = BigNum; type Output = BigNum;
fn neg(self) -> BigNum { fn neg(self) -> BigNum {
@ -1233,7 +1233,7 @@ impl<'a> Neg for &'a BigNumRef {
} }
} }
impl<'a> Neg for &'a BigNum { impl Neg for &BigNum {
type Output = BigNum; type Output = BigNum;
fn neg(self) -> BigNum { fn neg(self) -> BigNum {

6
boring/src/derive.rs
View File

@ -11,10 +11,10 @@ use crate::{cvt, cvt_p};
/// A type used to derive a shared secret between two keys. /// A type used to derive a shared secret between two keys.
pub struct Deriver<'a>(*mut ffi::EVP_PKEY_CTX, PhantomData<&'a ()>); pub struct Deriver<'a>(*mut ffi::EVP_PKEY_CTX, PhantomData<&'a ()>);
unsafe impl<'a> Sync for Deriver<'a> {} unsafe impl Sync for Deriver<'_> {}
unsafe impl<'a> Send for Deriver<'a> {} unsafe impl Send for Deriver<'_> {}
impl<'a> Drop for Deriver<'a> { impl Drop for Deriver<'_> {
fn drop(&mut self) { fn drop(&mut self) {
unsafe { unsafe {
ffi::EVP_PKEY_CTX_free(self.0); ffi::EVP_PKEY_CTX_free(self.0);

16
boring/src/sign.rs
View File

@ -78,10 +78,10 @@ pub struct Signer<'a> {
_p: PhantomData<&'a ()>, _p: PhantomData<&'a ()>,
} }
unsafe impl<'a> Sync for Signer<'a> {} unsafe impl Sync for Signer<'_> {}
unsafe impl<'a> Send for Signer<'a> {} unsafe impl Send for Signer<'_> {}
impl<'a> Drop for Signer<'a> { impl Drop for Signer<'_> {
fn drop(&mut self) { fn drop(&mut self) {
// pkey_ctx is owned by the md_ctx, so no need to explicitly free it. // pkey_ctx is owned by the md_ctx, so no need to explicitly free it.
unsafe { unsafe {
@ -337,7 +337,7 @@ impl<'a> Signer<'a> {
} }
} }
impl<'a> Write for Signer<'a> { impl Write for Signer<'_> {
fn write(&mut self, buf: &[u8]) -> io::Result<usize> { fn write(&mut self, buf: &[u8]) -> io::Result<usize> {
self.update(buf)?; self.update(buf)?;
Ok(buf.len()) Ok(buf.len())
@ -354,10 +354,10 @@ pub struct Verifier<'a> {
pkey_pd: PhantomData<&'a ()>, pkey_pd: PhantomData<&'a ()>,
} }
unsafe impl<'a> Sync for Verifier<'a> {} unsafe impl Sync for Verifier<'_> {}
unsafe impl<'a> Send for Verifier<'a> {} unsafe impl Send for Verifier<'_> {}
impl<'a> Drop for Verifier<'a> { impl Drop for Verifier<'_> {
fn drop(&mut self) { fn drop(&mut self) {
// pkey_ctx is owned by the md_ctx, so no need to explicitly free it. // pkey_ctx is owned by the md_ctx, so no need to explicitly free it.
unsafe { unsafe {
@ -560,7 +560,7 @@ impl<'a> Verifier<'a> {
} }
} }
impl<'a> Write for Verifier<'a> { impl Write for Verifier<'_> {
fn write(&mut self, buf: &[u8]) -> io::Result<usize> { fn write(&mut self, buf: &[u8]) -> io::Result<usize> {
self.update(buf)?; self.update(buf)?;
Ok(buf.len()) Ok(buf.len())

2
boring/src/ssl/bio.rs
View File

@ -219,7 +219,7 @@ struct BIO_METHOD(*mut ffi::BIO_METHOD);
impl BIO_METHOD { impl BIO_METHOD {
fn new<S: Read + Write>() -> BIO_METHOD { fn new<S: Read + Write>() -> BIO_METHOD {
unsafe { unsafe {
let ptr = ffi::BIO_meth_new(ffi::BIO_TYPE_NONE, b"rust\0".as_ptr() as *const _); let ptr = ffi::BIO_meth_new(ffi::BIO_TYPE_NONE, b"rust\0".as_ptr().cast());
assert!(!ptr.is_null()); assert!(!ptr.is_null());
let ret = BIO_METHOD(ptr); let ret = BIO_METHOD(ptr);
assert!(ffi::BIO_meth_set_write(ptr, Some(bwrite::<S>)) != 0); assert!(ffi::BIO_meth_set_write(ptr, Some(bwrite::<S>)) != 0);

4
boring/src/stack.rs
View File

@ -338,7 +338,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. /// A mutable iterator over the stack's contents.
pub struct IterMut<'a, T: Stackable + 'a> { pub struct IterMut<'a, T: Stackable + 'a> {
@ -372,4 +372,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
boring/src/x509/mod.rs
View File

@ -121,7 +121,7 @@ impl X509StoreContextRef {
{ {
struct Cleanup<'a>(&'a mut X509StoreContextRef); struct Cleanup<'a>(&'a mut X509StoreContextRef);
impl<'a> Drop for Cleanup<'a> { impl Drop for Cleanup<'_> {
fn drop(&mut self) { fn drop(&mut self) {
unsafe { unsafe {
ffi::X509_STORE_CTX_cleanup(self.0.as_ptr()); ffi::X509_STORE_CTX_cleanup(self.0.as_ptr());
@ -735,7 +735,7 @@ impl Stackable for X509 {
/// A context object required to construct certain `X509` extension values. /// A context object required to construct certain `X509` extension values.
pub struct X509v3Context<'a>(ffi::X509V3_CTX, PhantomData<(&'a X509Ref, &'a ConfRef)>); 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 { pub fn as_ptr(&self) -> *mut ffi::X509V3_CTX {
&self.0 as *const _ as *mut _ &self.0 as *const _ as *mut _
} }