Merge pull request kstep#17 from tomprince/lints

Clean up warnings and run clippy.

Author: kstep

.travis.yml

@@ -10,22 +10,29 @@ addons:
       - binutils-dev
 rust:
   - stable
+  - nightly
+env:
+  global:
+    # override the default `--features unstable` used for the nightly branch
+    - TRAVIS_CARGO_NIGHTLY_FEATURE=""
 before_script:
   - sudo apt-get update -qq
   - sudo apt-get install -y mpd
   - /usr/bin/mpd --version
+  - export PATH=$HOME/.cargo/bin:$HOME/.local/bin:$PATH
   - |
     pip install 'travis-cargo<0.2' --user &&
-    export PATH=$HOME/.local/bin:$PATH
+    travis-cargo --only nightly install -- --force clippy
   - |
     cargo install --force rustfmt
-    export PATH=$HOME/.cargo/bin:$PATH
 script:
   - |
-    travis-cargo build &&
+    RUSTFLAGS=-Dwarnings travis-cargo build &&
     travis-cargo test
   - |
     cargo fmt -- --write-mode diff
+  - |
+    travis-cargo --only nightly clippy
   - |
     travis-cargo --only stable doc
 after_success:

benches/helpers.rs

@@ -5,14 +5,11 @@ extern crate time;
 extern crate test;
 extern crate unix_socket;
 
-mod helpers;
-use helpers::connect;
 use test::{Bencher, black_box};
-use time::Duration;
 use unix_socket::UnixStream;
 
 #[bench]
 fn status(b: &mut Bencher) {
     let mut mpd = mpd::Client::<UnixStream>::new(UnixStream::connect("/var/run/mpd/socket").unwrap()).unwrap();
-    b.iter(|| { black_box(mpd.status()); });
+    b.iter(|| { black_box(mpd.status()).unwrap(); });
 }

benches/options.rs

@@ -162,6 +162,7 @@ impl<S: Read + Write> Client<S> {
     }
 
     /// Switch to a next song in queue
+    #[cfg_attr(feature = "cargo-clippy", allow(should_implement_trait))]
     pub fn next(&mut self) -> Result<()> {
         self.run_command("next")
             .and_then(|_| self.expect_ok())
@@ -692,7 +693,7 @@ impl<S: Read + Write> Client<S> {
                             .map(|&(ref a, _)| *a == "sticker")
                             .unwrap_or(true)
                     })
-                    .map(|r| r.map(|(_, b)| b.splitn(2, "=").nth(1).map(|s| s.to_owned()).unwrap()))
+                    .map(|r| r.map(|(_, b)| b.splitn(2, '=').nth(1).map(|s| s.to_owned()).unwrap()))
                     .collect()
             })
     }
@@ -708,7 +709,7 @@ impl<S: Read + Write> Client<S> {
                         rmap.map(|mut map| {
                             (map.remove("file").unwrap(),
                              map.remove("sticker")
-                                 .and_then(|s| s.splitn(2, "=").nth(1).map(|s| s.to_owned()))
+                                 .and_then(|s| s.splitn(2, '=').nth(1).map(|s| s.to_owned()))
                                  .unwrap())
                         })
                     })
@@ -741,7 +742,7 @@ impl<S: Read + Write> Proto for Client<S> {
     fn read_line(&mut self) -> Result<String> {
         let mut buf = String::new();
         try!(self.socket.read_line(&mut buf));
-        if buf.ends_with("\n") {
+        if buf.ends_with('\n') {
             buf.pop();
         }
         Ok(buf)

src/client.rs

@@ -45,7 +45,7 @@ impl<'a> ToPlaylistName for &'a Playlist {
 
 impl<'a> ToPlaylistName for &'a String {
     fn to_name(&self) -> &str {
-        &*self
+        self
     }
 }
 

src/convert.rs

@@ -8,7 +8,7 @@ use error::{Error, ProtoError, Result};
 use reply::Reply;
 use std::collections::BTreeMap;
 use std::fmt::Arguments;
-use std::io::{self, BufRead, Lines, Read, Write};
+use std::io::{self, Lines, Read, Write};
 
 pub struct Pairs<I>(pub I);
 

src/proto.rs

@@ -23,15 +23,13 @@ impl FromStr for Reply {
     fn from_str(s: &str) -> Result<Reply, ParseError> {
         if s == "OK" || s == "list_OK" {
             Ok(Reply::Ok)
+        } else if let Ok(ack) = s.parse::<ServerError>() {
+            Ok(Reply::Ack(ack))
         } else {
-            if let Ok(ack) = s.parse::<ServerError>() {
-                Ok(Reply::Ack(ack))
-            } else {
-                let mut splits = s.splitn(2, ':');
-                match (splits.next(), splits.next()) {
-                    (Some(a), Some(b)) => Ok(Reply::Pair(a.to_owned(), b.trim().to_owned())),
-                    _ => Err(ParseError::BadPair),
-                }
+            let mut splits = s.splitn(2, ':');
+            match (splits.next(), splits.next()) {
+                (Some(a), Some(b)) => Ok(Reply::Pair(a.to_owned(), b.trim().to_owned())),
+                _ => Err(ParseError::BadPair),
             }
         }
     }

src/reply.rs

@@ -1,15 +1,9 @@
 #![allow(missing_docs)]
 // TODO: unfinished functionality
 
-use client::Client;
-use convert::{FromMap, ToPlaylistName};
-use error::Result;
-use proto::Proto;
-use song::Song;
 use std::borrow::Cow;
 use std::convert::Into;
 use std::fmt;
-use std::io::{Read, Write};
 
 pub enum Term<'a> {
     Any,

src/search.rs

@@ -4,6 +4,6 @@ use std::env;
 use std::net::TcpStream;
 
 pub fn connect() -> mpd::Client<TcpStream> {
-    let addr = env::var("MPD_SOCK").unwrap_or("127.0.0.1:6600".to_owned());
+    let addr = env::var("MPD_SOCK").unwrap_or_else(|_| "127.0.0.1:6600".to_owned());
     mpd::Client::connect(&*addr).unwrap()
 }