3 files changed, 11 insertions, 15 deletions
diff --git a/openpgp/src/packet/mod.rs b/openpgp/src/packet/mod.rs
index 9bde146e..7f8e1007 100644
--- a/openpgp/src/packet/mod.rs
+++ b/openpgp/src/packet/mod.rs
@@ -182,12 +182,10 @@ impl BodyLength {
 
 #[test]
 fn body_length_new_format() {
-    use buffered_reader::BufferedReaderMemory;
-
     fn test(input: &[u8], expected_result: BodyLength) {
         assert_eq!(
             BodyLength::parse_new_format(
-                &mut BufferedReaderMemory::new(input)).unwrap(),
+                &mut buffered_reader::Memory::new(input)).unwrap(),
             expected_result);
     }
 
@@ -211,11 +209,9 @@ fn body_length_new_format() {
 
 #[test]
 fn body_length_old_format() {
-    use buffered_reader::BufferedReaderMemory;
-
     fn test(input: &[u8], plt: PacketLengthType,
             expected_result: BodyLength, expected_rest: &[u8]) {
-        let mut bio = BufferedReaderMemory::new(input);
+        let mut bio = buffered_reader::Memory::new(input);
         assert_eq!(BodyLength::parse_old_format(&mut bio, plt).unwrap(),
                    expected_result);
         let rest = bio.data_eof();
diff --git a/openpgp/src/packet/signature/subpacket.rs b/openpgp/src/packet/signature/subpacket.rs
index b5c48c5a..01e9ef6f 100644
--- a/openpgp/src/packet/signature/subpacket.rs
+++ b/openpgp/src/packet/signature/subpacket.rs
@@ -63,7 +63,7 @@ use time;
 
 use quickcheck::{Arbitrary, Gen};
 
-use buffered_reader::{BufferedReader, BufferedReaderMemory};
+use buffered_reader::BufferedReader;
 
 use {
     Error,
@@ -343,7 +343,7 @@ impl Hash for SubpacketArea {
 
 /// Iterates over SubpacketAreas yielding raw packets.
 struct SubpacketAreaIterRaw<'a> {
-    reader: BufferedReaderMemory<'a, ()>,
+    reader: buffered_reader::Memory<'a, ()>,
     data: &'a [u8],
 }
 
@@ -404,7 +404,7 @@ impl<'a> Iterator for SubpacketAreaIterRaw<'a> {
 impl SubpacketArea {
     fn iter_raw(&self) -> SubpacketAreaIterRaw {
         SubpacketAreaIterRaw {
-            reader: BufferedReaderMemory::new(&self.data[..]),
+            reader: buffered_reader::Memory::new(&self.data[..]),
             data: &self.data[..],
         }
     }
@@ -1097,7 +1097,7 @@ impl<'a> From<SubpacketRaw<'a>> for Subpacket<'a> {
 pub(crate) type SubpacketLength = u32;
 pub(crate) trait SubpacketLengthTrait {
     /// Parses a subpacket length.
-    fn parse<C>(bio: &mut BufferedReaderMemory<C>) -> io::Result<u32>;
+    fn parse<C>(bio: &mut buffered_reader::Memory<C>) -> io::Result<u32>;
     /// Writes the subpacket length to `w`.
     fn serialize<W: io::Write>(&self, sink: &mut W) -> io::Result<()>;
     /// Returns the length of the serialized subpacket length.
@@ -1105,7 +1105,7 @@ pub(crate) trait SubpacketLengthTrait {
 }
 
 impl SubpacketLengthTrait for SubpacketLength {
-    fn parse<C>(bio: &mut BufferedReaderMemory<C>) -> io::Result<u32> {
+    fn parse<C>(bio: &mut buffered_reader::Memory<C>) -> io::Result<u32> {
         let octet1 = bio.data_consume_hard(1)?[0];
         if octet1 < 192 {
             // One octet.
@@ -1155,7 +1155,7 @@ quickcheck! {
         let mut encoded = Vec::new();
         length.serialize(&mut encoded).unwrap();
         assert_eq!(encoded.len(), length.len());
-        let mut reader = BufferedReaderMemory::new(&encoded);
+        let mut reader = buffered_reader::Memory::new(&encoded);
         SubpacketLength::parse(&mut reader).unwrap() == length
     }
 }
diff --git a/openpgp/src/packet/user_attribute.rs b/openpgp/src/packet/user_attribute.rs
index 3df01e3b..dac6a3dd 100644
--- a/openpgp/src/packet/user_attribute.rs
+++ b/openpgp/src/packet/user_attribute.rs
@@ -7,7 +7,7 @@
 use std::fmt;
 use quickcheck::{Arbitrary, Gen};
 
-use buffered_reader::{BufferedReader, BufferedReaderMemory};
+use buffered_reader::BufferedReader;
 
 use Error;
 use Result;
@@ -79,7 +79,7 @@ impl UserAttribute {
     /// Iterates over the subpackets.
     pub fn subpackets(&self) -> SubpacketIterator {
         SubpacketIterator {
-            reader: BufferedReaderMemory::new(&self.value[..]),
+            reader: buffered_reader::Memory::new(&self.value[..]),
         }
     }
 }
@@ -100,7 +100,7 @@ impl Arbitrary for UserAttribute {
 
 /// Iterates over subpackets.
 pub struct SubpacketIterator<'a> {
-    reader: BufferedReaderMemory<'a, ()>,
+    reader: buffered_reader::Memory<'a, ()>,
 }
 
 impl<'a> Iterator for SubpacketIterator<'a> {