From dd1a24dcbc48948322b66c269c48b629fd2f118a Mon Sep 17 00:00:00 2001 From: Simon B Date: Fri, 25 Jan 2019 11:09:32 +0100 Subject: [PATCH] Compiler warnings 20190123 (#2462) * cleanup compiler warnings: unused imports * rustfmt * more compiler warnings --- api/src/handlers/blocks_api.rs | 2 +- api/src/handlers/peers_api.rs | 2 +- api/src/lib.rs | 8 -------- chain/src/chain.rs | 2 +- chain/src/lib.rs | 1 - config/src/lib.rs | 3 --- p2p/src/lib.rs | 1 - servers/src/lib.rs | 2 -- src/bin/cmd/wallet_tests.rs | 2 -- src/bin/grin.rs | 4 ---- store/src/lib.rs | 3 --- wallet/src/lib.rs | 2 -- wallet/src/lmdb_wallet.rs | 2 -- wallet/tests/check.rs | 1 - 14 files changed, 3 insertions(+), 32 deletions(-) diff --git a/api/src/handlers/blocks_api.rs b/api/src/handlers/blocks_api.rs index 9c2b0b275..e03d35c28 100644 --- a/api/src/handlers/blocks_api.rs +++ b/api/src/handlers/blocks_api.rs @@ -140,7 +140,7 @@ impl Handler for BlockHandler { return response( StatusCode::BAD_REQUEST, format!("failed to parse input: {}", e), - ) + ); } Ok(h) => h, }; diff --git a/api/src/handlers/peers_api.rs b/api/src/handlers/peers_api.rs index 2dd7be113..b42a92f1b 100644 --- a/api/src/handlers/peers_api.rs +++ b/api/src/handlers/peers_api.rs @@ -85,7 +85,7 @@ impl Handler for PeerHandler { return response( StatusCode::BAD_REQUEST, format!("invalid peer address: {}", e), - ) + ); } Ok(addr) => addr, }, diff --git a/api/src/lib.rs b/api/src/lib.rs index 72816796b..4ad2cebd8 100644 --- a/api/src/lib.rs +++ b/api/src/lib.rs @@ -22,22 +22,14 @@ use grin_util as util; use failure; #[macro_use] extern crate failure_derive; -use hyper; #[macro_use] extern crate lazy_static; -use serde; #[macro_use] extern crate serde_derive; -use serde_json; #[macro_use] extern crate log; -use hyper_rustls; -use rustls; - -use tokio_tcp; - pub mod auth; pub mod client; mod handlers; diff --git a/chain/src/chain.rs b/chain/src/chain.rs index 5eef3a778..d518baec2 100644 --- a/chain/src/chain.rs +++ b/chain/src/chain.rs @@ -990,7 +990,7 @@ impl Chain { Err(e) => { return Err( ErrorKind::StoreErr(e, "retrieving block to compact".to_owned()).into(), - ) + ); } } if current.height <= 1 { diff --git a/chain/src/lib.rs b/chain/src/lib.rs index 29ff83bd7..559106513 100644 --- a/chain/src/lib.rs +++ b/chain/src/lib.rs @@ -33,7 +33,6 @@ extern crate log; use failure; use grin_core as core; use grin_keychain as keychain; -use grin_store; use grin_util as util; mod chain; diff --git a/config/src/lib.rs b/config/src/lib.rs index 81bc671c7..f21c98b36 100644 --- a/config/src/lib.rs +++ b/config/src/lib.rs @@ -20,11 +20,8 @@ #![deny(unused_mut)] #![warn(missing_docs)] -use dirs; - #[macro_use] extern crate serde_derive; -use toml; use grin_core as core; use grin_p2p as p2p; diff --git a/p2p/src/lib.rs b/p2p/src/lib.rs index 4c6d77eae..4f967b1fb 100644 --- a/p2p/src/lib.rs +++ b/p2p/src/lib.rs @@ -29,7 +29,6 @@ use lmdb_zero as lmdb; #[macro_use] extern crate grin_core as core; -use grin_store; use grin_util as util; #[macro_use] diff --git a/servers/src/lib.rs b/servers/src/lib.rs index a42bb99df..dec11f362 100644 --- a/servers/src/lib.rs +++ b/servers/src/lib.rs @@ -21,10 +21,8 @@ #![deny(unused_mut)] #![warn(missing_docs)] -use serde; #[macro_use] extern crate serde_derive; -use serde_json; #[macro_use] extern crate log; diff --git a/src/bin/cmd/wallet_tests.rs b/src/bin/cmd/wallet_tests.rs index a71195369..f9b301fe4 100644 --- a/src/bin/cmd/wallet_tests.rs +++ b/src/bin/cmd/wallet_tests.rs @@ -14,11 +14,9 @@ //! Test wallet command line works as expected #[cfg(test)] mod wallet_tests { - use chrono; use clap; use grin_util as util; use grin_wallet; - use serde; use grin_wallet::test_framework::{self, LocalWalletClient, WalletProxy}; diff --git a/src/bin/grin.rs b/src/bin/grin.rs index 4bb5c9b36..a6c7f6c51 100644 --- a/src/bin/grin.rs +++ b/src/bin/grin.rs @@ -16,9 +16,7 @@ #[macro_use] extern crate clap; -use ctrlc; -use serde_json; #[macro_use] extern crate log; use crate::config::config::{SERVER_CONFIG_FILE_NAME, WALLET_CONFIG_FILE_NAME}; @@ -31,9 +29,7 @@ use grin_core as core; use grin_p2p as p2p; use grin_servers as servers; use grin_util as util; -use grin_wallet; use std::process::exit; -use term; mod cmd; pub mod tui; diff --git a/store/src/lib.rs b/store/src/lib.rs index 7c76efbcf..eeec7ee38 100644 --- a/store/src/lib.rs +++ b/store/src/lib.rs @@ -20,9 +20,6 @@ #![deny(unused_mut)] #![warn(missing_docs)] -use lmdb_zero; -use memmap; - #[macro_use] extern crate log; use failure; diff --git a/wallet/src/lib.rs b/wallet/src/lib.rs index e5680cad8..1e5076846 100644 --- a/wallet/src/lib.rs +++ b/wallet/src/lib.rs @@ -19,7 +19,6 @@ use blake2_rfc as blake2; #[macro_use] extern crate prettytable; -use serde; #[macro_use] extern crate serde_derive; #[macro_use] @@ -30,7 +29,6 @@ use grin_core as core; use grin_keychain as keychain; use grin_store as store; use grin_util as util; -use term; mod adapters; pub mod command; diff --git a/wallet/src/lmdb_wallet.rs b/wallet/src/lmdb_wallet.rs index 0ca47f1b3..39eabdea8 100644 --- a/wallet/src/lmdb_wallet.rs +++ b/wallet/src/lmdb_wallet.rs @@ -21,8 +21,6 @@ use std::fs::File; use std::io::{Read, Write}; use std::path::Path; -use serde_json; - use failure::ResultExt; use uuid::Uuid; diff --git a/wallet/tests/check.rs b/wallet/tests/check.rs index 357ec09bf..8e46d70ca 100644 --- a/wallet/tests/check.rs +++ b/wallet/tests/check.rs @@ -552,7 +552,6 @@ fn two_wallets_one_seed_impl(test_dir: &str) -> Result<(), libwallet::Error> { })?; let _ = test_framework::award_blocks_to_wallet(&chain, miner.clone(), cm); - bh += cm as u64; // 7) Ensure check_repair creates missing accounts wallet::controller::owner_single_use(wallet10.clone(), |api| {