Fixing clippy warnings

Cargo.lock

@@ -2,7 +2,7 @@
 name = "parity"
 version = "0.9.99"
 dependencies = [
- "clippy 0.0.44 (registry+https://github.com/rust-lang/crates.io-index)",
+ "clippy 0.0.49 (registry+https://github.com/rust-lang/crates.io-index)",
  "ctrlc 1.1.1 (git+https://github.com/tomusdrw/rust-ctrlc.git)",
  "daemonize 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)",
  "docopt 0.6.78 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -94,7 +94,7 @@ dependencies = [
 
 [[package]]
 name = "clippy"
-version = "0.0.44"
+version = "0.0.49"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
  "regex-syntax 0.2.5 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -207,7 +207,7 @@ dependencies = [
 name = "ethcore"
 version = "0.9.99"
 dependencies = [
- "clippy 0.0.44 (registry+https://github.com/rust-lang/crates.io-index)",
+ "clippy 0.0.49 (registry+https://github.com/rust-lang/crates.io-index)",
  "crossbeam 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)",
  "env_logger 0.3.2 (registry+https://github.com/rust-lang/crates.io-index)",
  "ethash 0.9.99",
@@ -234,7 +234,7 @@ dependencies = [
 name = "ethcore-rpc"
 version = "0.9.99"
 dependencies = [
- "clippy 0.0.44 (registry+https://github.com/rust-lang/crates.io-index)",
+ "clippy 0.0.49 (registry+https://github.com/rust-lang/crates.io-index)",
  "ethash 0.9.99",
  "ethcore 0.9.99",
  "ethcore-util 0.9.99",
@@ -258,7 +258,7 @@ dependencies = [
  "arrayvec 0.3.15 (registry+https://github.com/rust-lang/crates.io-index)",
  "bigint 0.1.0",
  "chrono 0.2.19 (registry+https://github.com/rust-lang/crates.io-index)",
- "clippy 0.0.44 (registry+https://github.com/rust-lang/crates.io-index)",
+ "clippy 0.0.49 (registry+https://github.com/rust-lang/crates.io-index)",
  "crossbeam 0.2.8 (registry+https://github.com/rust-lang/crates.io-index)",
  "elastic-array 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "env_logger 0.3.2 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -273,7 +273,7 @@ dependencies = [
  "log 0.3.5 (registry+https://github.com/rust-lang/crates.io-index)",
  "mio 0.5.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "rand 0.3.14 (registry+https://github.com/rust-lang/crates.io-index)",
- "rocksdb 0.4.1 (git+https://github.com/arkpar/rust-rocksdb.git)",
+ "rocksdb 0.4.2 (git+https://github.com/arkpar/rust-rocksdb.git)",
  "rust-crypto 0.2.34 (registry+https://github.com/rust-lang/crates.io-index)",
  "rustc-serialize 0.3.18 (registry+https://github.com/rust-lang/crates.io-index)",
  "rustc_version 0.1.7 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -290,7 +290,7 @@ dependencies = [
 name = "ethsync"
 version = "0.9.99"
 dependencies = [
- "clippy 0.0.44 (registry+https://github.com/rust-lang/crates.io-index)",
+ "clippy 0.0.49 (registry+https://github.com/rust-lang/crates.io-index)",
  "env_logger 0.3.2 (registry+https://github.com/rust-lang/crates.io-index)",
  "ethcore 0.9.99",
  "ethcore-util 0.9.99",
@@ -469,11 +469,10 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 
 [[package]]
 name = "librocksdb-sys"
-version = "0.2.1"
+version = "0.2.2"
-source = "git+https://github.com/arkpar/rust-rocksdb.git#2156621f583bda95c1c07e89e79e4019f75158ee"
+source = "git+https://github.com/arkpar/rust-rocksdb.git#a4f89fea20ee3ae92b692df65d56426a5c0b6fd5"
 dependencies = [
  "libc 0.2.7 (registry+https://github.com/rust-lang/crates.io-index)",
- "pkg-config 0.3.7 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
 [[package]]
@@ -597,11 +596,6 @@ name = "odds"
 version = "0.2.12"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 
-[[package]]
-name = "pkg-config"
-version = "0.3.7"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-
 [[package]]
 name = "primal"
 version = "0.2.3"
@@ -697,11 +691,11 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 
 [[package]]
 name = "rocksdb"
-version = "0.4.1"
+version = "0.4.2"
-source = "git+https://github.com/arkpar/rust-rocksdb.git#2156621f583bda95c1c07e89e79e4019f75158ee"
+source = "git+https://github.com/arkpar/rust-rocksdb.git#a4f89fea20ee3ae92b692df65d56426a5c0b6fd5"
 dependencies = [
  "libc 0.2.7 (registry+https://github.com/rust-lang/crates.io-index)",
- "librocksdb-sys 0.2.1 (git+https://github.com/arkpar/rust-rocksdb.git)",
+ "librocksdb-sys 0.2.2 (git+https://github.com/arkpar/rust-rocksdb.git)",
 ]
 
 [[package]]

ethcore/src/extras.rs

@@ -35,13 +35,13 @@ pub enum ExtrasIndex {
 	BlocksBlooms = 4,
 	/// Block receipts index
 	BlockReceipts = 5,
-} 
+}
 
 /// trait used to write Extras data to db
 pub trait ExtrasWritable {
 	/// Write extra data to db
 	fn put_extras<K, T>(&self, hash: &K, value: &T) where
-		T: ExtrasIndexable + Encodable, 
+		T: ExtrasIndexable + Encodable,
 		K: ExtrasSliceConvertable;
 }
 
@@ -60,9 +60,9 @@ pub trait ExtrasReadable {
 
 impl ExtrasWritable for DBTransaction {
 	fn put_extras<K, T>(&self, hash: &K, value: &T) where
-		T: ExtrasIndexable + Encodable, 
+		T: ExtrasIndexable + Encodable,
 		K: ExtrasSliceConvertable {
-		
+
 		self.put(&hash.to_extras_slice(T::extras_index()), &encode(value)).unwrap()
 	}
 }
@@ -215,6 +215,12 @@ pub struct BlocksBlooms {
 	pub blooms: [H2048; 16],
 }
 
+impl Default for BlocksBlooms {
+	fn default() -> Self {
+		BlocksBlooms::new()
+	}
+}
+
 impl BlocksBlooms {
 	pub fn new() -> Self {
 		BlocksBlooms { blooms: unsafe { ::std::mem::zeroed() }}

ethcore/src/lib.rs

@@ -25,6 +25,8 @@
 #![cfg_attr(all(nightly, feature="dev"), allow(match_bool))]
 // Keeps consistency (all lines with `.clone()`) and helpful when changing ref to non-ref.
 #![cfg_attr(all(nightly, feature="dev"), allow(clone_on_copy))]
+// In most cases it expresses function flow better
+#![cfg_attr(all(nightly, feature="dev"), allow(if_not_else))]
 
 //! Ethcore library
 //!

ethcore/src/substate.rs

@@ -31,6 +31,12 @@ pub struct Substate {
 	pub contracts_created: Vec<Address>
 }
 
+impl Default for Substate {
+	fn default() -> Self {
+		Substate::new()
+	}
+}
+
 impl Substate {
 	/// Creates new substate.
 	pub fn new() -> Self {
@@ -67,8 +73,8 @@ mod tests {
 		let mut sub_state = Substate::new();
 		sub_state.contracts_created.push(address_from_u64(1u64));
 		sub_state.logs.push(LogEntry {
-			address: address_from_u64(1u64), 
+			address: address_from_u64(1u64),
-			topics: vec![], 
+			topics: vec![],
 			data: vec![]
 		});
 		sub_state.sstore_clears_count = x!(5);
@@ -77,8 +83,8 @@ mod tests {
 		let mut sub_state_2 = Substate::new();
 		sub_state_2.contracts_created.push(address_from_u64(2u64));
 		sub_state_2.logs.push(LogEntry {
-			address: address_from_u64(1u64), 
+			address: address_from_u64(1u64),
-			topics: vec![], 
+			topics: vec![],
 			data: vec![]
 		});
 		sub_state_2.sstore_clears_count = x!(7);

sync/src/chain.rs

@@ -1307,7 +1307,7 @@ impl ChainSync {
 		where T: Fn(&Address) -> U256
 	{
 		let mut queue = self.transaction_queue.lock().unwrap();
-		queue.add(transaction, fetch_nonce);
+		let _ = queue.add(transaction, fetch_nonce);
 	}
 }
 

sync/src/lib.rs

@@ -17,9 +17,10 @@
 #![warn(missing_docs)]
 #![cfg_attr(all(nightly, feature="dev"), feature(plugin))]
 #![cfg_attr(all(nightly, feature="dev"), plugin(clippy))]
-
 // Keeps consistency (all lines with `.clone()`) and helpful when changing ref to non-ref.
 #![cfg_attr(all(nightly, feature="dev"), allow(clone_on_copy))]
+// In most cases it expresses function flow better
+#![cfg_attr(all(nightly, feature="dev"), allow(if_not_else))]
 
 //! Blockchain sync module
 //! Implements ethereum protocol version 63 as specified here:
@@ -172,6 +173,7 @@ impl NetworkProtocolHandler<SyncMessage> for EthSync {
 		self.sync.write().unwrap().maintain_sync(&mut NetSyncIo::new(io, self.chain.deref()));
 	}
 
+	#[allow(single_match)]
 	fn message(&self, io: &NetworkContext<SyncMessage>, message: &SyncMessage) {
 		match *message {
 			SyncMessage::NewChainBlocks { ref good, ref bad, ref retracted } => {

sync/src/transaction_queue.rs

@@ -79,6 +79,7 @@
 //!		- When it's removed from `current` - all transactions from this sender (`current` & `future`) are recalculated.
 //!
 
+use std::default::Default;
 use std::cmp::{Ordering};
 use std::collections::{HashMap, BTreeSet};
 use util::numbers::{Uint, U256};
@@ -102,6 +103,7 @@ struct TransactionOrder {
 	hash: H256,
 }
 
+
 impl TransactionOrder {
 	fn for_transaction(tx: &VerifiedTransaction, base_nonce: U256) -> Self {
 		TransactionOrder {
@@ -253,6 +255,12 @@ pub struct TransactionQueue {
 	last_nonces: HashMap<Address, U256>,
 }
 
+impl Default for TransactionQueue {
+	fn default() -> Self {
+		TransactionQueue::new()
+	}
+}
+
 impl TransactionQueue {
 	/// Creates new instance of this Queue
 	pub fn new() -> Self {

util/src/keys/store.rs

@@ -78,9 +78,15 @@ struct AccountUnlock {
 	expires: DateTime<UTC>,
 }
 
+impl Default for SecretStore {
+	fn default() -> Self {
+		SecretStore::new()
+	}
+}
+
 impl SecretStore {
 	/// new instance of Secret Store in default home directory
-	pub fn new() -> SecretStore {
+	pub fn new() -> Self {
 		let mut path = ::std::env::home_dir().expect("Failed to get home dir");
 		path.push(".parity");
 		path.push("keys");
@@ -89,7 +95,7 @@ impl SecretStore {
 	}
 
 	/// new instance of Secret Store in specific directory
-	pub fn new_in(path: &Path) -> SecretStore {
+	pub fn new_in(path: &Path) -> Self {
 		SecretStore {
 			directory: KeyDirectory::new(path),
 			unlocks: RwLock::new(HashMap::new()),

util/src/kvdb.rs

@@ -16,6 +16,7 @@
 
 //! Key-Value store abstraction with RocksDB backend.
 
+use std::default::Default;
 use rocksdb::{DB, Writable, WriteBatch, IteratorMode, DBVector, DBIterator,
 	IndexType, Options, DBCompactionStyle, BlockBasedOptions, Direction};
 
@@ -24,6 +25,12 @@ pub struct DBTransaction {
 	batch: WriteBatch,
 }
 
+impl Default for DBTransaction {
+	fn default() -> Self {
+		DBTransaction::new()
+	}
+}
+
 impl DBTransaction {
 	/// Create new transaction.
 	pub fn new() -> DBTransaction {

util/src/lib.rs

@@ -27,6 +27,8 @@
 #![cfg_attr(all(nightly, feature="dev"), allow(match_same_arms))]
 // Keeps consistency (all lines with `.clone()`) and helpful when changing ref to non-ref.
 #![cfg_attr(all(nightly, feature="dev"), allow(clone_on_copy))]
+// In most cases it expresses function flow better
+#![cfg_attr(all(nightly, feature="dev"), allow(if_not_else))]
 
 //! Ethcore-util library
 //!

util/src/memorydb.rs

@@ -24,6 +24,7 @@ use hashdb::*;
 use heapsize::*;
 use std::mem;
 use std::collections::HashMap;
+use std::default::Default;
 
 #[derive(Debug,Clone)]
 /// Reference-counted memory-based HashDB implementation.
@@ -32,7 +33,7 @@ use std::collections::HashMap;
 /// with `kill()`, check for existance with `exists()` and lookup a hash to derive
 /// the data with `lookup()`. Clear with `clear()` and purge the portions of the data
 /// that have no references with `purge()`.
-/// 
+///
 /// # Example
 /// ```rust
 /// extern crate ethcore_util;
@@ -74,6 +75,12 @@ pub struct MemoryDB {
 	static_null_rlp: (Bytes, i32),
 }
 
+impl Default for MemoryDB {
+	fn default() -> Self {
+		MemoryDB::new()
+	}
+}
+
 impl MemoryDB {
 	/// Create a new instance of the memory DB.
 	pub fn new() -> MemoryDB {
@@ -133,7 +140,7 @@ impl MemoryDB {
 
 	/// Denote than an existing value has the given key. Used when a key gets removed without
 	/// a prior insert and thus has a negative reference with no value.
-	/// 
+	///
 	/// May safely be called even if the key's value is known, in which case it will be a no-op.
 	pub fn denote(&self, key: &H256, value: Bytes) -> &(Bytes, i32) {
 		if self.raw(key) == None {

util/src/network/discovery.rs

@@ -19,6 +19,7 @@ use std::net::SocketAddr;
 use std::collections::{HashSet, HashMap, BTreeMap, VecDeque};
 use std::mem;
 use std::cmp;
+use std::default::Default;
 use mio::*;
 use mio::udp::*;
 use sha3::*;
@@ -62,8 +63,14 @@ struct NodeBucket {
 	nodes: VecDeque<BucketEntry>, //sorted by last active
 }
 
+impl Default for NodeBucket {
+	fn default() -> Self {
+		NodeBucket::new()
+	}
+}
+
 impl NodeBucket {
-	fn new() -> NodeBucket {
+	fn new() -> Self {
 		NodeBucket {
 			nodes: VecDeque::new()
 		}

util/src/network/host.rs

@@ -23,6 +23,7 @@ use std::ops::*;
 use std::cmp::min;
 use std::path::{Path, PathBuf};
 use std::io::{Read, Write};
+use std::default::Default;
 use std::fs;
 use mio::*;
 use mio::tcp::*;
@@ -75,9 +76,15 @@ pub struct NetworkConfiguration {
 	pub ideal_peers: u32,
 }
 
+impl Default for NetworkConfiguration {
+	fn default() -> Self {
+		NetworkConfiguration::new()
+	}
+}
+
 impl NetworkConfiguration {
 	/// Create a new instance of default settings.
-	pub fn new() -> NetworkConfiguration {
+	pub fn new() -> Self {
 		NetworkConfiguration {
 			config_path: None,
 			listen_address: None,

util/src/panics.rs

@@ -19,6 +19,7 @@
 use std::thread;
 use std::ops::DerefMut;
 use std::sync::{Arc, Mutex};
+use std::default::Default;
 
 /// Thread-safe closure for handling possible panics
 pub trait OnPanicListener: Send + Sync + 'static {
@@ -56,14 +57,20 @@ pub struct PanicHandler {
 	listeners: Mutex<Vec<Box<OnPanicListener>>>
 }
 
+impl Default for PanicHandler {
+	fn default() -> Self {
+		PanicHandler::new()
+	}
+}
+
 impl PanicHandler {
 	/// Creates new `PanicHandler` wrapped in `Arc`
-	pub fn new_in_arc() -> Arc<PanicHandler> {
+	pub fn new_in_arc() -> Arc<Self> {
 		Arc::new(Self::new())
 	}
 
 	/// Creates new `PanicHandler`
-	pub fn new() -> PanicHandler {
+	pub fn new() -> Self {
 		PanicHandler {
 			listeners: Mutex::new(vec![])
 		}

util/src/rlp/rlpstream.rs

@@ -15,6 +15,7 @@
 // along with Parity.  If not, see <http://www.gnu.org/licenses/>.
 
 use std::ops::Deref;
+use std::default::Default;
 use elastic_array::*;
 use rlp::bytes::{ToBytes, VecLike};
 use rlp::{Stream, Encoder, Encodable};
@@ -44,6 +45,12 @@ pub struct RlpStream {
 	finished_list: bool,
 }
 
+impl Default  for RlpStream {
+	fn default() -> Self {
+		RlpStream::new()
+	}
+}
+
 impl Stream for RlpStream {
 	fn new() -> Self {
 		RlpStream {
@@ -190,8 +197,14 @@ struct BasicEncoder {
 	bytes: ElasticArray1024<u8>,
 }
 
+impl Default for BasicEncoder {
+	fn default() -> Self {
+		BasicEncoder::new()
+	}
+}
+
 impl BasicEncoder {
-	fn new() -> BasicEncoder {
+	fn new() -> Self {
 		BasicEncoder { bytes: ElasticArray1024::new() }
 	}
 
@@ -222,7 +235,7 @@ impl Encoder for BasicEncoder {
 			// just 0
 			0 => self.bytes.push(0x80u8),
 			// byte is its own encoding if < 0x80
-			1 => { 
+			1 => {
 				value.to_bytes(&mut self.bytes);
 				let len = self.bytes.len();
 				let last_byte = self.bytes[len - 1];

util/src/table.rs

@@ -16,6 +16,7 @@
 
 //! A collection associating pair of keys (row and column) with a single value.
 
+use std::default::Default;
 use std::hash::Hash;
 use std::collections::HashMap;
 
@@ -30,11 +31,21 @@ pub struct Table<Row, Col, Val>
 	map: HashMap<Row, HashMap<Col, Val>>,
 }
 
+impl<Row, Col, Val> Default for Table<Row, Col, Val>
+	where Row: Eq + Hash + Clone,
+		  Col: Eq + Hash {
+	fn default() -> Self {
+		Table::new()
+	}
+}
+
+// There is default but clippy does not detect it?
+#[allow(new_without_default)]
 impl<Row, Col, Val> Table<Row, Col, Val>
 	where Row: Eq + Hash + Clone,
 		  Col: Eq + Hash {
 	/// Creates new Table
-	pub fn new() -> Table<Row, Col, Val> {
+	pub fn new() -> Self {
 		Table {
 			map: HashMap::new(),
 		}

util/src/trie/journal.rs

@@ -14,6 +14,7 @@
 // You should have received a copy of the GNU General Public License
 // along with Parity.  If not, see <http://www.gnu.org/licenses/>.
 
+use std::default::Default;
 use sha3::*;
 use hash::H256;
 use bytes::*;
@@ -39,6 +40,12 @@ pub struct Score {
 #[derive(Debug)]
 pub struct Journal (Vec<Operation>);
 
+impl Default for Journal {
+	fn default() -> Self {
+		Journal::new()
+	}
+}
+
 impl Journal {
 	/// Create a new, empty, object.
 	pub fn new() -> Journal { Journal(vec![]) }