Merge pull request #40 from tox-rs/clippy

Fix clippy warnings

Author: kpp

.travis.yml

@@ -1,24 +1,14 @@
 language: rust
+os:
+  - linux
+  - osx
 rust:
   - 1.31.0
   - stable
   - beta
   - nightly
-cache:
-  - apt
-  - cargo
-
-os:
-  - linux
-  - osx
-
-matrix:
-  allow_failures:
-  - rust: beta
-  - rust: nightly
-
-sudo: required
 
+sudo: false
 env:
   global:
     - RUST_BACKTRACE=1
@@ -31,27 +21,23 @@ before_install:
   - |
     if [[ "$TRAVIS_OS_NAME" == "linux" ]]
     then
-        ./scripts/verify-commit-messages.sh "$TRAVIS_COMMIT_RANGE" \
-        && ./scripts/bootstrap-ubuntu-14-04.sh
-    fi
-  - |
-    if [[ "$TRAVIS_OS_NAME" == "osx" ]]
-    then
-        ./scripts/bootstrap-osx.sh
-    fi
-
-install:
-  - |
-    if [[ "$TRAVIS_RUST_VERSION" == nightly ]]
-    then
-        rustup component add clippy-preview
+        ./scripts/verify-commit-messages.sh "$TRAVIS_COMMIT_RANGE" || exit 1;
     fi
 
 script:
   - cargo build --verbose
   - cargo test --verbose
-  - |
-    if [[ "$TRAVIS_RUST_VERSION" == nightly ]]
-    then
-        cargo clippy --verbose --all --tests
-    fi
+
+matrix:
+  allow_failures:
+    - rust: beta
+    - rust: nightly
+  include:
+    - os: linux
+      rust: stable
+      env:
+        NAME: clippy
+      install:
+        - rustup component add clippy
+      script:
+        - cargo clippy --verbose --all --tests

Cargo.lock

@@ -67,7 +67,7 @@ fn version() -> u32 {
     assert!(major < 1000, "Invalid major version");
     assert!(minor < 1000, "Invalid minor version");
     assert!(patch < 1000, "Invalid patch version");
-    3000000000 + major * 1000000 + minor * 1000 + patch
+    3_000_000_000 + major * 1_000_000 + minor * 1000 + patch
 }
 
 /// Bind a UDP listener to the socket address.
@@ -276,7 +276,7 @@ fn run_udp(config: &NodeConfig, dht_pk: PublicKey, dht_sk: &SecretKey, udp_onion
 }
 
 fn main() {
-    if !crypto_init() {
+    if crypto_init().is_err() {
         panic!("Crypto initialization failed.");
     }
 
@@ -304,7 +304,7 @@ fn main() {
         LogType::None => { },
     }
 
-    for (key, _) in &config.unused {
+    for key in config.unused.keys() {
         warn!("Unused configuration key: {:?}", key);
     }
 

scripts/bootstrap-osx.sh

@@ -85,10 +85,10 @@ impl Motd {
     fn summary(source: u64) -> String {
         match source {
             0..=999 => format!("{}",source),
-            1000..=999999 => format!("{0:.1}K", source as f32 / 1000.0),
-            1000000..=999999999 => format!("{0:.1}M", source as f32 / 1000000.0),
-            1000000000..=999999999999 => format!("{0:.1}G", source as f32 / 1000000000.0),
-            1000000000000..=u64::MAX => format!("{0:.1}T", source as f32 / 1000000000000.0),
+            1_000..=999_999 => format!("{0:.1}K", source as f32 / 1_000.0),
+            1_000_000..=999_999_999 => format!("{0:.1}M", source as f32 / 1_000_000.0),
+            1_000_000_000..=999_999_999_999 => format!("{0:.1}G", source as f32 / 1_000_000_000.0),
+            1_000_000_000_000..=u64::MAX => format!("{0:.1}T", source as f32 / 1_000_000_000_000.0),
             _ => unreachable!("Packets counter has an impossible value")
         }
     }

scripts/bootstrap-ubuntu-14-04.sh

@@ -76,7 +76,7 @@ fn de_from_hex<'de, D>(deserializer: D) -> Result<PublicKey, D::Error> where D:
     let bootstrap_pk_bytes: [u8; 32] = FromHex::from_hex(s)
         .map_err(|e| de::Error::custom(format!("Can't make bytes from hex string {:?}", e)))?;
     PublicKey::from_slice(&bootstrap_pk_bytes)
-        .ok_or(de::Error::custom("Can't make PublicKey"))
+        .ok_or_else(|| de::Error::custom("Can't make PublicKey"))
 }
 
 // TODO: Remove this function. Use default String type after bug fix released.
@@ -259,18 +259,18 @@ pub fn cli_parse() -> NodeConfig {
 }
 
 /// Parse settings from a saved file.
-fn parse_config(config_path: String) -> NodeConfig {
+fn parse_config(config_path: &str) -> NodeConfig {
     let mut settings = Config::default();
 
     settings.set_default("log-type", "Stderr").expect("Can't set default value for `log-type`");
     settings.set_default("motd", "This is tox-rs").expect("Can't set default value for `motd`");
     settings.set_default("lan-discovery", "False").expect("Can't set default value for `lan-discovery`");
     settings.set_default("threads", "1").expect("Can't set default value for `threads`");
 
-    let config_file = if !Path::new(&config_path).exists() {
+    let config_file = if !Path::new(config_path).exists() {
         panic!("Can't find config file {}", config_path);
     } else {
-        CfgFile::with_name(&config_path)
+        CfgFile::with_name(config_path)
     };
 
     settings.merge(config_file).expect("Merging config file with default values failed");
@@ -287,7 +287,7 @@ fn parse_config(config_path: String) -> NodeConfig {
 fn run_config(matches: &ArgMatches) -> NodeConfig {
     let config_path = value_t!(matches.value_of("cfg-file"), String).unwrap_or_else(|e| e.exit());
 
-    parse_config(config_path)
+    parse_config(&config_path)
 }
 
 fn run_args(matches: &ArgMatches) -> NodeConfig {