5 files changed, 19 insertions, 19 deletions
diff --git a/openpgp/src/cert/amalgamation.rs b/openpgp/src/cert/amalgamation.rs
index 91328528..78efb4cc 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> where 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> where 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 60ac9495..bf940845 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> where 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> where C);
 
 /// An iterator over `ValidUserIDAmalgamtion`s.
 ///
diff --git a/openpgp/src/cert/amalgamation/key.rs b/openpgp/src/cert/amalgamation/key.rs
index d3dc085f..543da96f 100644
--- a/openpgp/src/cert/amalgamation/key.rs
+++ b/openpgp/src/cert/amalgamation/key.rs
@@ -449,10 +449,10 @@ pub struct KeyAmalgamation<'a, P, R, R2>
     ca: ComponentAmalgamation<'a, Key<P, R>>,
     primary: R2,
 }
-assert_send_and_sync!(KeyAmalgamation<'_, P, R, R2>,
-    P: key::KeyParts,
-    R: key::KeyRole,
-    R2
+assert_send_and_sync!(KeyAmalgamation<'_, P, R, R2>
+    where P: key::KeyParts,
+          R: key::KeyRole,
+          R2,
 );
 
 // derive(Clone) doesn't work with generic parameters that don't
@@ -947,10 +947,10 @@ pub struct ValidKeyAmalgamation<'a, P, R, R2>
     // The binding signature at time `time`.  (This is just a cache.)
     binding_signature: &'a Signature,
 }
-assert_send_and_sync!(ValidKeyAmalgamation<'_, P, R, R2>,
-    P: key::KeyParts,
-    R: key::KeyRole,
-    R2: Copy
+assert_send_and_sync!(ValidKeyAmalgamation<'_, P, R, R2>
+    where P: key::KeyParts,
+          R: key::KeyRole,
+          R2: Copy,
 );
 
 /// A Valid primary Key, and its associated data.
diff --git a/openpgp/src/cert/amalgamation/key/iter.rs b/openpgp/src/cert/amalgamation/key/iter.rs
index 45d3c618..9d4d6ce7 100644
--- a/openpgp/src/cert/amalgamation/key/iter.rs
+++ b/openpgp/src/cert/amalgamation/key/iter.rs
@@ -82,9 +82,9 @@ pub struct KeyAmalgamationIter<'a, P, R>
     _p: std::marker::PhantomData<P>,
     _r: std::marker::PhantomData<R>,
 }
-assert_send_and_sync!(KeyAmalgamationIter<'_, P, R>,
-     P: key::KeyParts,
-     R: key::KeyRole
+assert_send_and_sync!(KeyAmalgamationIter<'_, P, R>
+     where P: key::KeyParts,
+           R: key::KeyRole,
 );
 
 impl<'a, P, R> fmt::Debug for KeyAmalgamationIter<'a, P, R>
@@ -684,9 +684,9 @@ pub struct ValidKeyAmalgamationIter<'a, P, R>
     _p: std::marker::PhantomData<P>,
     _r: std::marker::PhantomData<R>,
 }
-assert_send_and_sync!(ValidKeyAmalgamationIter<'_, P, R>,
-     P: key::KeyParts,
-     R: key::KeyRole
+assert_send_and_sync!(ValidKeyAmalgamationIter<'_, P, R>
+     where P: key::KeyParts,
+           R: key::KeyRole,
 );
 
 impl<'a, P, R> fmt::Debug for ValidKeyAmalgamationIter<'a, P, R>
diff --git a/openpgp/src/cert/bundle.rs b/openpgp/src/cert/bundle.rs
index d755fe80..3693ef1e 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> where C);
 
 /// A key (primary or subkey, public or private) and any associated
 /// signatures.