3 files changed, 5 insertions, 8 deletions
diff --git a/openpgp/src/crypto/aead.rs b/openpgp/src/crypto/aead.rs
index b791e2b4..6e7dda1b 100644
--- a/openpgp/src/crypto/aead.rs
+++ b/openpgp/src/crypto/aead.rs
@@ -4,7 +4,6 @@ use std::io::{self, Read};
 
 use nettle::{aead, cipher};
 use buffered_reader::BufferedReader;
-use buffered_reader::BufferedReaderGeneric;
 
 use constants::{
     AEADAlgorithm,
@@ -392,7 +391,7 @@ impl<R: io::Read> io::Read for Decryptor<R> {
 /// A `BufferedReader` that decrypts AEAD-encrypted data as it is
 /// read.
 pub(crate) struct BufferedReaderDecryptor<R: BufferedReader<C>, C> {
-    reader: BufferedReaderGeneric<Decryptor<R>, C>,
+    reader: buffered_reader::Generic<Decryptor<R>, C>,
 }
 
 impl <R: BufferedReader<C>, C> BufferedReaderDecryptor<R, C> {
@@ -405,7 +404,7 @@ impl <R: BufferedReader<C>, C> BufferedReaderDecryptor<R, C> {
         -> Result<Self>
     {
         Ok(BufferedReaderDecryptor {
-            reader: BufferedReaderGeneric::with_cookie(
+            reader: buffered_reader::Generic::with_cookie(
                 Decryptor::new(version, cipher, aead, chunk_size, iv, key,
                                source)?,
                 None, cookie),
diff --git a/openpgp/src/crypto/mod.rs b/openpgp/src/crypto/mod.rs
index 9259611b..eb482c3a 100644
--- a/openpgp/src/crypto/mod.rs
+++ b/openpgp/src/crypto/mod.rs
@@ -168,10 +168,9 @@ pub fn hash_file<R: Read>(reader: R, algos: &[HashAlgorithm])
     use ::parse::HashesFor;
 
     use buffered_reader::BufferedReader;
-    use buffered_reader::BufferedReaderGeneric;
 
     let reader
-        = BufferedReaderGeneric::with_cookie(
+        = buffered_reader::Generic::with_cookie(
             reader, None, Default::default());
 
     let mut reader
diff --git a/openpgp/src/crypto/symmetric.rs b/openpgp/src/crypto/symmetric.rs
index 1d18efc9..1a174a4a 100644
--- a/openpgp/src/crypto/symmetric.rs
+++ b/openpgp/src/crypto/symmetric.rs
@@ -9,7 +9,6 @@ use Error;
 use SymmetricAlgorithm;
 
 use buffered_reader::BufferedReader;
-use buffered_reader::BufferedReaderGeneric;
 
 use nettle::Cipher;
 use nettle::Mode;
@@ -284,7 +283,7 @@ impl<R: io::Read> io::Read for Decryptor<R> {
 /// A `BufferedReader` that decrypts symmetrically-encrypted data as
 /// it is read.
 pub(crate) struct BufferedReaderDecryptor<R: BufferedReader<C>, C> {
-    reader: BufferedReaderGeneric<Decryptor<R>, C>,
+    reader: buffered_reader::Generic<Decryptor<R>, C>,
 }
 
 impl <R: BufferedReader<C>, C> BufferedReaderDecryptor<R, C> {
@@ -296,7 +295,7 @@ impl <R: BufferedReader<C>, C> BufferedReaderDecryptor<R, C> {
         -> Result<Self>
     {
         Ok(BufferedReaderDecryptor {
-            reader: BufferedReaderGeneric::with_cookie(
+            reader: buffered_reader::Generic::with_cookie(
                 Decryptor::new(algo, key, reader)?, None, cookie),
         })
     }