Merge pull request #11 from rust-embedded/clippy

Add Clippy Lint Tool and Fix Warnings

Author: posborne

.travis.yml

@@ -9,4 +9,10 @@ rust:
 
 script:
   - cargo test
+  - |
+      if [ "${TRAVIS_RUST_VERSION}" = "nightly" ]; then
+         cargo install --git https://github.com/arcnmx/cargo-clippy
+         cargo clippy --lib --features lints
+         cargo clippy --bin gpio --features lints
+      fi
   - cargo doc

Cargo.lock

@@ -12,6 +12,16 @@ glob = "0.2"
 log = "0.3"
 env_logger = "0.3"
 
+[dependencies.clippy]
+version = "*"
+git = "https://github.com/Manishearth/rust-clippy"
+rev = "master"
+optional = true
+
+[features]
+default = []
+lints = ["clippy"]
+
 [[bin]]
 name = "gpio"
 path = "src/main.rs"

Cargo.toml

@@ -14,6 +14,7 @@ use std::fs::{self, File};
 use std::io;
 use std::io::prelude::*;
 use std::path::Path;
+use std::str::FromStr;
 use sysfs_gpio;
 use toml;
 
@@ -116,7 +117,7 @@ impl Decodable for PinConfig {
                             }
                         })
                         .unwrap_or(sysfs_gpio::Direction::In), // default: In
-            names: d.read_struct_field("names", 0, Decodable::decode).unwrap_or(BTreeSet::new()),
+            names: d.read_struct_field("names", 0, Decodable::decode).ok().unwrap_or_default(),
             export: d.read_struct_field("export", 0, Decodable::decode).unwrap_or(true),
             active_low: d.read_struct_field("active_low", 0, Decodable::decode).unwrap_or(false),
         })
@@ -130,6 +131,23 @@ impl PinConfig {
     }
 }
 
+impl FromStr for GpioConfig {
+    type Err = Error;
+
+    /// Load a GPIO configuration for the provided toml string
+    fn from_str(config: &str) -> Result<Self, Error> {
+        let mut parser = toml::Parser::new(config);
+        let root = try!(parser.parse().ok_or(parser.errors));
+        match Self::decode(&mut toml::Decoder::new(toml::Value::Table(root))) {
+            Ok(cfg) => {
+                try!(cfg.validate().or_else(|e| Err(Error::from(e))));
+                Ok(cfg)
+            }
+            Err(e) => Err(Error::from(e)),
+        }
+    }
+}
+
 impl GpioConfig {
     /// Validate invariants on the config that cannot easily be done earlier
     ///
@@ -188,7 +206,7 @@ impl GpioConfig {
             config_instances.push(try!(Self::from_file(fragment)));
         }
 
-        if config_instances.len() == 0 {
+        if config_instances.is_empty() {
             Err(Error::NoConfigFound)
         } else {
             let mut cfg = config_instances.remove(0);
@@ -199,19 +217,6 @@ impl GpioConfig {
         }
     }
 
-    /// Load a GPIO configuration for the provided toml string
-    pub fn from_str(config: &str) -> Result<GpioConfig, Error> {
-        let mut parser = toml::Parser::new(config);
-        let root = try!(parser.parse().ok_or(parser.errors));
-        match GpioConfig::decode(&mut toml::Decoder::new(toml::Value::Table(root))) {
-            Ok(cfg) => {
-                try!(cfg.validate().or_else(|e| Err(Error::from(e))));
-                Ok(cfg)
-            }
-            Err(e) => Err(Error::from(e)),
-        }
-    }
-
     /// Load a GPIO config from the specified path
     pub fn from_file<P: AsRef<Path>>(path: P) -> Result<GpioConfig, Error> {
         let mut contents = String::new();
@@ -286,6 +291,7 @@ mod test {
     use std::iter::FromIterator;
     use std::collections::BTreeSet;
     use sysfs_gpio::Direction as D;
+    use std::str::FromStr;
 
     const BASIC_CFG: &'static str = r#"
 [[pins]]

src/config.rs

@@ -19,7 +19,7 @@ use sysfs_gpio;
 /// actions:
 ///
 /// 1. For each GPIO name/alias, the corresponding symlink is remvoed from
-///    `/var/run/gpio/<name>` (or an alternate configured symlink_root).
+///    `/var/run/gpio/<name>` (or an alternate configured `symlink_root`).
 /// 2. The GPIO pin istself is unexported (vai /sys/class/gpio/unexport)
 ///
 /// If the GPIO was already unexported, this function will continue

src/export.rs

@@ -136,7 +136,7 @@ fn main() {
 
     // process global options
     let gpio_options = GpioOptions {
-        configs: matches.values_of_lossy("config").unwrap_or(Vec::new()),
+        configs: matches.values_of_lossy("config").unwrap_or_default(),
     };
 
     // parse the config
@@ -213,21 +213,21 @@ fn main() {
             let unexport_options = GpioUnexportOptions {
                 gpio_opts: gpio_options,
                 pin: String::from(m.value_of("pin").unwrap()),
-                symlink_root: m.value_of("symlink-root").map(|slr| String::from(slr)),
+                symlink_root: m.value_of("symlink-root").map(String::from),
             };
             gpio_unexport::main(&cfg, &unexport_options);
         }
         ("unexport-all", Some(m)) => {
             let unexportall_options = GpioUnexportAllOptions {
                 gpio_opts: gpio_options,
-                symlink_root: m.value_of("symlink-root").map(|slr| String::from(slr)),
+                symlink_root: m.value_of("symlink-root").map(String::from),
             };
             gpio_unexportall::main(&cfg, &unexportall_options);
         }
         ("status", Some(m)) => {
             let status_options = GpioStatusOptions {
                 gpio_opts: gpio_options,
-                pin: m.value_of("pin").map(|pin| String::from(pin)),
+                pin: m.value_of("pin").map(String::from),
             };
             gpio_status::main(&cfg, &status_options);
         }