mirror of
https://github.com/rosenpass/rosenpass.git
synced 2026-02-28 06:23:08 -08:00
fix: second round of clippy lints
Clippy would not automatically apply these fixes, so they were applied by hand.
This commit is contained in:
@@ -16,7 +16,7 @@ use rosenpass_to::{with_destination, To};
|
|||||||
///
|
///
|
||||||
/// If source and destination are of different sizes.
|
/// If source and destination are of different sizes.
|
||||||
#[inline]
|
#[inline]
|
||||||
pub fn xor<'a>(src: &'a [u8]) -> impl To<[u8], ()> + 'a {
|
pub fn xor(src: &[u8]) -> impl To<[u8], ()> + '_ {
|
||||||
with_destination(|dst: &mut [u8]| {
|
with_destination(|dst: &mut [u8]| {
|
||||||
assert!(src.len() == dst.len());
|
assert!(src.len() == dst.len());
|
||||||
for (dv, sv) in dst.iter_mut().zip(src.iter()) {
|
for (dv, sv) in dst.iter_mut().zip(src.iter()) {
|
||||||
|
|||||||
@@ -20,7 +20,7 @@ pub struct Public<const N: usize> {
|
|||||||
impl<const N: usize> Public<N> {
|
impl<const N: usize> Public<N> {
|
||||||
/// Create a new [Public] from a byte slice
|
/// Create a new [Public] from a byte slice
|
||||||
pub fn from_slice(value: &[u8]) -> Self {
|
pub fn from_slice(value: &[u8]) -> Self {
|
||||||
copy_slice(value).to_this(|| Self::zero())
|
copy_slice(value).to_this(Self::zero)
|
||||||
}
|
}
|
||||||
|
|
||||||
/// Create a new [Public] from a byte array
|
/// Create a new [Public] from a byte array
|
||||||
|
|||||||
@@ -83,7 +83,7 @@ impl<T: Zeroize + ?Sized> Deref for ZeroizingSecretBox<T> {
|
|||||||
type Target = T;
|
type Target = T;
|
||||||
|
|
||||||
fn deref(&self) -> &T {
|
fn deref(&self) -> &T {
|
||||||
&self.0.as_ref().unwrap()
|
self.0.as_ref().unwrap()
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -177,7 +177,7 @@ impl<const N: usize> Secret<N> {
|
|||||||
|
|
||||||
/// Borrows the data
|
/// Borrows the data
|
||||||
pub fn secret(&self) -> &[u8; N] {
|
pub fn secret(&self) -> &[u8; N] {
|
||||||
&self.storage.as_ref().unwrap()
|
self.storage.as_ref().unwrap()
|
||||||
}
|
}
|
||||||
|
|
||||||
/// Borrows the data mutably
|
/// Borrows the data mutably
|
||||||
|
|||||||
@@ -8,7 +8,7 @@ use crate::{with_destination, To};
|
|||||||
/// # Panics
|
/// # Panics
|
||||||
///
|
///
|
||||||
/// This function will panic if the two slices have different lengths.
|
/// This function will panic if the two slices have different lengths.
|
||||||
pub fn copy_slice<'a, T>(origin: &'a [T]) -> impl To<[T], ()> + 'a
|
pub fn copy_slice<T>(origin: &[T]) -> impl To<[T], ()> + '_
|
||||||
where
|
where
|
||||||
T: Copy,
|
T: Copy,
|
||||||
{
|
{
|
||||||
@@ -23,7 +23,7 @@ where
|
|||||||
/// # Panics
|
/// # Panics
|
||||||
///
|
///
|
||||||
/// This function will panic if destination is shorter than origin.
|
/// This function will panic if destination is shorter than origin.
|
||||||
pub fn copy_slice_least_src<'a, T>(origin: &'a [T]) -> impl To<[T], ()> + 'a
|
pub fn copy_slice_least_src<T>(origin: &[T]) -> impl To<[T], ()> + '_
|
||||||
where
|
where
|
||||||
T: Copy,
|
T: Copy,
|
||||||
{
|
{
|
||||||
@@ -34,7 +34,7 @@ where
|
|||||||
/// destination.
|
/// destination.
|
||||||
///
|
///
|
||||||
/// Copies as much data as is present in the shorter slice.
|
/// Copies as much data as is present in the shorter slice.
|
||||||
pub fn copy_slice_least<'a, T>(origin: &'a [T]) -> impl To<[T], ()> + 'a
|
pub fn copy_slice_least<T>(origin: &[T]) -> impl To<[T], ()> + '_
|
||||||
where
|
where
|
||||||
T: Copy,
|
T: Copy,
|
||||||
{
|
{
|
||||||
@@ -47,7 +47,7 @@ where
|
|||||||
/// Function with destination that attempts to copy data from origin into the destination.
|
/// Function with destination that attempts to copy data from origin into the destination.
|
||||||
///
|
///
|
||||||
/// Will return None if the slices are of different lengths.
|
/// Will return None if the slices are of different lengths.
|
||||||
pub fn try_copy_slice<'a, T>(origin: &'a [T]) -> impl To<[T], Option<()>> + 'a
|
pub fn try_copy_slice<T>(origin: &[T]) -> impl To<[T], Option<()>> + '_
|
||||||
where
|
where
|
||||||
T: Copy,
|
T: Copy,
|
||||||
{
|
{
|
||||||
@@ -62,7 +62,7 @@ where
|
|||||||
/// Destination may be longer than origin.
|
/// Destination may be longer than origin.
|
||||||
///
|
///
|
||||||
/// Will return None if the destination is shorter than origin.
|
/// Will return None if the destination is shorter than origin.
|
||||||
pub fn try_copy_slice_least_src<'a, T>(origin: &'a [T]) -> impl To<[T], Option<()>> + 'a
|
pub fn try_copy_slice_least_src<T>(origin: &[T]) -> impl To<[T], Option<()>> + '_
|
||||||
where
|
where
|
||||||
T: Copy,
|
T: Copy,
|
||||||
{
|
{
|
||||||
@@ -72,7 +72,7 @@ where
|
|||||||
}
|
}
|
||||||
|
|
||||||
/// Function with destination that copies all data between two array references.
|
/// Function with destination that copies all data between two array references.
|
||||||
pub fn copy_array<'a, T, const N: usize>(origin: &'a [T; N]) -> impl To<[T; N], ()> + 'a
|
pub fn copy_array<T, const N: usize>(origin: &[T; N]) -> impl To<[T; N], ()> + '_
|
||||||
where
|
where
|
||||||
T: Copy,
|
T: Copy,
|
||||||
{
|
{
|
||||||
|
|||||||
@@ -6,21 +6,21 @@ use std::{fs::OpenOptions, path::Path};
|
|||||||
|
|
||||||
/// Open a file writable
|
/// Open a file writable
|
||||||
pub fn fopen_w<P: AsRef<Path>>(path: P) -> std::io::Result<File> {
|
pub fn fopen_w<P: AsRef<Path>>(path: P) -> std::io::Result<File> {
|
||||||
Ok(OpenOptions::new()
|
OpenOptions::new()
|
||||||
.read(false)
|
.read(false)
|
||||||
.write(true)
|
.write(true)
|
||||||
.create(true)
|
.create(true)
|
||||||
.truncate(true)
|
.truncate(true)
|
||||||
.open(path)?)
|
.open(path)
|
||||||
}
|
}
|
||||||
/// Open a file readable
|
/// Open a file readable
|
||||||
pub fn fopen_r<P: AsRef<Path>>(path: P) -> std::io::Result<File> {
|
pub fn fopen_r<P: AsRef<Path>>(path: P) -> std::io::Result<File> {
|
||||||
Ok(OpenOptions::new()
|
OpenOptions::new()
|
||||||
.read(true)
|
.read(true)
|
||||||
.write(false)
|
.write(false)
|
||||||
.create(false)
|
.create(false)
|
||||||
.truncate(false)
|
.truncate(false)
|
||||||
.open(path)?)
|
.open(path)
|
||||||
}
|
}
|
||||||
|
|
||||||
pub trait ReadExactToEnd {
|
pub trait ReadExactToEnd {
|
||||||
|
|||||||
Reference in New Issue
Block a user