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

remove the deprecated options in rustfmt.toml (#5616)

Browse Source 
* remove the deprecated options in rustfmt.toml

* add chain_one_line_max

* fix two issues spot by rustfmt
This commit is contained in:
Guanqun Lu 2017-05-19 10:12:20 -05:00 committed by Gav Wood
parent 84cab18120
commit d10ade1963
3 changed files with 10 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
parity/account.rs
View File

@ -80,7 +80,7 @@ fn keys_dir(path: String, spec: SpecType) -> Result<RootDiskDirectory, String> {
fn secret_store(dir: Box<RootDiskDirectory>, iterations: Option<u32>) -> Result<EthStore, String> { fn secret_store(dir: Box<RootDiskDirectory>, iterations: Option<u32>) -> Result<EthStore, String> {
match iterations { match iterations {
Some(i) => EthStore::open_with_iterations(dir, i), Some(i) => EthStore::open_with_iterations(dir, i),
_ => EthStore::open(dir) _ => EthStore::open(dir)
}.map_err(|e| format!("Could not open keys store: {}", e)) }.map_err(|e| format!("Could not open keys store: {}", e))
} }

4
parity/stratum.rs
View File

@ -65,10 +65,10 @@ pub fn main() {
StratumServer::start( StratumServer::start(
&SocketAddr::new( &SocketAddr::new(
IpAddr::from_str(&service_config.listen_addr) IpAddr::from_str(&service_config.listen_addr)
.unwrap_or_else(|e| .unwrap_or_else(|e| {
println!("Fatal: invalid listen address: '{}' ({:?})", &service_config.listen_addr, e); println!("Fatal: invalid listen address: '{}' ({:?})", &service_config.listen_addr, e);
std::process::exit(1) std::process::exit(1)
), }),
service_config.port, service_config.port,
), ),
job_dispatcher.service().clone(), job_dispatcher.service().clone(),

16
rustfmt.toml
View File

@ -1,17 +1,15 @@
verbose=false verbose=false
max_width=1000 max_width=1000
ideal_width=1000 comment_width=1000
tabs_spaces=4 tab_spaces=4
fn_call_width=1000 fn_call_width=1000
struct_lit_width=32 struct_lit_width=32
fn_arg_indent="Tabbed" fn_call_style="Visual"
single_line_if_else=true single_line_if_else_max_width=100
where_indent="Visual" trailing_comma="Vertical"
where_trailing_comma=true chain_indent="Visual"
chain_base_indent="Inherit" chain_one_line_max=100
chain_indent="Inherit"
reorder_imports=true reorder_imports=true
format_strings=false format_strings=false
chain_overflow_last=false
hard_tabs=true hard_tabs=true
wrap_match_arms=false wrap_match_arms=false