diff options
author | Justus Winter <justus@sequoia-pgp.org> | 2020-01-06 16:11:54 +0100 |
---|---|---|
committer | Justus Winter <justus@sequoia-pgp.org> | 2020-01-06 16:11:54 +0100 |
commit | c99f7bbc3d59faa243af8f816496e78dada2c962 (patch) | |
tree | 6034923c06ee467d36598b5432d223e6bda513b1 /openpgp/src | |
parent | e00557d1a2885f28105470ddd25df1931ad3a1e5 (diff) |
openpgp: Move packet::header::ctb::* into header.
Diffstat (limited to 'openpgp/src')
-rw-r--r-- | openpgp/src/armor.rs | 3 | ||||
-rw-r--r-- | openpgp/src/packet/header/mod.rs | 9 | ||||
-rw-r--r-- | openpgp/src/parse/parse.rs | 2 | ||||
-rw-r--r-- | openpgp/src/serialize/mod.rs | 4 |
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, |