Merge pull request #1 from niklasad1/na-rust2018ify

fix: use rust2018 idioms
str4d · Sep 7, 2019 · 265c6e5 · 265c6e5
2 parents 5d0aa52 + c4f8f8e
commit 265c6e5
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 10 deletions.
diff --git a/Cargo.toml b/Cargo.toml
@@ -12,4 +12,4 @@ quickcheck = "0.8"
 derive_more = "0.15"
 bigint = "4"
 byteorder = "1"
-blake2-rfc = { git = "https://github.com/gtank/blake2-rfc.git", rev = "7a5b5fc99ae483a0043db7547fb79a6fa44b88a9" }
+blake2 = { package = "blake2-rfc", git = "https://github.com/gtank/blake2-rfc.git", rev = "7a5b5fc99ae483a0043db7547fb79a6fa44b88a9" }
diff --git a/src/lib.rs b/src/lib.rs
@@ -2,13 +2,6 @@
 //!
 //! To be used in zebra and via FFI bindings in zcashd
 
-#[cfg(test)] #[macro_use] extern crate assert_matches;
-#[cfg(test)] #[macro_use] extern crate quickcheck;
-extern crate derive_more;
-extern crate bigint;
-extern crate byteorder;
-extern crate blake2_rfc as blake2;
-
 mod tree;
 mod node_data;
 

diff --git a/src/tree.rs b/src/tree.rs
@@ -300,7 +300,8 @@ fn combine_nodes<'a>(left: IndexedNode<'a>, right: IndexedNode<'a>) -> Entry {
 mod tests {
 
     use super::{Entry, NodeData, Tree, EntryLink, EntryKind};
-    use quickcheck::TestResult;
+    use quickcheck::{quickcheck, TestResult};
+    use assert_matches::assert_matches;
 
     fn leaf(height: u32) -> NodeData {
         NodeData {
@@ -740,4 +741,4 @@ mod tests {
             }
         }
     }
-}
+}