From 43ba23969e9f8e13dbc31a397a8bb522722943cf Mon Sep 17 00:00:00 2001 From: David Palm Date: Mon, 9 Jul 2018 16:12:50 +0200 Subject: [PATCH] Address grumbles --- triehash/src/lib.rs | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/triehash/src/lib.rs b/triehash/src/lib.rs index b73e076..f688d5a 100644 --- a/triehash/src/lib.rs +++ b/triehash/src/lib.rs @@ -77,7 +77,7 @@ pub fn ordered_trie_root(input: I) -> H::Out /// extern crate keccak_hasher; /// use triehash::trie_root; /// use keccak_hasher::KeccakHasher; -/// +/// /// fn main() { /// let v = vec![ /// ("doe", "reindeer"), @@ -115,7 +115,7 @@ pub fn trie_root(input: I) -> H::Out /// extern crate keccak_hasher; /// use triehash::sec_trie_root; /// use keccak_hasher::KeccakHasher; -/// +/// /// fn main() { /// let v = vec![ /// ("doe", "reindeer"), @@ -137,11 +137,11 @@ pub fn sec_trie_root(input: I) -> H::Out let gen_input: Vec<_> = input // first put elements into btree to sort them and to remove duplicates .into_iter() - .map(|(k, v)| (H::hash(&k.as_ref()), v)) + .map(|(k, v)| (H::hash(k.as_ref()), v)) .collect::>() // then move them to a vector .into_iter() - .map(|(k, v)| (as_nibbles(&k.as_ref()), v) ) + .map(|(k, v)| (as_nibbles(k.as_ref()), v) ) .collect(); gen_trie_root::(&gen_input) @@ -214,7 +214,7 @@ fn as_nibbles(bytes: &[u8]) -> ElasticArray8 { res } -fn hash256rlp(input: &[(A, B)], pre_len: usize, stream: &mut RlpStream) +fn hash256rlp(input: &[(A, B)], pre_len: usize, stream: &mut RlpStream) where A: AsRef<[u8]>, B: AsRef<[u8]>, @@ -297,7 +297,7 @@ fn hash256rlp(input: &[(A, B)], pre_len: usize, stream: &mut RlpStream) }; } -fn hash256aux(input: &[(A, B)], pre_len: usize, stream: &mut RlpStream) +fn hash256aux(input: &[(A, B)], pre_len: usize, stream: &mut RlpStream) where A: AsRef<[u8]>, B: AsRef<[u8]>,