mirrors/rage
1
0
Fork 0
mirror of https://github.com/str4d/rage.git synced 2025-04-04 19:37:51 +03:00
Code Issues Projects Releases Packages Wiki Activity

Fix clippy lints

Browse source
This commit is contained in:
Jack Grigg 2022-10-26 08:58:13 +00:00
parent 490fca7167
commit de96ae7153
5 changed files with 31 additions and 24 deletions
Download patch file Download diff file Expand all files Collapse all files

18
age-core/src/plugin.rs
View file

@ -176,15 +176,13 @@ impl<R: Read, W: Write> Connection<R, W> {
fn grease_gun(&mut self) -> impl Iterator<Item = Stanza> { fn grease_gun(&mut self) -> impl Iterator<Item = Stanza> {
// Add 5% grease // Add 5% grease
let mut rng = thread_rng(); let mut rng = thread_rng();
(0..2) (0..2).filter_map(move |_| {
.map(move |_| { if rng.gen_range(0..100) < 5 {
if rng.gen_range(0..100) < 5 { Some(grease_the_joint())
Some(grease_the_joint()) } else {
} else { None
None }
} })
})
.flatten()
} }
fn done(&mut self) -> io::Result<()> { fn done(&mut self) -> io::Result<()> {
@ -484,7 +482,7 @@ mod tests {
.unwrap(); .unwrap();
let stanza = plugin_conn let stanza = plugin_conn
.unidir_receive::<_, (), (), _, _, _, _>( .unidir_receive::<_, (), (), _, _, _, _>(
("test", |s| Ok(s)), ("test", Ok),
("other", |_| Err(())), ("other", |_| Err(())),
(None, |_| Ok(())), (None, |_| Ok(())),
) )

2
age/src/encrypted.rs
View file

@ -48,7 +48,7 @@ impl<R: io::Read> IdentityState<R> {
let passphrase = match callbacks.request_passphrase(&fl!( let passphrase = match callbacks.request_passphrase(&fl!(
crate::i18n::LANGUAGE_LOADER, crate::i18n::LANGUAGE_LOADER,
"encrypted-passphrase-prompt", "encrypted-passphrase-prompt",
filename = filename.as_deref().unwrap_or_default() filename = filename.unwrap_or_default()
)) { )) {
Some(passphrase) => passphrase, Some(passphrase) => passphrase,
None => todo!(), None => todo!(),

6
age/src/identity.rs
View file

@ -27,8 +27,8 @@ impl IdentityFileEntry {
IdentityFileEntry::Native(i) => Ok(Box::new(i)), IdentityFileEntry::Native(i) => Ok(Box::new(i)),
#[cfg(feature = "plugin")] #[cfg(feature = "plugin")]
IdentityFileEntry::Plugin(i) => Ok(Box::new(crate::plugin::IdentityPluginV1::new( IdentityFileEntry::Plugin(i) => Ok(Box::new(crate::plugin::IdentityPluginV1::new(
&i.plugin().to_owned(), i.plugin(),
&[i], &[i.clone()],
callbacks, callbacks,
)?)), )?)),
} }
@ -43,7 +43,7 @@ impl IdentityFileEntry {
IdentityFileEntry::Native(i) => Ok(Box::new(i.to_public())), IdentityFileEntry::Native(i) => Ok(Box::new(i.to_public())),
#[cfg(feature = "plugin")] #[cfg(feature = "plugin")]
IdentityFileEntry::Plugin(i) => Ok(Box::new(crate::plugin::RecipientPluginV1::new( IdentityFileEntry::Plugin(i) => Ok(Box::new(crate::plugin::RecipientPluginV1::new(
&i.plugin().to_owned(), i.plugin(),
&[], &[],
&[i.clone()], &[i.clone()],
callbacks, callbacks,

27
age/src/primitives/armor.rs
View file

@ -269,7 +269,7 @@ enum ArmorIs<W> {
#[pin] #[pin]
inner: LineEndingWriter<W>, inner: LineEndingWriter<W>,
byte_buf: Option<Vec<u8>>, byte_buf: Option<Vec<u8>>,
encoded_buf: [u8; BASE64_CHUNK_SIZE_COLUMNS], encoded_buf: Box<[u8; BASE64_CHUNK_SIZE_COLUMNS]>,
#[cfg(feature = "async")] #[cfg(feature = "async")]
#[cfg_attr(docsrs, doc(cfg(feature = "async")))] #[cfg_attr(docsrs, doc(cfg(feature = "async")))]
encoded_line: Option<EncodedBytes>, encoded_line: Option<EncodedBytes>,
@ -293,7 +293,7 @@ impl<W: Write> ArmoredWriter<W> {
ArmoredWriter(ArmorIs::Enabled { ArmoredWriter(ArmorIs::Enabled {
inner: w, inner: w,
byte_buf: Some(Vec::with_capacity(BASE64_CHUNK_SIZE_BYTES)), byte_buf: Some(Vec::with_capacity(BASE64_CHUNK_SIZE_BYTES)),
encoded_buf: [0; BASE64_CHUNK_SIZE_COLUMNS], encoded_buf: Box::new([0; BASE64_CHUNK_SIZE_COLUMNS]),
#[cfg(feature = "async")] #[cfg(feature = "async")]
encoded_line: None, encoded_line: None,
}) })
@ -317,7 +317,7 @@ impl<W: Write> ArmoredWriter<W> {
} => { } => {
let byte_buf = byte_buf.unwrap(); let byte_buf = byte_buf.unwrap();
let encoded = let encoded =
base64::encode_config_slice(&byte_buf, base64::STANDARD, &mut encoded_buf); base64::encode_config_slice(&byte_buf, base64::STANDARD, &mut encoded_buf[..]);
inner.write_all(&encoded_buf[..encoded])?; inner.write_all(&encoded_buf[..encoded])?;
inner.finish() inner.finish()
} }
@ -359,10 +359,14 @@ impl<W: Write> Write for ArmoredWriter<W> {
break; break;
} else { } else {
assert_eq!( assert_eq!(
base64::encode_config_slice(&byte_buf, base64::STANDARD, encoded_buf), base64::encode_config_slice(
&byte_buf,
base64::STANDARD,
&mut encoded_buf[..],
),
BASE64_CHUNK_SIZE_COLUMNS BASE64_CHUNK_SIZE_COLUMNS
); );
inner.write_all(encoded_buf)?; inner.write_all(&encoded_buf[..])?;
byte_buf.clear(); byte_buf.clear();
}; };
} }
@ -390,7 +394,7 @@ impl<W: AsyncWrite> ArmoredWriter<W> {
Format::AsciiArmor => ArmoredWriter(ArmorIs::Enabled { Format::AsciiArmor => ArmoredWriter(ArmorIs::Enabled {
inner: LineEndingWriter::new_async(output), inner: LineEndingWriter::new_async(output),
byte_buf: Some(Vec::with_capacity(BASE64_CHUNK_SIZE_BYTES)), byte_buf: Some(Vec::with_capacity(BASE64_CHUNK_SIZE_BYTES)),
encoded_buf: [0; BASE64_CHUNK_SIZE_COLUMNS], encoded_buf: Box::new([0; BASE64_CHUNK_SIZE_COLUMNS]),
encoded_line: None, encoded_line: None,
}), }),
Format::Binary => ArmoredWriter(ArmorIs::Disabled { inner: output }), Format::Binary => ArmoredWriter(ArmorIs::Disabled { inner: output }),
@ -455,7 +459,11 @@ impl<W: AsyncWrite> AsyncWrite for ArmoredWriter<W> {
// line must be written in poll_close(). // line must be written in poll_close().
if !buf.is_empty() { if !buf.is_empty() {
assert_eq!( assert_eq!(
base64::encode_config_slice(&byte_buf, base64::STANDARD, encoded_buf), base64::encode_config_slice(
&byte_buf,
base64::STANDARD,
&mut encoded_buf[..],
),
ARMORED_COLUMNS_PER_LINE ARMORED_COLUMNS_PER_LINE
); );
*encoded_line = Some(EncodedBytes { *encoded_line = Some(EncodedBytes {
@ -499,7 +507,8 @@ impl<W: AsyncWrite> AsyncWrite for ArmoredWriter<W> {
if let Some(byte_buf) = byte_buf { if let Some(byte_buf) = byte_buf {
// Finish the armored format with a partial line (if necessary) and the end // Finish the armored format with a partial line (if necessary) and the end
// marker. // marker.
let encoded = base64::encode_config_slice(&byte_buf, base64::STANDARD, encoded_buf); let encoded =
base64::encode_config_slice(&byte_buf, base64::STANDARD, &mut encoded_buf[..]);
*encoded_line = Some(EncodedBytes { *encoded_line = Some(EncodedBytes {
offset: 0, offset: 0,
end: encoded, end: encoded,
@ -982,7 +991,7 @@ impl<R: AsyncBufRead + Unpin> AsyncRead for ArmoredReader<R> {
{ {
// Emulates `AsyncBufReadExt::read_line`. // Emulates `AsyncBufReadExt::read_line`.
let mut this = self.as_mut().project(); let mut this = self.as_mut().project();
let buf: &mut String = &mut this.line_buf; let buf: &mut String = this.line_buf;
let mut bytes = mem::take(buf).into_bytes(); let mut bytes = mem::take(buf).into_bytes();
let mut read = 0; let mut read = 0;
ready!(read_line_internal( ready!(read_line_internal(

2
age/src/scrypt.rs
View file

@ -130,7 +130,7 @@ impl<'a> crate::Identity for Identity<'a> {
// Place bounds on the work factor we will accept (roughly 16 seconds). // Place bounds on the work factor we will accept (roughly 16 seconds).
let target = target_scrypt_work_factor(); let target = target_scrypt_work_factor();
if log_n > self.max_work_factor.unwrap_or_else(|| target + 4) { if log_n > self.max_work_factor.unwrap_or(target + 4) {
return Some(Err(DecryptError::ExcessiveWork { return Some(Err(DecryptError::ExcessiveWork {
required: log_n, required: log_n,
target, target,