From 6f77fb84cec4d3d62d3885ce6270919bc81419dc Mon Sep 17 00:00:00 2001 From: Azul Date: Tue, 8 Dec 2020 09:29:18 +0100 Subject: openpgp: Use parens for assert_send_and_sync!. --- openpgp/src/packet/aed.rs | 2 +- openpgp/src/packet/compressed_data.rs | 2 +- openpgp/src/packet/container.rs | 4 ++-- openpgp/src/packet/header/ctb.rs | 8 ++++---- openpgp/src/packet/header/mod.rs | 4 ++-- openpgp/src/packet/key.rs | 20 ++++++++++---------- openpgp/src/packet/literal.rs | 2 +- openpgp/src/packet/marker.rs | 2 +- openpgp/src/packet/mod.rs | 20 ++++++++++---------- openpgp/src/packet/one_pass_sig.rs | 2 +- openpgp/src/packet/pkesk.rs | 2 +- openpgp/src/packet/seip.rs | 2 +- openpgp/src/packet/signature.rs | 6 +++--- openpgp/src/packet/signature/subpacket.rs | 14 +++++++------- openpgp/src/packet/tag.rs | 2 +- openpgp/src/packet/trust.rs | 2 +- openpgp/src/packet/unknown.rs | 2 +- openpgp/src/packet/user_attribute.rs | 8 ++++---- openpgp/src/packet/userid.rs | 4 ++-- 19 files changed, 54 insertions(+), 54 deletions(-) (limited to 'openpgp/src/packet') diff --git a/openpgp/src/packet/aed.rs b/openpgp/src/packet/aed.rs index de44d2fd..791da403 100644 --- a/openpgp/src/packet/aed.rs +++ b/openpgp/src/packet/aed.rs @@ -124,7 +124,7 @@ pub struct AED1 { /// This is a container packet. container: packet::Container, } -assert_send_and_sync!{AED1} +assert_send_and_sync!(AED1); impl std::ops::Deref for AED1 { type Target = packet::Container; diff --git a/openpgp/src/packet/compressed_data.rs b/openpgp/src/packet/compressed_data.rs index cbf94b51..76ec27ee 100644 --- a/openpgp/src/packet/compressed_data.rs +++ b/openpgp/src/packet/compressed_data.rs @@ -29,7 +29,7 @@ pub struct CompressedData { /// This is a container packet. container: packet::Container, } -assert_send_and_sync!{CompressedData} +assert_send_and_sync!(CompressedData); impl std::ops::Deref for CompressedData { type Target = packet::Container; diff --git a/openpgp/src/packet/container.rs b/openpgp/src/packet/container.rs index 5a043634..509b7dcb 100644 --- a/openpgp/src/packet/container.rs +++ b/openpgp/src/packet/container.rs @@ -95,7 +95,7 @@ pub enum Body { Structured(Vec), } -assert_send_and_sync!{Body} +assert_send_and_sync!(Body); /// Holds packet bodies. /// @@ -110,7 +110,7 @@ pub struct Container { body_digest: Vec, } -assert_send_and_sync!{Container} +assert_send_and_sync!(Container); impl std::ops::Deref for Container { type Target = Body; diff --git a/openpgp/src/packet/header/ctb.rs b/openpgp/src/packet/header/ctb.rs index 8dc2e949..2e32b41d 100644 --- a/openpgp/src/packet/header/ctb.rs +++ b/openpgp/src/packet/header/ctb.rs @@ -39,7 +39,7 @@ pub struct CTBNew { /// Packet CTB fields common: CTBCommon, } -assert_send_and_sync!{CTBNew} +assert_send_and_sync!(CTBNew); impl CTBNew { /// Constructs a new-style CTB. @@ -91,7 +91,7 @@ pub enum PacketLengthType { /// from the context, e.g., EOF. Indeterminate, } -assert_send_and_sync!{PacketLengthType} +assert_send_and_sync!(PacketLengthType); impl TryFrom for PacketLengthType { type Error = anyhow::Error; @@ -131,7 +131,7 @@ pub struct CTBOld { /// Type of length specifier. length_type: PacketLengthType, } -assert_send_and_sync!{CTBOld} +assert_send_and_sync!(CTBOld); impl CTBOld { /// Constructs an old-style CTB. @@ -207,7 +207,7 @@ pub enum CTB { /// Old PGP 2.6 header format. Old(CTBOld), } -assert_send_and_sync!{CTB} +assert_send_and_sync!(CTB); impl CTB { /// Constructs a new-style CTB. diff --git a/openpgp/src/packet/header/mod.rs b/openpgp/src/packet/header/mod.rs index 8f455b1c..ad8f344a 100644 --- a/openpgp/src/packet/header/mod.rs +++ b/openpgp/src/packet/header/mod.rs @@ -38,7 +38,7 @@ pub struct Header { /// The packet's length. length: BodyLength, } -assert_send_and_sync!{Header} +assert_send_and_sync!(Header); impl Header { /// Creates a new header. @@ -246,4 +246,4 @@ pub enum BodyLength { /// This type is only used with old format packets. Indeterminate, } -assert_send_and_sync!{BodyLength} +assert_send_and_sync!(BodyLength); diff --git a/openpgp/src/packet/key.rs b/openpgp/src/packet/key.rs index da53991d..99584a6e 100644 --- a/openpgp/src/packet/key.rs +++ b/openpgp/src/packet/key.rs @@ -441,7 +441,7 @@ pub trait KeyRole: fmt::Debug + seal::Sealed { #[derive(Clone, Copy, Debug, PartialEq, Eq, Hash)] pub struct PublicParts; -assert_send_and_sync!{PublicParts} +assert_send_and_sync!(PublicParts); impl seal::Sealed for PublicParts {} impl KeyParts for PublicParts { @@ -494,7 +494,7 @@ impl KeyParts for PublicParts { #[derive(Clone, Copy, Debug, PartialEq, Eq, Hash)] pub struct SecretParts; -assert_send_and_sync!{SecretParts} +assert_send_and_sync!(SecretParts); impl seal::Sealed for SecretParts {} impl KeyParts for SecretParts { @@ -555,7 +555,7 @@ impl KeyParts for SecretParts { #[derive(Clone, Copy, Debug, PartialEq, Eq, Hash)] pub struct UnspecifiedParts; -assert_send_and_sync!{UnspecifiedParts} +assert_send_and_sync!(UnspecifiedParts); impl seal::Sealed for UnspecifiedParts {} impl KeyParts for UnspecifiedParts { @@ -600,7 +600,7 @@ impl KeyParts for UnspecifiedParts { #[derive(Clone, Copy, Debug, PartialEq, Eq, Hash)] pub struct PrimaryRole; -assert_send_and_sync!{PrimaryRole} +assert_send_and_sync!(PrimaryRole); impl seal::Sealed for PrimaryRole {} impl KeyRole for PrimaryRole { @@ -634,7 +634,7 @@ impl KeyRole for PrimaryRole { #[derive(Clone, Copy, Debug, PartialEq, Eq, Hash)] pub struct SubordinateRole; -assert_send_and_sync!{SubordinateRole} +assert_send_and_sync!(SubordinateRole); impl seal::Sealed for SubordinateRole {} impl KeyRole for SubordinateRole { @@ -674,7 +674,7 @@ impl KeyRole for SubordinateRole { #[derive(Clone, Copy, Debug, PartialEq, Eq, Hash)] pub struct UnspecifiedRole; -assert_send_and_sync!{UnspecifiedRole} +assert_send_and_sync!(UnspecifiedRole); impl seal::Sealed for UnspecifiedRole {} impl KeyRole for UnspecifiedRole { @@ -782,7 +782,7 @@ pub struct Key4 r: std::marker::PhantomData, } -assert_send_and_sync!{Key4, P: KeyParts, R: KeyRole} +assert_send_and_sync!(Key4, P: KeyParts, R: KeyRole); impl PartialEq for Key4 { fn eq(&self, other: &Key4) -> bool { @@ -1236,7 +1236,7 @@ pub enum SecretKeyMaterial { Encrypted(Encrypted), } -assert_send_and_sync!{SecretKeyMaterial} +assert_send_and_sync!(SecretKeyMaterial); impl From for SecretKeyMaterial { fn from(mpis: mpi::SecretKeyMaterial) -> Self { @@ -1364,7 +1364,7 @@ pub struct Unencrypted { mpis: mem::Encrypted, } -assert_send_and_sync!{Unencrypted} +assert_send_and_sync!(Unencrypted); impl From for Unencrypted { fn from(mpis: mpi::SecretKeyMaterial) -> Self { @@ -1451,7 +1451,7 @@ pub struct Encrypted { Box<[u8]>>, // S2K body + IV + ciphertext. } -assert_send_and_sync!{Encrypted} +assert_send_and_sync!(Encrypted); // Because the S2K and ciphertext cannot be cleanly separated at parse // time, we need to carefully compare and hash encrypted key packets. diff --git a/openpgp/src/packet/literal.rs b/openpgp/src/packet/literal.rs index acf388c0..29bfa187 100644 --- a/openpgp/src/packet/literal.rs +++ b/openpgp/src/packet/literal.rs @@ -47,7 +47,7 @@ pub struct Literal { /// if `buffer_unread_content` is used. container: packet::Container, } -assert_send_and_sync!{Literal} +assert_send_and_sync!(Literal); impl fmt::Debug for Literal { fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result { diff --git a/openpgp/src/packet/marker.rs b/openpgp/src/packet/marker.rs index 98d5557c..f8b84842 100644 --- a/openpgp/src/packet/marker.rs +++ b/openpgp/src/packet/marker.rs @@ -16,7 +16,7 @@ pub struct Marker { /// CTB packet header fields. pub(crate) common: packet::Common, } -assert_send_and_sync!{Marker} +assert_send_and_sync!(Marker); impl Marker { pub(crate) const BODY: &'static [u8] = &[0x50, 0x47, 0x50]; diff --git a/openpgp/src/packet/mod.rs b/openpgp/src/packet/mod.rs index c4d94b03..330ed9f4 100644 --- a/openpgp/src/packet/mod.rs +++ b/openpgp/src/packet/mod.rs @@ -284,7 +284,7 @@ pub enum Packet { AED(AED), } } // doc-hack, see above -assert_send_and_sync!{Packet} +assert_send_and_sync!(Packet); macro_rules! impl_into_iterator { ($t:ty) => { @@ -520,7 +520,7 @@ pub struct Common { /// this structure actually gains some fields. dummy: std::marker::PhantomData<()>, } -assert_send_and_sync!{Common} +assert_send_and_sync!(Common); #[cfg(test)] impl Arbitrary for Common { @@ -599,7 +599,7 @@ pub struct Iter<'a> { // `paths` iter. depth: usize, } -assert_send_and_sync!{Iter<'_>} +assert_send_and_sync!(Iter<'_>); impl<'a> Default for Iter<'a> { fn default() -> Self { @@ -920,7 +920,7 @@ pub enum Signature { /// Signature packet version 4. V4(self::signature::Signature4), } -assert_send_and_sync!{Signature} +assert_send_and_sync!(Signature); impl Signature { /// Gets the version. @@ -978,7 +978,7 @@ pub enum OnePassSig { /// OnePassSig packet version 3. V3(self::one_pass_sig::OnePassSig3), } -assert_send_and_sync!{OnePassSig} +assert_send_and_sync!(OnePassSig); impl OnePassSig { /// Gets the version. @@ -1040,7 +1040,7 @@ pub enum PKESK { /// PKESK packet version 3. V3(self::pkesk::PKESK3), } -assert_send_and_sync!{PKESK} +assert_send_and_sync!(PKESK); impl PKESK { /// Gets the version. @@ -1106,7 +1106,7 @@ pub enum SKESK { /// This feature is [experimental](../index.html#experimental-features). V5(self::skesk::SKESK5), } -assert_send_and_sync!{SKESK} +assert_send_and_sync!(SKESK); impl SKESK { /// Gets the version. @@ -1438,7 +1438,7 @@ pub enum Key { /// A version 4 `Key` packet. V4(Key4), } -assert_send_and_sync!{Key, P: key::KeyParts, R: key::KeyRole} +assert_send_and_sync!(Key, P: key::KeyParts, R: key::KeyRole); impl fmt::Display for Key { fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result { @@ -1818,7 +1818,7 @@ pub enum SEIP { /// SEIP packet version 1. V1(self::seip::SEIP1), } -assert_send_and_sync!{SEIP} +assert_send_and_sync!(SEIP); impl SEIP { /// Gets the version. @@ -1880,7 +1880,7 @@ pub enum AED { /// AED packet version 1. V1(self::aed::AED1), } -assert_send_and_sync!{AED} +assert_send_and_sync!(AED); impl AED { /// Gets the version. diff --git a/openpgp/src/packet/one_pass_sig.rs b/openpgp/src/packet/one_pass_sig.rs index ef5123e1..452cc3e7 100644 --- a/openpgp/src/packet/one_pass_sig.rs +++ b/openpgp/src/packet/one_pass_sig.rs @@ -47,7 +47,7 @@ pub struct OnePassSig3 { /// is nested. last: u8, } -assert_send_and_sync!{OnePassSig3} +assert_send_and_sync!(OnePassSig3); impl fmt::Debug for OnePassSig3 { fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result { diff --git a/openpgp/src/packet/pkesk.rs b/openpgp/src/packet/pkesk.rs index 59c2a459..cba96f55 100644 --- a/openpgp/src/packet/pkesk.rs +++ b/openpgp/src/packet/pkesk.rs @@ -41,7 +41,7 @@ pub struct PKESK3 { esk: Ciphertext, } -assert_send_and_sync!{PKESK3} +assert_send_and_sync!(PKESK3); impl PKESK3 { /// Creates a new PKESK3 packet. diff --git a/openpgp/src/packet/seip.rs b/openpgp/src/packet/seip.rs index 4263e6ae..e79bb2bb 100644 --- a/openpgp/src/packet/seip.rs +++ b/openpgp/src/packet/seip.rs @@ -31,7 +31,7 @@ pub struct SEIP1 { container: packet::Container, } -assert_send_and_sync!{SEIP1} +assert_send_and_sync!(SEIP1); impl std::ops::Deref for SEIP1 { type Target = packet::Container; diff --git a/openpgp/src/packet/signature.rs b/openpgp/src/packet/signature.rs index b86eb3cc..ab388738 100644 --- a/openpgp/src/packet/signature.rs +++ b/openpgp/src/packet/signature.rs @@ -223,7 +223,7 @@ pub struct SignatureFields { /// Subpackets. subpackets: SubpacketAreas, } -assert_send_and_sync!{SignatureFields} +assert_send_and_sync!(SignatureFields); #[cfg(test)] impl ArbitraryBounded for SignatureFields { @@ -453,7 +453,7 @@ pub struct SignatureBuilder { original_creation_time: Option, fields: SignatureFields, } -assert_send_and_sync!{SignatureBuilder} +assert_send_and_sync!(SignatureBuilder); impl Deref for SignatureBuilder { type Target = SignatureFields; @@ -1696,7 +1696,7 @@ pub struct Signature4 { /// verification is usually expected to be idempotent. additional_issuers: Vec, } -assert_send_and_sync!{Signature4} +assert_send_and_sync!(Signature4); impl fmt::Debug for Signature4 { fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result { diff --git a/openpgp/src/packet/signature/subpacket.rs b/openpgp/src/packet/signature/subpacket.rs index ced38c04..b7760de0 100644 --- a/openpgp/src/packet/signature/subpacket.rs +++ b/openpgp/src/packet/signature/subpacket.rs @@ -324,7 +324,7 @@ pub enum SubpacketTag { /// Unknown subpacket tag. Unknown(u8), } -assert_send_and_sync!{SubpacketTag} +assert_send_and_sync!(SubpacketTag); impl fmt::Display for SubpacketTag { fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result { @@ -501,7 +501,7 @@ pub struct SubpacketArea { // This is an option, because we parse the subpacket area lazily. parsed: Mutex>>>, } -assert_send_and_sync!{SubpacketArea} +assert_send_and_sync!(SubpacketArea); #[cfg(test)] impl ArbitraryBounded for SubpacketArea { @@ -1077,7 +1077,7 @@ pub struct NotationData { name: String, value: Vec, } -assert_send_and_sync!{NotationData} +assert_send_and_sync!(NotationData); #[cfg(test)] impl Arbitrary for NotationData { @@ -1123,7 +1123,7 @@ impl NotationData { /// Flags for the Notation Data subpacket. #[derive(Clone, PartialEq, Eq, PartialOrd, Ord, Hash)] pub struct NotationDataFlags(crate::types::Bitfield); -assert_send_and_sync!{NotationDataFlags} +assert_send_and_sync!(NotationDataFlags); #[cfg(test)] impl Arbitrary for NotationDataFlags { @@ -1519,7 +1519,7 @@ pub enum SubpacketValue { /// [Section 5.2.3.29 of RFC 4880bis]: https://www.ietf.org/id/draft-ietf-openpgp-rfc4880bis-09.html#section-5.2.3.29 IntendedRecipient(Fingerprint), } -assert_send_and_sync!{SubpacketValue} +assert_send_and_sync!(SubpacketValue); #[cfg(test)] impl ArbitraryBounded for SubpacketValue { @@ -1678,7 +1678,7 @@ pub struct Subpacket { /// authenticated in the context of its signature. authenticated: bool, } -assert_send_and_sync!{Subpacket} +assert_send_and_sync!(Subpacket); impl PartialEq for Subpacket { fn eq(&self, other: &Subpacket) -> bool { @@ -1962,7 +1962,7 @@ pub struct SubpacketAreas { /// Subpackets that are _not_ part of the signature. unhashed_area: SubpacketArea, } -assert_send_and_sync!{SubpacketAreas} +assert_send_and_sync!(SubpacketAreas); #[cfg(test)] impl ArbitraryBounded for SubpacketAreas { diff --git a/openpgp/src/packet/tag.rs b/openpgp/src/packet/tag.rs index b08fd9c8..538aee92 100644 --- a/openpgp/src/packet/tag.rs +++ b/openpgp/src/packet/tag.rs @@ -59,7 +59,7 @@ pub enum Tag { /// Experimental packets. Private(u8), } -assert_send_and_sync!{Tag} +assert_send_and_sync!(Tag); impl Eq for Tag {} diff --git a/openpgp/src/packet/trust.rs b/openpgp/src/packet/trust.rs index 3455fdfd..ff4bd351 100644 --- a/openpgp/src/packet/trust.rs +++ b/openpgp/src/packet/trust.rs @@ -23,7 +23,7 @@ pub struct Trust { value: Vec, } -assert_send_and_sync!{Trust} +assert_send_and_sync!(Trust); impl From> for Trust { fn from(u: Vec) -> Self { diff --git a/openpgp/src/packet/unknown.rs b/openpgp/src/packet/unknown.rs index 35686da2..086f1b32 100644 --- a/openpgp/src/packet/unknown.rs +++ b/openpgp/src/packet/unknown.rs @@ -32,7 +32,7 @@ pub struct Unknown { container: packet::Container, } -assert_send_and_sync!{Unknown} +assert_send_and_sync!(Unknown); impl PartialEq for Unknown { fn eq(&self, other: &Unknown) -> bool { diff --git a/openpgp/src/packet/user_attribute.rs b/openpgp/src/packet/user_attribute.rs index ec44382a..851e3126 100644 --- a/openpgp/src/packet/user_attribute.rs +++ b/openpgp/src/packet/user_attribute.rs @@ -38,7 +38,7 @@ pub struct UserAttribute { /// The user attribute. value: Vec, } -assert_send_and_sync!{UserAttribute} +assert_send_and_sync!(UserAttribute); impl From> for UserAttribute { fn from(u: Vec) -> Self { @@ -118,7 +118,7 @@ impl Arbitrary for UserAttribute { pub struct SubpacketIterator<'a> { reader: buffered_reader::Memory<'a, ()>, } -assert_send_and_sync!{SubpacketIterator<'_>} +assert_send_and_sync!(SubpacketIterator<'_>); impl<'a> Iterator for SubpacketIterator<'a> { type Item = Result; @@ -193,7 +193,7 @@ pub enum Subpacket { /// Unknown subpacket. Unknown(u8, Box<[u8]>), } -assert_send_and_sync!{Subpacket} +assert_send_and_sync!(Subpacket); #[cfg(test)] impl Arbitrary for Subpacket { @@ -227,7 +227,7 @@ pub enum Image { /// Unknown image format. Unknown(u8, Box<[u8]>), } -assert_send_and_sync!{Image} +assert_send_and_sync!(Image); #[cfg(test)] impl Arbitrary for Image { diff --git a/openpgp/src/packet/userid.rs b/openpgp/src/packet/userid.rs index a0962b8c..44e9b510 100644 --- a/openpgp/src/packet/userid.rs +++ b/openpgp/src/packet/userid.rs @@ -26,7 +26,7 @@ pub struct ConventionallyParsedUserID { email: Option<(usize, usize)>, uri: Option<(usize, usize)>, } -assert_send_and_sync!{ConventionallyParsedUserID} +assert_send_and_sync!(ConventionallyParsedUserID); impl ConventionallyParsedUserID { /// Parses the userid according to the usual conventions. @@ -476,7 +476,7 @@ pub struct UserID { parsed: Mutex>>, } -assert_send_and_sync!{UserID} +assert_send_and_sync!(UserID); impl From> for UserID { fn from(u: Vec) -> Self { -- cgit v1.2.3