diff --git a/.travis.yml b/.travis.yml index 515996b..6face7b 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,6 +1,7 @@ language: rust rust: - stable + before_script: - rustup component add rustfmt-preview - rustup component add clippy @@ -8,4 +9,5 @@ script: # For speed up the CI process # See: https://docs.travis-ci.com/user/build-stages/#Data-persistence-between-stages-and-jobs - .ci-script/clippy_test.sh - - cargo fmt -- --check && cargo test --all && cargo test --no-default-features --features openssl --all + - cargo fmt -- --check && cargo test --all + - cd cita-cli && cargo test --no-default-features --features openssl diff --git a/cita-cli/Cargo.toml b/cita-cli/Cargo.toml index 3b34f31..d7a6f79 100644 --- a/cita-cli/Cargo.toml +++ b/cita-cli/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "cita-cli" -version = "0.19.7" +version = "20.2.0" authors = ["piaoliu <441594700@qq.com>", "Qian Linfeng "] build = "build.rs" edition = "2018" diff --git a/cita-cli/build.rs b/cita-cli/build.rs index 08cabcf..0149362 100644 --- a/cita-cli/build.rs +++ b/cita-cli/build.rs @@ -32,7 +32,7 @@ pub fn get_commit_describe() -> Option { .and_then(|r| { String::from_utf8(r.stdout).ok().map(|s| { s.trim() - .splitn(2, "-") + .splitn(2, '-') .collect::>() .pop() .unwrap_or_default() diff --git a/cita-cli/src/interactive.rs b/cita-cli/src/interactive.rs index 6d1e1c4..31fd5d5 100644 --- a/cita-cli/src/interactive.rs +++ b/cita-cli/src/interactive.rs @@ -95,7 +95,7 @@ pub fn start(url: &str, client: &Client) -> io::Result<()> { config.set_save_private(configs["save_private"].as_bool().unwrap_or(false)); } - let mut env_file = cita_cli_dir.clone(); + let mut env_file = cita_cli_dir; env_file.push("env_vars"); if env_file.as_path().exists() { let file = fs::File::open(&env_file)?; @@ -364,7 +364,7 @@ impl<'a, 'b> CitaCompleter<'a, 'b> { .map(|aliases| { aliases .iter() - .map(|(alias, _)| (alias.to_string(), alias.to_string())) + .map(|(alias, _)| ((*alias).to_string(), (*alias).to_string())) .collect::>() }) .unwrap_or_else(|| vec![]), @@ -443,7 +443,6 @@ impl<'a, 'b> Completer for CitaCompleter<'a, 'b> { if word_lower.is_empty() { let pairs = tmp_pair - .clone() .into_iter() .map(|(display, replacement)| Pair { display, @@ -467,7 +466,6 @@ impl<'a, 'b> Completer for CitaCompleter<'a, 'b> { .any(|ref mut x| x.replacement.to_lowercase().contains(&word_lower)) { let pairs = tmp_pair - .clone() .into_iter() .filter(|(_, replacement)| replacement.to_lowercase().contains(&word_lower)) .map(|(display, replacement)| Pair { diff --git a/cita-cli/src/main.rs b/cita-cli/src/main.rs index 4667339..1e3d7ad 100644 --- a/cita-cli/src/main.rs +++ b/cita-cli/src/main.rs @@ -49,19 +49,19 @@ fn main() { let client = Client::new(); if let Err(err) = match matches.subcommand() { - ("rpc", Some(m)) => rpc_processor(m, &printer, &mut config, client.clone()), + ("rpc", Some(m)) => rpc_processor(m, &printer, &mut config, client), ("ethabi", Some(m)) => abi_processor(m, &printer, &config), ("key", Some(m)) => key_processor(m, &printer, &config), - ("scm", Some(m)) => contract_processor(m, &printer, &mut config, client.clone()), - ("transfer", Some(m)) => transfer_processor(m, &printer, &mut config, client.clone()), - ("store", Some(m)) => store_processor(m, &printer, &mut config, client.clone()), - ("amend", Some(m)) => amend_processor(m, &printer, &mut config, client.clone()), + ("scm", Some(m)) => contract_processor(m, &printer, &mut config, client), + ("transfer", Some(m)) => transfer_processor(m, &printer, &mut config, client), + ("store", Some(m)) => store_processor(m, &printer, &mut config, client), + ("amend", Some(m)) => amend_processor(m, &printer, &mut config, client), ("search", Some(m)) => { search_processor(&parser, m); Ok(()) } - ("tx", Some(m)) => tx_processor(m, &printer, &mut config, client.clone()), - ("benchmark", Some(m)) => benchmark_processor(m, &printer, &config, client.clone()), + ("tx", Some(m)) => tx_processor(m, &printer, &mut config, client), + ("benchmark", Some(m)) => benchmark_processor(m, &printer, &config, client), ("completions", Some(m)) => { completion_processor(&mut parser, m); Ok(()) @@ -73,7 +73,7 @@ fn main() { Ok(()) } } { - printer.eprintln(&Rc::new(err.to_string()), true); + printer.eprintln(&Rc::new(err), true); process::exit(1); } } diff --git a/tool-derive/src/lib.rs b/tool-derive/src/lib.rs index 609a98a..02a3c68 100644 --- a/tool-derive/src/lib.rs +++ b/tool-derive/src/lib.rs @@ -56,7 +56,7 @@ pub fn contract(input: TokenStream) -> TokenStream { // parse str to LitStr let path = syn::LitStr::new(&path, proc_macro2::Span::call_site()); // parse str to Ident - let trait_name = syn::Ident::new(&trait_name.to_string(), proc_macro2::Span::call_site()); + let trait_name = syn::Ident::new(&trait_name, proc_macro2::Span::call_site()); let address = syn::LitStr::new(&address, proc_macro2::Span::call_site()); let output = if let syn::Data::Struct(data) = input.data {