summaryrefslogtreecommitdiffstats
path: root/openpgp
diff options
context:
space:
mode:
authorJustus Winter <justus@sequoia-pgp.org>2018-06-13 16:42:14 +0200
committerJustus Winter <justus@sequoia-pgp.org>2018-06-14 07:46:30 +0200
commit64e30bfaab82e4349b50e0f1673d6a3912ababb0 (patch)
treec688b268d11500b2b8f453a57c885be451539f06 /openpgp
parent5b8158ea33c15b60782e3acf3fe2e0dad221852c (diff)
openpgp: Move Tag into the packet module.
Diffstat (limited to 'openpgp')
-rw-r--r--openpgp/examples/statistics.rs4
-rw-r--r--openpgp/src/lib.rs2
-rw-r--r--openpgp/src/packet.rs2
-rw-r--r--openpgp/src/serialize/stream.rs2
4 files changed, 6 insertions, 4 deletions
diff --git a/openpgp/examples/statistics.rs b/openpgp/examples/statistics.rs
index 798ee92d..27cdc946 100644
--- a/openpgp/examples/statistics.rs
+++ b/openpgp/examples/statistics.rs
@@ -13,8 +13,8 @@ use std::fs::File;
extern crate buffered_reader;
use buffered_reader::BufferedReaderGeneric;
extern crate openpgp;
-use openpgp::{Packet, Tag};
-use openpgp::packet::BodyLength;
+use openpgp::Packet;
+use openpgp::packet::{BodyLength, Tag};
use openpgp::parse::PacketParser;
fn main() {
diff --git a/openpgp/src/lib.rs b/openpgp/src/lib.rs
index fabb3e94..b7220746 100644
--- a/openpgp/src/lib.rs
+++ b/openpgp/src/lib.rs
@@ -105,7 +105,7 @@ use constants::{
SignatureType,
};
mod tag;
-pub use tag::Tag;
+use tag::Tag;
mod fingerprint;
mod keyid;
diff --git a/openpgp/src/packet.rs b/openpgp/src/packet.rs
index c56c6d86..25bd3d60 100644
--- a/openpgp/src/packet.rs
+++ b/openpgp/src/packet.rs
@@ -16,6 +16,8 @@ use ctb::{CTB, PacketLengthType};
use buffered_reader::BufferedReader;
+pub use tag::Tag;
+
// Allow transparent access of common fields.
impl<'a> Deref for Packet {
type Target = Common;
diff --git a/openpgp/src/serialize/stream.rs b/openpgp/src/serialize/stream.rs
index d822dc51..9c3fdc2f 100644
--- a/openpgp/src/serialize/stream.rs
+++ b/openpgp/src/serialize/stream.rs
@@ -71,7 +71,7 @@ pub fn wrap<'a, W: 'a + io::Write>(w: W) -> writer::Stack<'a, Cookie> {
/// # Example
///
/// ```
-/// use openpgp::Tag;
+/// use openpgp::packet::Tag;
/// use openpgp::serialize::stream::{wrap, ArbitraryWriter};
/// # use openpgp::Result;
/// # f().unwrap();