summaryrefslogtreecommitdiffstats
path: root/openpgp/src/crypto
diff options
context:
space:
mode:
authorNora Widdecke <nora@sequoia-pgp.org>2021-04-07 18:45:55 +0200
committerNora Widdecke <nora@sequoia-pgp.org>2021-04-09 13:13:59 +0200
commit76f2e0ed8e30a0d1cde749f3444bd8a4c81bea87 (patch)
tree0085cfecde9d35b15c98fc8650734ecf5d61358f /openpgp/src/crypto
parentbaecfecbf953aa9e40f16084b927f35b69efc8f0 (diff)
Lint: Remove redundant returns.
- https://rust-lang.github.io/rust-clippy/master/index.html#needless_return
Diffstat (limited to 'openpgp/src/crypto')
-rw-r--r--openpgp/src/crypto/aead.rs22
-rw-r--r--openpgp/src/crypto/symmetric.rs22
2 files changed, 22 insertions, 22 deletions
diff --git a/openpgp/src/crypto/aead.rs b/openpgp/src/crypto/aead.rs
index f26d71fb..8fd13d5e 100644
--- a/openpgp/src/crypto/aead.rs
+++ b/openpgp/src/crypto/aead.rs
@@ -455,48 +455,48 @@ impl<'a> fmt::Debug for BufferedReaderDecryptor<'a> {
impl<'a> BufferedReader<Cookie> for BufferedReaderDecryptor<'a> {
fn buffer(&self) -> &[u8] {
- return self.reader.buffer();
+ self.reader.buffer()
}
fn data(&mut self, amount: usize) -> io::Result<&[u8]> {
- return self.reader.data(amount);
+ self.reader.data(amount)
}
fn data_hard(&mut self, amount: usize) -> io::Result<&[u8]> {
- return self.reader.data_hard(amount);
+ self.reader.data_hard(amount)
}
fn data_eof(&mut self) -> io::Result<&[u8]> {
- return self.reader.data_eof();
+ self.reader.data_eof()
}
fn consume(&mut self, amount: usize) -> &[u8] {
- return self.reader.consume(amount);
+ self.reader.consume(amount)
}
fn data_consume(&mut self, amount: usize)
-> io::Result<&[u8]> {
- return self.reader.data_consume(amount);
+ self.reader.data_consume(amount)
}
fn data_consume_hard(&mut self, amount: usize) -> io::Result<&[u8]> {
- return self.reader.data_consume_hard(amount);
+ self.reader.data_consume_hard(amount)
}
fn read_be_u16(&mut self) -> io::Result<u16> {
- return self.reader.read_be_u16();
+ self.reader.read_be_u16()
}
fn read_be_u32(&mut self) -> io::Result<u32> {
- return self.reader.read_be_u32();
+ self.reader.read_be_u32()
}
fn steal(&mut self, amount: usize) -> io::Result<Vec<u8>> {
- return self.reader.steal(amount);
+ self.reader.steal(amount)
}
fn steal_eof(&mut self) -> io::Result<Vec<u8>> {
- return self.reader.steal_eof();
+ self.reader.steal_eof()
}
fn get_mut(&mut self) -> Option<&mut dyn BufferedReader<Cookie>> {
diff --git a/openpgp/src/crypto/symmetric.rs b/openpgp/src/crypto/symmetric.rs
index 2c2ccab3..dba529ef 100644
--- a/openpgp/src/crypto/symmetric.rs
+++ b/openpgp/src/crypto/symmetric.rs
@@ -230,48 +230,48 @@ impl<R: BufferedReader<C>, C: fmt::Debug + Send + Sync> fmt::Debug for BufferedR
impl<R: BufferedReader<C>, C: fmt::Debug + Send + Sync> BufferedReader<C>
for BufferedReaderDecryptor<R, C> {
fn buffer(&self) -> &[u8] {
- return self.reader.buffer();
+ self.reader.buffer()
}
fn data(&mut self, amount: usize) -> io::Result<&[u8]> {
- return self.reader.data(amount);
+ self.reader.data(amount)
}
fn data_hard(&mut self, amount: usize) -> io::Result<&[u8]> {
- return self.reader.data_hard(amount);
+ self.reader.data_hard(amount)
}
fn data_eof(&mut self) -> io::Result<&[u8]> {
- return self.reader.data_eof();
+ self.reader.data_eof()
}
fn consume(&mut self, amount: usize) -> &[u8] {
- return self.reader.consume(amount);
+ self.reader.consume(amount)
}
fn data_consume(&mut self, amount: usize)
-> io::Result<&[u8]> {
- return self.reader.data_consume(amount);
+ self.reader.data_consume(amount)
}
fn data_consume_hard(&mut self, amount: usize) -> io::Result<&[u8]> {
- return self.reader.data_consume_hard(amount);
+ self.reader.data_consume_hard(amount)
}
fn read_be_u16(&mut self) -> io::Result<u16> {
- return self.reader.read_be_u16();
+ self.reader.read_be_u16()
}
fn read_be_u32(&mut self) -> io::Result<u32> {
- return self.reader.read_be_u32();
+ self.reader.read_be_u32()
}
fn steal(&mut self, amount: usize) -> io::Result<Vec<u8>> {
- return self.reader.steal(amount);
+ self.reader.steal(amount)
}
fn steal_eof(&mut self) -> io::Result<Vec<u8>> {
- return self.reader.steal_eof();
+ self.reader.steal_eof()
}
fn get_mut(&mut self) -> Option<&mut dyn BufferedReader<C>> {