From d70b710f431cbfaf33cc6a3701b4282209b55780 Mon Sep 17 00:00:00 2001
From: Justus Winter <justus@sequoia-pgp.org>
Date: Fri, 1 Mar 2019 11:12:18 +0100
Subject: buffered-reader: Drop BufferedReader prefix.

  - For example, `buffered_reader::BufferedReaderMemory` is now called
    `buffered_reader::Memory`.  This makes the type names less unwieldy.

  - Fixes #206.
---
 openpgp/src/packet/signature/subpacket.rs | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

(limited to 'openpgp/src/packet/signature/subpacket.rs')

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
     }
 }
-- 
cgit v1.2.3