From 4eab03d71cb43d8f0b5c870dd513cdebd138f3f5 Mon Sep 17 00:00:00 2001
From: Tony Arcieri <bascule@gmail.com>
Date: Fri, 16 Oct 2020 06:01:13 -0700
Subject: [PATCH] cipher: fix dev macro imports

They were previously referring to the old `block_cipher` and
`stream_cipher` names.
---
 cipher/src/block/dev.rs  |  8 +++-----
 cipher/src/stream/dev.rs | 22 ++++++++++------------
 2 files changed, 13 insertions(+), 17 deletions(-)

diff --git a/cipher/src/block/dev.rs b/cipher/src/block/dev.rs
index 11c570c1a..4ab57d706 100644
--- a/cipher/src/block/dev.rs
+++ b/cipher/src/block/dev.rs
@@ -9,10 +9,8 @@ macro_rules! new_test {
     ($name:ident, $test_name:expr, $cipher:ty) => {
         #[test]
         fn $name() {
-            use block_cipher::dev::blobby::Blob3Iterator;
-            use block_cipher::generic_array::typenum::Unsigned;
-            use block_cipher::generic_array::GenericArray;
-            use block_cipher::{BlockCipher, NewBlockCipher};
+            use cipher::block::{dev::blobby::Blob3Iterator, BlockCipher, NewBlockCipher};
+            use cipher::generic_array::{typenum::Unsigned, GenericArray};
 
             fn run_test(key: &[u8], pt: &[u8], ct: &[u8]) -> bool {
                 let state = <$cipher as NewBlockCipher>::new_varkey(key).unwrap();
@@ -113,7 +111,7 @@ macro_rules! bench {
     ($cipher:path, $key_len:expr) => {
         extern crate test;
 
-        use block_cipher::{BlockCipher, NewBlockCipher};
+        use cipher::block::{BlockCipher, NewBlockCipher};
         use test::Bencher;
 
         #[bench]
diff --git a/cipher/src/stream/dev.rs b/cipher/src/stream/dev.rs
index d5b877f0d..b538e57c1 100644
--- a/cipher/src/stream/dev.rs
+++ b/cipher/src/stream/dev.rs
@@ -7,9 +7,8 @@ macro_rules! new_sync_test {
     ($name:ident, $cipher:ty, $test_name:expr) => {
         #[test]
         fn $name() {
-            use stream_cipher::blobby::Blob4Iterator;
-            use stream_cipher::generic_array::GenericArray;
-            use stream_cipher::{NewStreamCipher, SyncStreamCipher};
+            use cipher::generic_array::GenericArray;
+            use cipher::stream::{blobby::Blob4Iterator, NewStreamCipher, SyncStreamCipher};
 
             let data = include_bytes!(concat!("data/", $test_name, ".blb"));
             for (i, row) in Blob4Iterator::new(data).unwrap().enumerate() {
@@ -44,8 +43,8 @@ macro_rules! new_seek_test {
     ($name:ident, $cipher:ty) => {
         #[test]
         fn $name() {
-            use stream_cipher::generic_array::GenericArray;
-            use stream_cipher::{NewStreamCipher, SyncStreamCipher, SyncStreamCipherSeek};
+            use cipher::generic_array::GenericArray;
+            use cipher::stream::{NewStreamCipher, SyncStreamCipher, SyncStreamCipherSeek};
 
             fn get_cipher() -> $cipher {
                 <$cipher>::new(&Default::default(), &Default::default())
@@ -97,9 +96,8 @@ macro_rules! new_async_test {
     ($name:ident, $test_name:expr, $cipher:ty) => {
         #[test]
         fn $name() {
-            use stream_cipher::blobby::Blob4Iterator;
-            use stream_cipher::generic_array::GenericArray;
-            use stream_cipher::{NewStreamCipher, StreamCipher};
+            use cipher::generic_array::GenericArray;
+            use cipher::stream::{blobby::Blob4Iterator, NewStreamCipher, StreamCipher};
 
             fn run_test(
                 key: &[u8],
@@ -174,8 +172,8 @@ macro_rules! bench_sync {
     ($cipher:path) => {
         extern crate test;
 
-        use stream_cipher::generic_array::GenericArray;
-        use stream_cipher::{NewStreamCipher, SyncStreamCipher};
+        use cipher::generic_array::GenericArray;
+        use cipher::stream::{NewStreamCipher, SyncStreamCipher};
         use test::Bencher;
 
         #[inline(never)]
@@ -227,8 +225,8 @@ macro_rules! bench_async {
     ($cipher:path) => {
         extern crate test;
 
-        use stream_cipher::generic_array::GenericArray;
-        use stream_cipher::{NewStreamCipher, StreamCipher};
+        use cipher::generic_array::GenericArray;
+        use cipher::stream::{NewStreamCipher, StreamCipher};
         use test::Bencher;
 
         #[inline(never)]