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

clippy: Remove needless borrows

Browse source
This commit is contained in:
Jack Grigg 2022-03-16 03:52:04 +00:00
parent 4df2fac3e1
commit 538ac500da
9 changed files with 30 additions and 32 deletions
Download patch file Download diff file Expand all files Collapse all files

10
age-plugin/src/identity.rs
View file

@ -134,9 +134,9 @@ impl Error {
fn message(&self) -> &str {
match self {
Error::Identity { message, .. } => &message,
Error::Internal { message } => &message,
Error::Stanza { message, .. } => &message,
Error::Identity { message, .. } => message,
Error::Internal { message } => message,
Error::Stanza { message, .. } => message,
}
}
@ -152,8 +152,8 @@ impl Error {
};
let metadata = match &index {
Some((file_index, Some(stanza_index))) => vec![self.kind(), &file_index, &stanza_index],
Some((index, None)) => vec![self.kind(), &index],
Some((file_index, Some(stanza_index))) => vec![self.kind(), file_index, stanza_index],
Some((index, None)) => vec![self.kind(), index],
None => vec![self.kind()],
};

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

@ -128,9 +128,9 @@ impl Error {
fn message(&self) -> &str {
match self {
Error::Recipient { message, .. } => &message,
Error::Identity { message, .. } => &message,
Error::Internal { message } => &message,
Error::Recipient { message, .. } => message,
Error::Identity { message, .. } => message,
Error::Internal { message } => message,
}
}
@ -143,7 +143,7 @@ impl Error {
};
let metadata = match &index {
Some(index) => vec![self.kind(), &index],
Some(index) => vec![self.kind(), index],
None => vec![self.kind()],
};
@ -230,7 +230,7 @@ pub(crate) fn run_v1<P: RecipientPluginV1>(mut plugin: P) -> io::Result<()> {
.as_ref()
.and_then(|(hrp, data, variant)| match (plugin_name(hrp), variant) {
(Some(plugin_name), &bech32::Variant::Bech32) => {
Vec::from_base32(&data).ok().map(|data| (plugin_name, data))
Vec::from_base32(data).ok().map(|data| (plugin_name, data))
}
_ => None,
})
@ -254,7 +254,7 @@ pub(crate) fn run_v1<P: RecipientPluginV1>(mut plugin: P) -> io::Result<()> {
index,
message: "Invalid recipient encoding".to_owned(),
},
|index, plugin_name, bytes| plugin.add_recipient(index, &plugin_name, &bytes),
|index, plugin_name, bytes| plugin.add_recipient(index, plugin_name, &bytes),
);
let identities = parse_and_add(
identities,
@ -269,7 +269,7 @@ pub(crate) fn run_v1<P: RecipientPluginV1>(mut plugin: P) -> io::Result<()> {
index,
message: "Invalid identity encoding".to_owned(),
},
|index, plugin_name, bytes| plugin.add_identity(index, &plugin_name, &bytes),
|index, plugin_name, bytes| plugin.add_identity(index, plugin_name, &bytes),
);
// Phase 2: wrap the file keys or return errors