openpgp: Move packet::header::ctb::* into header.

4 files changed, 11 insertions, 7 deletions

diff --git a/openpgp/src/armor.rs b/openpgp/src/armor.rs
index ea2ee3b7..5214d4a7 100644
--- a/openpgp/src/armor.rs
+++ b/openpgp/src/armor.rs
@@ -37,8 +37,7 @@ use quickcheck::{Arbitrary, Gen};
 
 use crate::vec_truncate;
 use crate::packet::prelude::*;
-use crate::packet::header::BodyLength;
-use crate::packet::header::ctb::{CTBNew, CTBOld};
+use crate::packet::header::{BodyLength, CTBNew, CTBOld};
 use crate::serialize::SerializeInto;
 
 /// The encoded output stream must be represented in lines of no more
diff --git a/openpgp/src/packet/header/mod.rs b/openpgp/src/packet/header/mod.rs
index c799959a..6144f03c 100644
--- a/openpgp/src/packet/header/mod.rs
+++ b/openpgp/src/packet/header/mod.rs
@@ -5,8 +5,13 @@ use crate::{
     Result,
 };
 use crate::packet::tag::Tag;
-pub mod ctb;
-pub use self::ctb::CTB;
+mod ctb;
+pub use self::ctb::{
+    CTB,
+    CTBOld,
+    CTBNew,
+    PacketLengthType,
+};
 
 /// An OpenPGP packet's header.
 #[derive(Clone, Debug)]
diff --git a/openpgp/src/parse/parse.rs b/openpgp/src/parse/parse.rs
index e892f109..dd0b8789 100644
--- a/openpgp/src/parse/parse.rs
+++ b/openpgp/src/parse/parse.rs
@@ -16,7 +16,7 @@ use crate::{
     packet::header::{
         CTB,
         BodyLength,
-        ctb::PacketLengthType,
+        PacketLengthType,
     },
     crypto::S2K,
     Error,
diff --git a/openpgp/src/serialize/mod.rs b/openpgp/src/serialize/mod.rs
index 7cf86e11..a4ea223c 100644
--- a/openpgp/src/serialize/mod.rs
+++ b/openpgp/src/serialize/mod.rs
@@ -30,8 +30,8 @@ use crate::crypto::S2K;
 use crate::packet::header::{
     BodyLength,
     CTB,
-    ctb::CTBNew,
-    ctb::CTBOld,
+    CTBNew,
+    CTBOld,
 };
 use crate::packet::signature::subpacket::{
     SubpacketArea, Subpacket, SubpacketValue,