Merge branch 'master' of github.com:ethcore/parity into move_hash

2016-08-04 08:41:30 +02:00
parent e8c451ac82 7093651d70
commit 03c3d16744
66 changed files with 1281 additions and 600 deletions
--- a/util/src/lib.rs
+++ b/util/src/lib.rs
@@ -158,7 +158,7 @@ pub use overlaydb::*;
 pub use journaldb::JournalDB;
 pub use crypto::*;
 pub use triehash::*;
-pub use trie::*;
+pub use trie::{Trie, TrieMut, TrieDB, TrieDBMut, TrieFactory, TrieError, SecTrieDB, SecTrieDBMut};
 pub use nibbleslice::*;
 pub use semantic_version::*;
 pub use network::*;