1 files changed, 4 insertions, 7 deletions
diff --git a/openpgp/src/parse/packet_parser_builder.rs b/openpgp/src/parse/packet_parser_builder.rs
index cc4591cd..6a66d3c8 100644
--- a/openpgp/src/parse/packet_parser_builder.rs
+++ b/openpgp/src/parse/packet_parser_builder.rs
@@ -2,9 +2,6 @@ use std::io;
 use std::path::Path;
 
 use buffered_reader::BufferedReader;
-use buffered_reader::BufferedReaderGeneric;
-use buffered_reader::BufferedReaderMemory;
-use buffered_reader::BufferedReaderFile;
 
 use Result;
 use parse::PacketParserResult;
@@ -49,7 +46,7 @@ impl<'a> Parse<'a, PacketParserBuilder<'a>> for PacketParserBuilder<'a> {
     /// in a `std::io::Read` object.
     fn from_reader<R: io::Read + 'a>(reader: R) -> Result<Self> {
         PacketParserBuilder::from_buffered_reader(
-            Box::new(BufferedReaderGeneric::with_cookie(
+            Box::new(buffered_reader::Generic::with_cookie(
                 reader, None, Cookie::default())))
     }
 
@@ -57,14 +54,14 @@ impl<'a> Parse<'a, PacketParserBuilder<'a>> for PacketParserBuilder<'a> {
     /// in the file named `path`.
     fn from_file<P: AsRef<Path>>(path: P) -> Result<Self> {
         PacketParserBuilder::from_buffered_reader(
-            Box::new(BufferedReaderFile::with_cookie(path, Cookie::default())?))
+            Box::new(buffered_reader::File::with_cookie(path, Cookie::default())?))
     }
 
     /// Creates a `PacketParserBuilder` for an OpenPGP message stored
     /// in the specified buffer.
     fn from_bytes(bytes: &'a [u8]) -> Result<PacketParserBuilder> {
         PacketParserBuilder::from_buffered_reader(
-            Box::new(BufferedReaderMemory::with_cookie(
+            Box::new(buffered_reader::Memory::with_cookie(
                 bytes, Cookie::default())))
     }
 }
@@ -165,7 +162,7 @@ impl<'a> PacketParserBuilder<'a> {
         };
 
         if dearmor {
-            self.bio = Box::new(BufferedReaderGeneric::with_cookie(
+            self.bio = Box::new(buffered_reader::Generic::with_cookie(
                 armor::Reader::from_buffered_reader(self.bio, None),
                 None,
                 Default::default()));