summaryrefslogtreecommitdiffstats
path: root/openpgp/src/serialize
diff options
context:
space:
mode:
authorNora Widdecke <nora@sequoia-pgp.org>2021-11-22 12:58:47 +0100
committerNora Widdecke <nora@sequoia-pgp.org>2021-11-29 11:53:55 +0100
commit049055e3ff5ffe86700b668e924fbff96e82be94 (patch)
tree30dfd63e4d1c3016210b698813e99b70787890e8 /openpgp/src/serialize
parent97ce753fefae770ee0b5b02a611d75e29a7cd01d (diff)
Remove unnecessary borrows.
- Fixed with the help of clippy::needless_borrow.
Diffstat (limited to 'openpgp/src/serialize')
-rw-r--r--openpgp/src/serialize/cert.rs2
-rw-r--r--openpgp/src/serialize/cert_armored.rs10
-rw-r--r--openpgp/src/serialize/stream.rs2
3 files changed, 7 insertions, 7 deletions
diff --git a/openpgp/src/serialize/cert.rs b/openpgp/src/serialize/cert.rs
index b6967f02..fe25c19a 100644
--- a/openpgp/src/serialize/cert.rs
+++ b/openpgp/src/serialize/cert.rs
@@ -532,7 +532,7 @@ impl<'a> TSK<'a> {
continue;
}
- PacketRef::Unknown(&u.unknown()).serialize(o)?;
+ PacketRef::Unknown(u.unknown()).serialize(o)?;
for s in u.signatures() {
serialize_sig(o, s)?;
diff --git a/openpgp/src/serialize/cert_armored.rs b/openpgp/src/serialize/cert_armored.rs
index 83b68479..68f7d332 100644
--- a/openpgp/src/serialize/cert_armored.rs
+++ b/openpgp/src/serialize/cert_armored.rs
@@ -140,7 +140,7 @@ impl<'a> Encoder<'a> {
fn serialize_common(&self, o: &mut dyn io::Write, export: bool)
-> Result<()> {
let (prelude, headers) = match self {
- Encoder::Cert(ref cert) =>
+ Encoder::Cert(cert) =>
(armor::Kind::PublicKey, cert.armor_headers()),
Encoder::TSK(ref tsk) =>
(armor::Kind::SecretKey, tsk.cert.armor_headers()),
@@ -157,12 +157,12 @@ impl<'a> Encoder<'a> {
armor::Writer::with_headers(o, prelude, headers)?;
if export {
match self {
- Encoder::Cert(ref cert) => cert.export(&mut w)?,
+ Encoder::Cert(cert) => cert.export(&mut w)?,
Encoder::TSK(ref tsk) => tsk.export(&mut w)?,
}
} else {
match self {
- Encoder::Cert(ref cert) => cert.serialize(&mut w)?,
+ Encoder::Cert(cert) => cert.serialize(&mut w)?,
Encoder::TSK(ref tsk) => tsk.serialize(&mut w)?,
}
}
@@ -188,14 +188,14 @@ impl<'a> crate::serialize::SerializeInto for Encoder<'a> {}
impl<'a> MarshalInto for Encoder<'a> {
fn serialized_len(&self) -> usize {
let h = match self {
- Encoder::Cert(ref cert) => cert.armor_headers(),
+ Encoder::Cert(cert) => cert.armor_headers(),
Encoder::TSK(ref tsk) => tsk.cert.armor_headers(),
};
let headers_len =
("Comment: ".len() + 1 /* NL */) * h.len()
+ h.iter().map(|c| c.len()).sum::<usize>();
let body_len = (match self {
- Self::Cert(ref cert) => cert.serialized_len(),
+ Self::Cert(cert) => cert.serialized_len(),
Self::TSK(ref tsk) => tsk.serialized_len(),
} + 2) / 3 * 4; // base64
diff --git a/openpgp/src/serialize/stream.rs b/openpgp/src/serialize/stream.rs
index 1b3c13fd..dfc49d0d 100644
--- a/openpgp/src/serialize/stream.rs
+++ b/openpgp/src/serialize/stream.rs
@@ -3249,7 +3249,7 @@ mod test {
let mut good = 0;
while let PacketParserResult::Some(mut pp) = ppr {
if let Packet::Signature(sig) = &mut pp.packet {
- let key = keys.get(&sig.issuer_fingerprints().next().unwrap())
+ let key = keys.get(sig.issuer_fingerprints().next().unwrap())
.unwrap();
sig.verify(key).unwrap();
good += 1;