grassrootseconomics/openethereum
8
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge branch 'master' into ethminer_crate

Browse Source 
Conflicts:
	Cargo.lock
	Cargo.toml
	hook.sh
	miner/src/transaction_queue.rs
	rpc/Cargo.toml
	sync/Cargo.toml
	sync/src/chain.rs
This commit is contained in:
Tomasz Drwięga
2016-03-10 11:38:24 +01:00
parent cd37fa7cb5 99e577ad2f
commit 2e72173620
44 changed files with 384 additions and 196 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
parity/main.rs
View File

@@ -17,8 +17,8 @@
//! Ethcore client application.
#![warn(missing_docs)]
#![cfg_attr(feature="dev", feature(plugin))]
#![cfg_attr(feature="dev", plugin(clippy))]
#![cfg_attr(all(nightly, feature="dev"), feature(plugin))]
#![cfg_attr(all(nightly, feature="dev"), plugin(clippy))]
extern crate docopt;
extern crate rustc_serialize;
extern crate ethcore_util as util;
@@ -309,7 +309,7 @@ impl Configuration {
}
}
#[cfg_attr(feature="dev", allow(useless_format))]
#[cfg_attr(all(nightly, feature="dev"), allow(useless_format))]
fn net_addresses(&self) -> (Option<SocketAddr>, Option<SocketAddr>) {
let mut listen_address = None;
let mut public_address = None;