zec
/
librustzcash
mirror of https://github.com/zcash/librustzcash.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge pull request #1 from niklasad1/na-rust2018ify 

fix: use rust2018 idioms
This commit is contained in:
Nikolay Volf 2019-09-07 11:35:06 +03:00 committed by GitHub
parent 5d0aa521c2 c4f8f8ea04
commit 265c6e5303
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 4 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Cargo.toml
View File

@ -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" }

7
src/lib.rs
View File

@ -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;

3
src/tree.rs
View File

@ -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 {