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

Fix various clippy lints

Browse source
This commit is contained in:
Jack Grigg 2021-09-12 19:53:20 +01:00
parent 8cf431cd48
commit 36ca0c236e
2 changed files with 8 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

14
age-core/src/format.rs
View file

@ -141,11 +141,11 @@ pub mod read {
fn is_base64_char(c: u8) -> bool { fn is_base64_char(c: u8) -> bool {
// Check against the ASCII values of the standard Base64 character set. // Check against the ASCII values of the standard Base64 character set.
match c { matches!(
c,
// A..=Z | a..=z | 0..=9 | + | / // A..=Z | a..=z | 0..=9 | + | /
65..=90 | 97..=122 | 48..=57 | 43 | 47 => true, 65..=90 | 97..=122 | 48..=57 | 43 | 47,
_ => false, )
}
} }
/// From the age specification: /// From the age specification:
@ -201,7 +201,7 @@ pub mod read {
/// recipient stanza is a body of canonical base64 from RFC 4648 without padding /// recipient stanza is a body of canonical base64 from RFC 4648 without padding
/// wrapped at exactly 64 columns. /// wrapped at exactly 64 columns.
/// ``` /// ```
pub fn age_stanza<'a>(input: &'a [u8]) -> IResult<&'a [u8], AgeStanza<'a>> { pub fn age_stanza(input: &[u8]) -> IResult<&[u8], AgeStanza<'_>> {
map( map(
pair( pair(
preceded( preceded(
@ -217,7 +217,7 @@ pub mod read {
)(input) )(input)
} }
fn legacy_age_stanza_inner<'a>(input: &'a [u8]) -> IResult<&'a [u8], AgeStanza<'a>> { fn legacy_age_stanza_inner(input: &[u8]) -> IResult<&[u8], AgeStanza<'_>> {
map( map(
pair( pair(
preceded(tag(STANZA_TAG), separated_list1(tag(" "), arbitrary_string)), preceded(tag(STANZA_TAG), separated_list1(tag(" "), arbitrary_string)),
@ -254,7 +254,7 @@ pub mod read {
/// age files encrypted with beta versions of the `age` or `rage` crates. /// age files encrypted with beta versions of the `age` or `rage` crates.
/// ///
/// [`grease_the_joint`]: super::grease_the_joint /// [`grease_the_joint`]: super::grease_the_joint
pub fn legacy_age_stanza<'a>(input: &'a [u8]) -> IResult<&'a [u8], AgeStanza<'a>> { pub fn legacy_age_stanza(input: &[u8]) -> IResult<&[u8], AgeStanza<'_>> {
alt((age_stanza, legacy_age_stanza_inner))(input) alt((age_stanza, legacy_age_stanza_inner))(input)
} }

8
age-plugin/src/recipient.rs
View file

@ -249,13 +249,7 @@ pub(crate) fn run_v1<P: RecipientPluginV1>(mut plugin: P) -> io::Result<()> {
} }
let recipients = parse_and_add( let recipients = parse_and_add(
recipients, recipients,
|hrp| { |hrp| hrp.strip_prefix(PLUGIN_RECIPIENT_PREFIX),
if hrp.starts_with(PLUGIN_RECIPIENT_PREFIX) {
Some(&hrp[PLUGIN_RECIPIENT_PREFIX.len()..])
} else {
None
}
},
|index| Error::Recipient { |index| Error::Recipient {
index, index,
message: "Invalid recipient encoding".to_owned(), message: "Invalid recipient encoding".to_owned(),