summaryrefslogtreecommitdiffstats
path: root/autocrypt/src
diff options
context:
space:
mode:
authorNora Widdecke <nora@sequoia-pgp.org>2021-04-06 21:24:59 +0200
committerNora Widdecke <nora@sequoia-pgp.org>2021-04-09 13:13:58 +0200
commit5d029cbf42621452666bd084f7beecb7d3d885a4 (patch)
tree21219c5864beac97ff5c55c78b436918034adcd6 /autocrypt/src
parent9424cd350f32a97479a74d919c646f9e26c2ebce (diff)
Lint: Remove unnecessary conversions.
- https://rust-lang.github.io/rust-clippy/master/index.html#useless_conversion
Diffstat (limited to 'autocrypt/src')
-rw-r--r--autocrypt/src/lib.rs14
1 files changed, 5 insertions, 9 deletions
diff --git a/autocrypt/src/lib.rs b/autocrypt/src/lib.rs
index e460d41e..b6820289 100644
--- a/autocrypt/src/lib.rs
+++ b/autocrypt/src/lib.rs
@@ -619,8 +619,7 @@ impl AutocryptSetupMessage {
Packet::SKESK(skesk) => skesk,
p => return Err(
Error::MalformedMessage(
- format!("Expected a SKESK packet, found a {}", p.tag())
- .into())
+ format!("Expected a SKESK packet, found a {}", p.tag()))
.into()),
};
@@ -636,8 +635,7 @@ impl AutocryptSetupMessage {
ref p => return Err(
Error::MalformedMessage(
format!("Expected a SEIP packet, found a {}",
- p.tag())
- .into())
+ p.tag()))
.into()),
}
@@ -733,7 +731,7 @@ impl<'a> AutocryptSetupMessageParser<'a> {
p => return Err(Error::MalformedMessage(
format!("SEIP container contains a {}, \
expected a Literal Data packet",
- p.tag()).into()).into()),
+ p.tag())).into()),
}
// The inner message consists of an ASCII-armored encoded
@@ -787,8 +785,7 @@ impl<'a> AutocryptSetupMessageParser<'a> {
ref p => return
Err(Error::MalformedMessage(
format!("Expected an MDC packet, got a {}",
- p.tag())
- .into())
+ p.tag()))
.into()),
}
@@ -802,8 +799,7 @@ impl<'a> AutocryptSetupMessageParser<'a> {
// has the right sequence of packets, but we haven't
// carefully checked the nesting. We do that now.
if let Err(err) = pp.is_message() {
- return Err(err.context(
- "Invalid OpenPGP Message").into());
+ return Err(err.context("Invalid OpenPGP Message"));
}
}
PacketParserResult::Some(pp) =>