Skip to content

cipher: fix dev macro imports #345

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
tarcieri merged 1 commit into from
Oct 16, 2020
Merged

cipher: fix dev macro imports #345

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 3 additions & 5 deletions cipher/src/block/dev.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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();
Expand Down Expand Up @@ -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]
Expand Down
22 changes: 10 additions & 12 deletions cipher/src/stream/dev.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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() {
Expand Down Expand Up @@ -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())
Expand Down Expand Up @@ -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],
Expand Down Expand Up @@ -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)]
Expand Down Expand Up @@ -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)]
Expand Down