openpgp: Clean up exports.

  - Slightly reduce the number of reexports in `cert::components`.

  - Make `cert::amalgamation` public.

3 files changed, 11 insertions, 23 deletions

diff --git a/openpgp/src/cert/components.rs b/openpgp/src/cert/components.rs
index ac949b59..6e5fa185 100644
--- a/openpgp/src/cert/components.rs
+++ b/openpgp/src/cert/components.rs
@@ -23,25 +23,13 @@ use super::{
     sig_cmp,
     canonical_signature_order,
 };
-pub use super::amalgamation::{
-    ComponentAmalgamation,
-    ValidAmalgamation,
-    ValidComponentAmalgamation,
-};
-pub use super::key_amalgamation::{
-    KeyAmalgamation,
-    PrimaryKeyAmalgamation,
-    ValidKeyAmalgamation,
-    ValidPrimaryKeyAmalgamation,
-};
-pub use super::component_iter::{
-    ComponentIter,
-};
-pub use super::keyiter::{
-    KeyIter,
-    ValidKeyIter,
-};
 
+pub use super::{
+    component_iter::ComponentIter,
+    component_iter::ValidComponentIter,
+    keyiter::KeyIter,
+    keyiter::ValidKeyIter,
+};
 
 /// A key (primary or subkey, public or private) and any associated
 /// signatures.
diff --git a/openpgp/src/cert/mod.rs b/openpgp/src/cert/mod.rs
index c31bb4d8..246ee744 100644
--- a/openpgp/src/cert/mod.rs
+++ b/openpgp/src/cert/mod.rs
@@ -43,11 +43,11 @@ use crate::types::{
     SymmetricAlgorithm,
 };
 
-mod amalgamation;
+pub mod amalgamation;
+use amalgamation::ValidAmalgamation;
 mod builder;
 mod bindings;
 pub mod components;
-use components::ValidAmalgamation;
 mod component_iter;
 mod keyiter;
 pub mod key_amalgamation;
diff --git a/openpgp/src/cert/prelude.rs b/openpgp/src/cert/prelude.rs
index 9f2171f8..3ae5d19f 100644
--- a/openpgp/src/cert/prelude.rs
+++ b/openpgp/src/cert/prelude.rs
@@ -31,12 +31,12 @@ pub use crate::cert::{
     amalgamation::ComponentAmalgamation,
     amalgamation::ValidAmalgamation as _,
     amalgamation::ValidComponentAmalgamation,
-    component_iter::ValidComponentIter,
-    components::ComponentIter,
     amalgamation::ValidateAmalgamation as _,
     components::ComponentBundle,
     components::ComponentBundleIter,
+    components::ComponentIter,
     components::KeyBundle,
+    components::KeyIter,
     components::PrimaryKeyBundle,
     components::SubkeyBundle,
     components::UnfilteredKeyBundleIter,
@@ -46,7 +46,7 @@ pub use crate::cert::{
     components::UserAttributeBundleIter,
     components::UserIDBundle,
     components::UserIDBundleIter,
-    components::KeyIter,
+    components::ValidComponentIter,
     components::ValidKeyIter,
     key_amalgamation::ErasedKeyAmalgamation,
     key_amalgamation::KeyAmalgamation,