From bb2a6318851339a391ae12079fee3185b73c558d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tomasz=20Drwi=C4=99ga?= Date: Mon, 4 Jul 2016 07:53:55 -0400 Subject: [PATCH] Fixing compilation&clippy warnings (#1531) * Fixing compilation&clippy warnings * Adding spaces --- util/src/trie/fatdb.rs | 3 ++- util/src/trie/fatdbmut.rs | 3 ++- util/src/trie/mod.rs | 1 + util/src/trie/sectriedb.rs | 4 ++-- util/src/trie/sectriedbmut.rs | 3 ++- util/src/trie/triedb.rs | 4 ++-- util/src/trie/triedbmut.rs | 2 +- util/src/trie/trietraits.rs | 5 ++++- 8 files changed, 16 insertions(+), 9 deletions(-) diff --git a/util/src/trie/fatdb.rs b/util/src/trie/fatdb.rs index 555e4644f..cc5786f43 100644 --- a/util/src/trie/fatdb.rs +++ b/util/src/trie/fatdb.rs @@ -18,6 +18,7 @@ use hash::H256; use sha3::Hashable; use hashdb::HashDB; use super::{TrieDB, Trie, TrieDBIterator, TrieError}; +use trie::trietraits::TrieItem; /// A `Trie` implementation which hashes keys and uses a generic `HashDB` backing database. /// Additionaly it stores inserted hash-key mappings for later retrieval. @@ -51,7 +52,7 @@ impl<'db> FatDB<'db> { } impl<'db> Trie for FatDB<'db> { - fn iter<'a>(&'a self) -> Box, &[u8])> + 'a> { + fn iter<'a>(&'a self) -> Box + 'a> { Box::new(FatDB::iter(self)) } diff --git a/util/src/trie/fatdbmut.rs b/util/src/trie/fatdbmut.rs index 3e72c0653..e07ee0ed1 100644 --- a/util/src/trie/fatdbmut.rs +++ b/util/src/trie/fatdbmut.rs @@ -17,7 +17,7 @@ use hash::H256; use sha3::Hashable; use hashdb::HashDB; -use super::{TrieDBMut, Trie, TrieMut, TrieError}; +use super::{TrieDBMut, TrieMut, TrieError}; /// A mutable `Trie` implementation which hashes keys and uses a generic `HashDB` backing database. /// Additionaly it stores inserted hash-key mappings for later retrieval. @@ -82,6 +82,7 @@ impl<'db> TrieMut for FatDBMut<'db> { fn fatdb_to_trie() { use memorydb::MemoryDB; use super::TrieDB; + use super::Trie; let mut memdb = MemoryDB::new(); let mut root = H256::default(); diff --git a/util/src/trie/mod.rs b/util/src/trie/mod.rs index f6e731370..2843932a7 100644 --- a/util/src/trie/mod.rs +++ b/util/src/trie/mod.rs @@ -86,6 +86,7 @@ pub struct TrieFactory { spec: TrieSpec, } +#[cfg_attr(feature="dev", allow(wrong_self_convention))] impl TrieFactory { /// Creates new factory. pub fn new(spec: TrieSpec) -> Self { diff --git a/util/src/trie/sectriedb.rs b/util/src/trie/sectriedb.rs index 99770e382..9217fb4fc 100644 --- a/util/src/trie/sectriedb.rs +++ b/util/src/trie/sectriedb.rs @@ -18,7 +18,7 @@ use hash::H256; use sha3::Hashable; use hashdb::HashDB; use super::triedb::TrieDB; -use super::trietraits::Trie; +use super::trietraits::{Trie, TrieItem}; use super::TrieError; /// A `Trie` implementation which hashes keys and uses a generic `HashDB` backing database. @@ -50,7 +50,7 @@ impl<'db> SecTrieDB<'db> { } impl<'db> Trie for SecTrieDB<'db> { - fn iter<'a>(&'a self) -> Box, &[u8])> + 'a> { + fn iter<'a>(&'a self) -> Box + 'a> { Box::new(TrieDB::iter(&self.raw)) } diff --git a/util/src/trie/sectriedbmut.rs b/util/src/trie/sectriedbmut.rs index 09ff48f7a..243e5dec8 100644 --- a/util/src/trie/sectriedbmut.rs +++ b/util/src/trie/sectriedbmut.rs @@ -18,7 +18,7 @@ use hash::H256; use sha3::Hashable; use hashdb::HashDB; use super::triedbmut::TrieDBMut; -use super::trietraits::{Trie, TrieMut}; +use super::trietraits::TrieMut; use super::TrieError; /// A mutable `Trie` implementation which hashes keys and uses a generic `HashDB` backing database. @@ -74,6 +74,7 @@ impl<'db> TrieMut for SecTrieDBMut<'db> { fn sectrie_to_trie() { use memorydb::*; use super::triedb::*; + use super::Trie; let mut memdb = MemoryDB::new(); let mut root = H256::default(); diff --git a/util/src/trie/triedb.rs b/util/src/trie/triedb.rs index c88ec422e..e938fcc64 100644 --- a/util/src/trie/triedb.rs +++ b/util/src/trie/triedb.rs @@ -18,7 +18,7 @@ use common::*; use hashdb::*; use nibbleslice::*; use rlp::*; -use super::trietraits::{Trie}; +use super::trietraits::{Trie, TrieItem}; use super::node::Node; use super::TrieError; @@ -337,7 +337,7 @@ impl<'db> TrieDB<'db> { } impl<'db> Trie for TrieDB<'db> { - fn iter<'a>(&'a self) -> Box, &[u8])> + 'a> { + fn iter<'a>(&'a self) -> Box + 'a> { Box::new(TrieDB::iter(self)) } diff --git a/util/src/trie/triedbmut.rs b/util/src/trie/triedbmut.rs index 6d34096fc..4d46814c0 100644 --- a/util/src/trie/triedbmut.rs +++ b/util/src/trie/triedbmut.rs @@ -20,7 +20,7 @@ use nibbleslice::*; use rlp::*; use super::node::Node; use super::journal::Journal; -use super::trietraits::{Trie, TrieMut}; +use super::trietraits::TrieMut; use super::TrieError; /// A `Trie` implementation using a generic `HashDB` backing database. diff --git a/util/src/trie/trietraits.rs b/util/src/trie/trietraits.rs index fb53350c9..f4d53d158 100644 --- a/util/src/trie/trietraits.rs +++ b/util/src/trie/trietraits.rs @@ -17,6 +17,9 @@ use hash::H256; use rlp::SHA3_NULL_RLP; +/// Trie-Item type. +pub type TrieItem<'a> = (Vec, &'a[u8]); + /// A key-value datastore implemented as a database-backed modified Merkle tree. pub trait Trie { /// Return the root of the trie. @@ -32,7 +35,7 @@ pub trait Trie { fn get<'a, 'key>(&'a self, key: &'key [u8]) -> Option<&'a [u8]> where 'a: 'key; /// Returns an iterator over elements of trie. - fn iter<'a>(&'a self) -> Box, &[u8])> + 'a>; + fn iter<'a>(&'a self) -> Box + 'a>; } /// A key-value datastore implemented as a database-backed modified Merkle tree.