summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAzul <azul@riseup.net>2020-12-08 09:29:18 +0100
committerAzul <azul@riseup.net>2020-12-08 12:51:56 +0100
commit6f77fb84cec4d3d62d3885ce6270919bc81419dc (patch)
tree4102eb7ebfa45ae5a94d705f652a025b4065d5a6
parent15429e90e6ec1ff1401500f592e8698a89b8cceb (diff)
openpgp: Use parens for assert_send_and_sync!.
-rw-r--r--openpgp/src/armor.rs4
-rw-r--r--openpgp/src/cert.rs4
-rw-r--r--openpgp/src/cert/amalgamation.rs4
-rw-r--r--openpgp/src/cert/amalgamation/iter.rs4
-rw-r--r--openpgp/src/cert/builder.rs6
-rw-r--r--openpgp/src/cert/bundle.rs2
-rw-r--r--openpgp/src/cert/revoke.rs8
-rw-r--r--openpgp/src/crypto/aead.rs2
-rw-r--r--openpgp/src/crypto/asymmetric.rs2
-rw-r--r--openpgp/src/crypto/mem.rs2
-rw-r--r--openpgp/src/crypto/mod.rs4
-rw-r--r--openpgp/src/crypto/mpi.rs14
-rw-r--r--openpgp/src/crypto/s2k.rs2
-rw-r--r--openpgp/src/crypto/symmetric.rs4
-rw-r--r--openpgp/src/fingerprint.rs2
-rw-r--r--openpgp/src/fmt.rs2
-rw-r--r--openpgp/src/keyhandle.rs2
-rw-r--r--openpgp/src/keyid.rs2
-rw-r--r--openpgp/src/lib.rs2
-rw-r--r--openpgp/src/macros.rs8
-rw-r--r--openpgp/src/message/mod.rs4
-rw-r--r--openpgp/src/packet/aed.rs2
-rw-r--r--openpgp/src/packet/compressed_data.rs2
-rw-r--r--openpgp/src/packet/container.rs4
-rw-r--r--openpgp/src/packet/header/ctb.rs8
-rw-r--r--openpgp/src/packet/header/mod.rs4
-rw-r--r--openpgp/src/packet/key.rs20
-rw-r--r--openpgp/src/packet/literal.rs2
-rw-r--r--openpgp/src/packet/marker.rs2
-rw-r--r--openpgp/src/packet/mod.rs20
-rw-r--r--openpgp/src/packet/one_pass_sig.rs2
-rw-r--r--openpgp/src/packet/pkesk.rs2
-rw-r--r--openpgp/src/packet/seip.rs2
-rw-r--r--openpgp/src/packet/signature.rs6
-rw-r--r--openpgp/src/packet/signature/subpacket.rs14
-rw-r--r--openpgp/src/packet/tag.rs2
-rw-r--r--openpgp/src/packet/trust.rs2
-rw-r--r--openpgp/src/packet/unknown.rs2
-rw-r--r--openpgp/src/packet/user_attribute.rs8
-rw-r--r--openpgp/src/packet/userid.rs4
-rw-r--r--openpgp/src/packet_pile.rs2
-rw-r--r--openpgp/src/parse.rs2
-rw-r--r--openpgp/src/parse/map.rs4
-rw-r--r--openpgp/src/parse/packet_parser_builder.rs2
-rw-r--r--openpgp/src/parse/stream.rs4
-rw-r--r--openpgp/src/policy.rs4
-rw-r--r--openpgp/src/serialize/stream.rs16
-rw-r--r--openpgp/src/serialize/stream/padding.rs2
-rw-r--r--openpgp/src/types/compression_level.rs2
-rw-r--r--openpgp/src/types/features.rs2
-rw-r--r--openpgp/src/types/key_flags.rs2
-rw-r--r--openpgp/src/types/server_preferences.rs2
-rw-r--r--openpgp/src/types/timestamp.rs4
53 files changed, 120 insertions, 120 deletions
diff --git a/openpgp/src/armor.rs b/openpgp/src/armor.rs
index 0c434070..3f14cb00 100644
--- a/openpgp/src/armor.rs
+++ b/openpgp/src/armor.rs
@@ -72,7 +72,7 @@ pub enum Kind {
File,
}
-assert_send_and_sync!{Kind}
+assert_send_and_sync!(Kind);
#[cfg(test)]
impl Arbitrary for Kind {
@@ -173,7 +173,7 @@ pub struct Writer<W: Write> {
header: Vec<u8>,
dirty: bool,
}
-assert_send_and_sync!{Writer<W>, W: Write}
+assert_send_and_sync!(Writer<W>, W: Write);
impl<W: Write> Writer<W> {
/// Constructs a new filter for the given type of data.
diff --git a/openpgp/src/cert.rs b/openpgp/src/cert.rs
index fb6dedba..39a1f293 100644
--- a/openpgp/src/cert.rs
+++ b/openpgp/src/cert.rs
@@ -728,7 +728,7 @@ pub struct Cert {
bad: Vec<packet::Signature>,
}
} // doc-hack, see above
-assert_send_and_sync!{Cert}
+assert_send_and_sync!(Cert);
impl std::str::FromStr for Cert {
type Err = anyhow::Error;
@@ -2870,7 +2870,7 @@ pub struct ValidCert<'a> {
// The reference time.
time: time::SystemTime,
}
-assert_send_and_sync!{ValidCert<'_>}
+assert_send_and_sync!(ValidCert<'_>);
impl<'a> std::ops::Deref for ValidCert<'a> {
type Target = Cert;
diff --git a/openpgp/src/cert/amalgamation.rs b/openpgp/src/cert/amalgamation.rs
index 2cac62e2..91328528 100644
--- a/openpgp/src/cert/amalgamation.rs
+++ b/openpgp/src/cert/amalgamation.rs
@@ -647,7 +647,7 @@ pub struct ComponentAmalgamation<'a, C> {
cert: &'a Cert,
bundle: &'a ComponentBundle<C>,
}
-assert_send_and_sync!{ComponentAmalgamation<'_, C>, C}
+assert_send_and_sync!(ComponentAmalgamation<'_, C>, C);
/// A User ID and its associated data.
///
@@ -1078,7 +1078,7 @@ pub struct ValidComponentAmalgamation<'a, C> {
// The binding signature at time `time`. (This is just a cache.)
binding_signature: &'a Signature,
}
-assert_send_and_sync!{ValidComponentAmalgamation<'_, C>, C}
+assert_send_and_sync!(ValidComponentAmalgamation<'_, C>, C);
/// A Valid User ID and its associated data.
///
diff --git a/openpgp/src/cert/amalgamation/iter.rs b/openpgp/src/cert/amalgamation/iter.rs
index 8c864537..60ac9495 100644
--- a/openpgp/src/cert/amalgamation/iter.rs
+++ b/openpgp/src/cert/amalgamation/iter.rs
@@ -90,7 +90,7 @@ pub struct ComponentAmalgamationIter<'a, C> {
cert: &'a Cert,
iter: slice::Iter<'a, ComponentBundle<C>>,
}
-assert_send_and_sync!{ComponentAmalgamationIter<'_, C>, C}
+assert_send_and_sync!(ComponentAmalgamationIter<'_, C>, C);
/// An iterator over `UserIDAmalgamtion`s.
///
@@ -246,7 +246,7 @@ pub struct ValidComponentAmalgamationIter<'a, C> {
// at time `t`.
revoked: Option<bool>,
}
-assert_send_and_sync!{ValidComponentAmalgamationIter<'_, C>, C}
+assert_send_and_sync!(ValidComponentAmalgamationIter<'_, C>, C);
/// An iterator over `ValidUserIDAmalgamtion`s.
///
diff --git a/openpgp/src/cert/builder.rs b/openpgp/src/cert/builder.rs
index 9b621b64..16a4339f 100644
--- a/openpgp/src/cert/builder.rs
+++ b/openpgp/src/cert/builder.rs
@@ -65,7 +65,7 @@ pub enum CipherSuite {
/// 4096 bit RSA with SHA512 and AES256
RSA4k,
}
-assert_send_and_sync!{CipherSuite}
+assert_send_and_sync!(CipherSuite);
impl Default for CipherSuite {
fn default() -> Self {
@@ -134,7 +134,7 @@ pub struct KeyBlueprint {
// CertBuilder::ciphersuite.
ciphersuite: Option<CipherSuite>,
}
-assert_send_and_sync!{KeyBlueprint}
+assert_send_and_sync!(KeyBlueprint);
/// Simplifies the generation of OpenPGP certificates.
///
@@ -175,7 +175,7 @@ pub struct CertBuilder<'a> {
revocation_keys: Option<Vec<RevocationKey>>,
phantom: PhantomData<&'a ()>,
}
-assert_send_and_sync!{CertBuilder<'_>}
+assert_send_and_sync!(CertBuilder<'_>);
impl CertBuilder<'_> {
/// Returns a new `CertBuilder`.
diff --git a/openpgp/src/cert/bundle.rs b/openpgp/src/cert/bundle.rs
index 221c0888..fb5922f0 100644
--- a/openpgp/src/cert/bundle.rs
+++ b/openpgp/src/cert/bundle.rs
@@ -125,7 +125,7 @@ pub struct ComponentBundle<C> {
// Third-party revocations (e.g., designated revokers).
pub(crate) other_revocations: Vec<Signature>,
}
-assert_send_and_sync!{ComponentBundle<C>, C}
+assert_send_and_sync!(ComponentBundle<C>, C);
/// A key (primary or subkey, public or private) and any associated
/// signatures.
diff --git a/openpgp/src/cert/revoke.rs b/openpgp/src/cert/revoke.rs
index 24fdb55b..605c61c3 100644
--- a/openpgp/src/cert/revoke.rs
+++ b/openpgp/src/cert/revoke.rs
@@ -81,7 +81,7 @@ use crate::cert::prelude::*;
pub struct CertRevocationBuilder {
builder: signature::SignatureBuilder,
}
-assert_send_and_sync!{CertRevocationBuilder}
+assert_send_and_sync!(CertRevocationBuilder);
impl CertRevocationBuilder {
/// Returns a new `CertRevocationBuilder`.
@@ -319,7 +319,7 @@ impl Deref for CertRevocationBuilder {
pub struct SubkeyRevocationBuilder {
builder: signature::SignatureBuilder,
}
-assert_send_and_sync!{SubkeyRevocationBuilder}
+assert_send_and_sync!(SubkeyRevocationBuilder);
impl SubkeyRevocationBuilder {
/// Returns a new `SubkeyRevocationBuilder`.
@@ -551,7 +551,7 @@ impl Deref for SubkeyRevocationBuilder {
pub struct UserIDRevocationBuilder {
builder: signature::SignatureBuilder,
}
-assert_send_and_sync!{UserIDRevocationBuilder}
+assert_send_and_sync!(UserIDRevocationBuilder);
impl UserIDRevocationBuilder {
/// Returns a new `UserIDRevocationBuilder`.
@@ -797,7 +797,7 @@ impl Deref for UserIDRevocationBuilder {
pub struct UserAttributeRevocationBuilder {
builder: signature::SignatureBuilder,
}
-assert_send_and_sync!{UserAttributeRevocationBuilder}
+assert_send_and_sync!(UserAttributeRevocationBuilder);
impl UserAttributeRevocationBuilder {
/// Returns a new `UserAttributeRevocationBuilder`.
diff --git a/openpgp/src/crypto/aead.rs b/openpgp/src/crypto/aead.rs
index ed773b7d..2544f6c8 100644
--- a/openpgp/src/crypto/aead.rs
+++ b/openpgp/src/crypto/aead.rs
@@ -544,7 +544,7 @@ pub struct Encryptor<W: io::Write> {
// A place to write encrypted data into.
scratch: Vec<u8>,
}
-assert_send_and_sync!{Encryptor<W>, W: io::Write}
+assert_send_and_sync!(Encryptor<W>, W: io::Write);
impl<W: io::Write> Encryptor<W> {
/// Instantiate a new AEAD encryptor.
diff --git a/openpgp/src/crypto/asymmetric.rs b/openpgp/src/crypto/asymmetric.rs
index 55b24d7d..3e5b5ddd 100644
--- a/openpgp/src/crypto/asymmetric.rs
+++ b/openpgp/src/crypto/asymmetric.rs
@@ -137,7 +137,7 @@ pub struct KeyPair {
public: Key<key::PublicParts, key::UnspecifiedRole>,
secret: packet::key::Unencrypted,
}
-assert_send_and_sync!{KeyPair}
+assert_send_and_sync!(KeyPair);
impl KeyPair {
/// Creates a new key pair.
diff --git a/openpgp/src/crypto/mem.rs b/openpgp/src/crypto/mem.rs
index ea135a24..59056cac 100644
--- a/openpgp/src/crypto/mem.rs
+++ b/openpgp/src/crypto/mem.rs
@@ -218,7 +218,7 @@ pub struct Encrypted {
ciphertext: Protected,
iv: Protected,
}
-assert_send_and_sync!{Encrypted}
+assert_send_and_sync!(Encrypted);
impl PartialEq for Encrypted {
fn eq(&self, other: &Self) -> bool {
diff --git a/openpgp/src/crypto/mod.rs b/openpgp/src/crypto/mod.rs
index 5193fcca..591d2c6f 100644
--- a/openpgp/src/crypto/mod.rs
+++ b/openpgp/src/crypto/mod.rs
@@ -48,7 +48,7 @@ pub(crate) mod symmetric;
/// [`From`]: https://doc.rust-lang.org/std/convert/t