summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorNora Widdecke <nora@sequoia-pgp.org>2021-04-20 11:44:05 +0200
committerNora Widdecke <nora@sequoia-pgp.org>2021-04-20 11:55:22 +0200
commit5994213a0f7b97a595442d4f15c4e040bcac2986 (patch)
tree7a747cbd1cc8bb0e6bf0e733c36ea7e19155654c
parent0863c094dab930f72bcf72eec7a5a49d76d4d0a0 (diff)
lint: Remove unnecessary trailing semicolons.
- rustc 1.51 has activated the redundant_semicolons lint. https://doc.rust-lang.org/rustc/lints/listing/warn-by-default.html#redundant-semicolons
-rw-r--r--openpgp/src/crypto/s2k.rs2
-rw-r--r--openpgp/src/packet/signature.rs2
-rw-r--r--openpgp/src/parse.rs6
-rw-r--r--openpgp/src/parse/hashed_reader.rs2
-rw-r--r--openpgp/src/parse/stream.rs2
-rw-r--r--openpgp/src/serialize/stream.rs4
6 files changed, 9 insertions, 9 deletions
diff --git a/openpgp/src/crypto/s2k.rs b/openpgp/src/crypto/s2k.rs
index 72bd4466..318557ca 100644
--- a/openpgp/src/crypto/s2k.rs
+++ b/openpgp/src/crypto/s2k.rs
@@ -420,7 +420,7 @@ mod tests {
cipher_algo: SymmetricAlgorithm,
password: Password,
key_hex: &'a str,
- };
+ }
// Note: this test only works with SK-ESK packets that don't
// contain an encrypted session key, i.e., the session key is
diff --git a/openpgp/src/packet/signature.rs b/openpgp/src/packet/signature.rs
index e5dcda52..9e02c7ad 100644
--- a/openpgp/src/packet/signature.rs
+++ b/openpgp/src/packet/signature.rs
@@ -3126,7 +3126,7 @@ mod test {
key: &'a str,
data: &'a str,
good: usize,
- };
+ }
let tests = [
Test {
diff --git a/openpgp/src/parse.rs b/openpgp/src/parse.rs
index 48a731ca..cdf9fb19 100644
--- a/openpgp/src/parse.rs
+++ b/openpgp/src/parse.rs
@@ -2028,7 +2028,7 @@ fn one_pass_sig_test () {
struct Test<'a> {
filename: &'a str,
digest_prefix: Vec<[u8; 2]>,
- };
+ }
let tests = [
Test {
@@ -2692,7 +2692,7 @@ fn skesk_parser_test() {
cipher_algo: SymmetricAlgorithm,
password: Password,
key_hex: &'a str,
- };
+ }
let tests = [
Test {
@@ -6065,7 +6065,7 @@ mod test {
message.finalize()?;
}
- struct Helper {};
+ struct Helper {}
impl VerificationHelper for Helper {
fn get_certs(&mut self, _ids: &[KeyHandle]) -> Result<Vec<Cert>> {
Ok(vec![Cert::from_bytes(crate::tests::key("testy-new.pgp"))?])
diff --git a/openpgp/src/parse/hashed_reader.rs b/openpgp/src/parse/hashed_reader.rs
index be074570..362da1fe 100644
--- a/openpgp/src/parse/hashed_reader.rs
+++ b/openpgp/src/parse/hashed_reader.rs
@@ -387,7 +387,7 @@ mod test {
struct Test<'a> {
data: &'a [u8],
expected: HashMap<HashAlgorithm, &'a str>,
- };
+ }
let tests = [
Test {
diff --git a/openpgp/src/parse/stream.rs b/openpgp/src/parse/stream.rs
index 5a3db324..26ca706e 100644
--- a/openpgp/src/parse/stream.rs
+++ b/openpgp/src/parse/stream.rs
@@ -3311,7 +3311,7 @@ mod test {
sig: Vec<u8>,
content: &'a [u8],
reference: time::SystemTime,
- };
+ }
let tests = [
Test {
sig: crate::tests::message(
diff --git a/openpgp/src/serialize/stream.rs b/openpgp/src/serialize/stream.rs
index be67fd00..1b2195e5 100644
--- a/openpgp/src/serialize/stream.rs
+++ b/openpgp/src/serialize/stream.rs
@@ -3273,7 +3273,7 @@ mod test {
struct Helper<'a> {
policy: &'a dyn Policy,
tsk: &'a Cert,
- };
+ }
impl<'a> VerificationHelper for Helper<'a> {
fn get_certs(&mut self, _ids: &[crate::KeyHandle])
-> Result<Vec<Cert>> {
@@ -3492,7 +3492,7 @@ mod test {
message.finalize()?;
}
- struct Helper {};
+ struct Helper {}
impl VerificationHelper for Helper {
fn get_certs(&mut self, _ids: &[KeyHandle]) -> Result<Vec<Cert>>
{