openpgp: Make cert::amalgamation::key a public module

  - Make `cert::amalgamation::key` a public module.

  - Move `cert::amalgamation::keyiter` to
    `cert::amalgamation::key::iter`.  Have `cert::amalgamation::key`
    export its public symbols.

4 files changed, 18 insertions, 29 deletions

diff --git a/openpgp/src/cert/amalgamation.rs b/openpgp/src/cert/amalgamation.rs
index 5d10e485..8fac489d 100644
--- a/openpgp/src/cert/amalgamation.rs
+++ b/openpgp/src/cert/amalgamation.rs
@@ -51,24 +51,7 @@ pub use iter::{
     ValidUserIDAmalgamationIter,
 };
 
-mod keyiter;
-pub use keyiter::{
-    KeyAmalgamationIter,
-    ValidKeyAmalgamationIter,
-};
-
-mod key;
-pub use key::{
-    ErasedKeyAmalgamation,
-    KeyAmalgamation,
-    PrimaryKey,
-    PrimaryKeyAmalgamation,
-    SubordinateKeyAmalgamation,
-    ValidErasedKeyAmalgamation,
-    ValidKeyAmalgamation,
-    ValidPrimaryKeyAmalgamation,
-    ValidSubordinateKeyAmalgamation,
-};
+pub mod key;
 
 /// Applies a policy to an amalgamation.
 ///
diff --git a/openpgp/src/cert/amalgamation/key.rs b/openpgp/src/cert/amalgamation/key.rs
index 4f90c37f..e52e1aa7 100644
--- a/openpgp/src/cert/amalgamation/key.rs
+++ b/openpgp/src/cert/amalgamation/key.rs
@@ -66,6 +66,12 @@ use crate::{
     types::RevocationStatus,
 };
 
+mod iter;
+pub use iter::{
+    KeyAmalgamationIter,
+    ValidKeyAmalgamationIter,
+};
+
 /// Methods specific to key amalgamations.
 // This trait exists primarily so that `ValidAmalgamation` can depend
 // on it, and use it in its default implementations.
diff --git a/openpgp/src/cert/amalgamation/keyiter.rs b/openpgp/src/cert/amalgamation/key/iter.rs
index 1f9973dc..1f9973dc 100644
--- a/openpgp/src/cert/amalgamation/keyiter.rs
+++ b/openpgp/src/cert/amalgamation/key/iter.rs
diff --git a/openpgp/src/cert/prelude.rs b/openpgp/src/cert/prelude.rs
index 6e29cfaf..6f5fc9db 100644
--- a/openpgp/src/cert/prelude.rs
+++ b/openpgp/src/cert/prelude.rs
@@ -30,12 +30,6 @@ pub use crate::cert::{
     ValidCert,
     amalgamation::ComponentAmalgamation,
     amalgamation::ComponentAmalgamationIter,
-    amalgamation::ErasedKeyAmalgamation,
-    amalgamation::KeyAmalgamation,
-    amalgamation::KeyAmalgamationIter,
-    amalgamation::PrimaryKey as _,
-    amalgamation::PrimaryKeyAmalgamation,
-    amalgamation::SubordinateKeyAmalgamation,
     amalgamation::UnknownComponentAmalgamation,
     amalgamation::UnknownComponentAmalgamationIter,
     amalgamation::UserAttributeAmalgamation,
@@ -45,11 +39,6 @@ pub use crate::cert::{
     amalgamation::ValidAmalgamation as _,
     amalgamation::ValidComponentAmalgamation,
     amalgamation::ValidComponentAmalgamationIter,
-    amalgamation::ValidErasedKeyAmalgamation,
-    amalgamation::ValidKeyAmalgamation,
-    amalgamation::ValidKeyAmalgamationIter,
-    amalgamation::ValidPrimaryKeyAmalgamation,
-    amalgamation::ValidSubordinateKeyAmalgamation,
     amalgamation::ValidUnknownComponentAmalgamation,
     amalgamation::ValidUnknownComponentAmalgamationIter,
     amalgamation::ValidUserAttributeAmalgamation,
@@ -57,6 +46,17 @@ pub use crate::cert::{
     amalgamation::ValidUserIDAmalgamation,
     amalgamation::ValidUserIDAmalgamationIter,
     amalgamation::ValidateAmalgamation as _,
+    amalgamation::key::ErasedKeyAmalgamation,
+    amalgamation::key::KeyAmalgamation,
+    amalgamation::key::KeyAmalgamationIter,
+    amalgamation::key::PrimaryKey as _,
+    amalgamation::key::PrimaryKeyAmalgamation,
+    amalgamation::key::SubordinateKeyAmalgamation,
+    amalgamation::key::ValidErasedKeyAmalgamation,
+    amalgamation::key::ValidKeyAmalgamation,
+    amalgamation::key::ValidKeyAmalgamationIter,
+    amalgamation::key::ValidPrimaryKeyAmalgamation,
+    amalgamation::key::ValidSubordinateKeyAmalgamation,
     bundle::ComponentBundle,
     bundle::KeyBundle,
     bundle::PrimaryKeyBundle,