From c47d08e3084000f2fe98721bb4f050a021c48e00 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tomasz=20Drwi=C4=99ga?= Date: Thu, 21 Apr 2016 15:56:35 +0200 Subject: [PATCH 1/3] Fixing warnings --- ipc/codegen/src/codegen.rs | 6 +++--- ipc/codegen/src/typegen.rs | 4 ++-- json/src/spec/engine.rs | 2 +- miner/src/transaction_queue.rs | 2 +- parity/hypervisor/mod.rs | 7 +++++++ parity/main.rs | 4 ++-- parity/upgrade.rs | 3 ++- rpc/src/v1/tests/ethcore.rs | 1 + util/src/bytes.rs | 4 ++-- 9 files changed, 21 insertions(+), 12 deletions(-) diff --git a/ipc/codegen/src/codegen.rs b/ipc/codegen/src/codegen.rs index 1744f9a9c..71083fb78 100644 --- a/ipc/codegen/src/codegen.rs +++ b/ipc/codegen/src/codegen.rs @@ -77,7 +77,7 @@ fn push_handshake_struct(cx: &ExtCtxt, push: &mut FnMut(Annotatable)) { pub struct BinHandshake { api_version: String, protocol_version: String, - _reserved: Vec, + reserved: Vec, } ).unwrap(); @@ -306,7 +306,7 @@ fn strip_ptr(ty: &P) -> P { } fn has_ptr(ty: &P) -> bool { - if let ast::TyKind::Rptr(_, ref ptr_mut) = ty.node { + if let ast::TyKind::Rptr(_, ref _ptr_mut) = ty.node { true } else { false } @@ -625,7 +625,7 @@ fn push_client_implementation( let payload = BinHandshake { protocol_version: $item_ident::protocol_version().to_string(), api_version: $item_ident::api_version().to_string(), - _reserved: vec![0u8; 64], + reserved: vec![0u8; 64], }; let mut socket_ref = self.socket.borrow_mut(); diff --git a/ipc/codegen/src/typegen.rs b/ipc/codegen/src/typegen.rs index e6e828ee7..1f4ef5b63 100644 --- a/ipc/codegen/src/typegen.rs +++ b/ipc/codegen/src/typegen.rs @@ -138,11 +138,11 @@ pub fn push_bin_box( let serialize_impl = quote_item!(cx, impl ::serde::ser::Serialize for $ident { - fn serialize<__S>(&self, _serializer: &mut __S) -> ::std::result::Result<(), __S::Error> + fn serialize<__S>(&self, serializer: &mut __S) -> ::std::result::Result<(), __S::Error> where __S: ::serde::ser::Serializer { let &$ident(ref val) = self; - _serializer.serialize_bytes(val.as_slice()) + serializer.serialize_bytes(val.as_slice()) } }).unwrap(); diff --git a/json/src/spec/engine.rs b/json/src/spec/engine.rs index 6b56d7b71..e5f5dc718 100644 --- a/json/src/spec/engine.rs +++ b/json/src/spec/engine.rs @@ -16,7 +16,7 @@ //! Engine deserialization. -use serde::{Deserializer, Error}; +use serde::Deserializer; use serde::de::Visitor; use spec::Ethash; diff --git a/miner/src/transaction_queue.rs b/miner/src/transaction_queue.rs index e9f2570e3..63b49f9f4 100644 --- a/miner/src/transaction_queue.rs +++ b/miner/src/transaction_queue.rs @@ -230,7 +230,7 @@ impl TransactionSet { by_hash.remove(&order.hash) .expect("Hash found in `by_priorty` matches the one dropped; so it is included in `by_hash`"); - let max = removed.get(&sender).map(|val| cmp::max(*val, nonce)).unwrap_or(nonce); + let max = removed.get(&sender).map_or(nonce, |val| cmp::max(*val, nonce)); removed.insert(sender, max); removed })) diff --git a/parity/hypervisor/mod.rs b/parity/hypervisor/mod.rs index bbc95b150..4b46a77c9 100644 --- a/parity/hypervisor/mod.rs +++ b/parity/hypervisor/mod.rs @@ -41,6 +41,12 @@ pub struct Hypervisor { processes: RwLock>, } +impl Default for Hypervisor { + fn default() -> Self { + Hypervisor::new() + } +} + impl Hypervisor { /// initializes the Hypervisor service with the open ipc socket for incoming clients pub fn new() -> Hypervisor { @@ -116,6 +122,7 @@ impl Hypervisor { } } +#[cfg(test)] mod tests { use super::*; use std::sync::atomic::{AtomicBool,Ordering}; diff --git a/parity/main.rs b/parity/main.rs index dff7ceaeb..8311e82ca 100644 --- a/parity/main.rs +++ b/parity/main.rs @@ -301,7 +301,7 @@ fn setup_log(init: &Option) -> Arc { } let logs = Arc::new(RotatingLogger::new(levels)); - let log2 = logs.clone(); + let logger = logs.clone(); let format = move |record: &LogRecord| { let timestamp = time::strftime("%Y-%m-%d %H:%M:%S %Z", &time::now()).unwrap(); let format = if max_log_level() <= LogLevelFilter::Info { @@ -309,7 +309,7 @@ fn setup_log(init: &Option) -> Arc { } else { format!("{}{}:{}: {}", timestamp, record.level(), record.target(), record.args()) }; - log2.append(format.clone()); + logger.append(format.clone()); format }; builder.format(format); diff --git a/parity/upgrade.rs b/parity/upgrade.rs index b74c17f64..30c977df4 100644 --- a/parity/upgrade.rs +++ b/parity/upgrade.rs @@ -21,6 +21,7 @@ use std::collections::*; use std::fs::{File, create_dir_all}; use std::env; use std::io::{Read, Write}; +use std::path::PathBuf; #[cfg_attr(feature="dev", allow(enum_variant_names))] #[derive(Debug)] @@ -99,7 +100,7 @@ fn with_locked_version(db_path: Option<&str>, script: F) -> Result, u16); + let tup = (vec![1u16, 1u16, 1u16, 1u16], 10u16); let bytes = vec![ // map @@ -507,8 +509,6 @@ fn raw_bytes_from_tuple() { // 10u16 10u8, 0u8]; - type Tup = (Vec, u16); - let tup_from = Tup::from_bytes(&bytes).unwrap(); assert_eq!(tup, tup_from); From ee474b425b12acf8aa6e41c7fa93299f66aa31d3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tomasz=20Drwi=C4=99ga?= Date: Thu, 21 Apr 2016 16:19:47 +0200 Subject: [PATCH 2/3] Fixing hook. --- hook.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/hook.sh b/hook.sh index d98297835..7fac4a834 100755 --- a/hook.sh +++ b/hook.sh @@ -4,7 +4,7 @@ echo "#!/bin/sh\n" > $FILE # Exit on any error echo "set -e" >> $FILE # Run release build -echo "cargo build --release --features dev" >> $FILE +echo "cargo build --features dev" >> $FILE # Build tests echo "cargo test --no-run --features dev \\" >> $FILE echo " -p ethash -p ethcore-util -p ethcore -p ethsync -p ethcore-rpc -p parity -p ethminer -p ethcore-webapp" >> $FILE From f5fcada5bacc3d1a99235974bdcc5c9e3f6289d6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tomasz=20Drwi=C4=99ga?= Date: Thu, 21 Apr 2016 16:32:44 +0200 Subject: [PATCH 3/3] Getting rid of generated code warnings --- parity/hypervisor/mod.rs | 1 + parity/main.rs | 1 + 2 files changed, 2 insertions(+) diff --git a/parity/hypervisor/mod.rs b/parity/hypervisor/mod.rs index 4b46a77c9..fbd807d94 100644 --- a/parity/hypervisor/mod.rs +++ b/parity/hypervisor/mod.rs @@ -18,6 +18,7 @@ // while not included in binary #![allow(dead_code)] +#![cfg_attr(feature="dev", allow(used_underscore_binding))] pub mod service; diff --git a/parity/main.rs b/parity/main.rs index 8311e82ca..b48017336 100644 --- a/parity/main.rs +++ b/parity/main.rs @@ -20,6 +20,7 @@ #![cfg_attr(feature="dev", feature(plugin))] #![cfg_attr(feature="dev", plugin(clippy))] #![cfg_attr(feature="dev", allow(useless_format))] + extern crate docopt; extern crate num_cpus; extern crate rustc_serialize;