rustfmt

Author: kstep

src/convert.rs

@@ -11,12 +11,12 @@ use song::{self, Id, Song};
 use error::Error;
 
 #[doc(hidden)]
-pub trait FromMap : Sized {
+pub trait FromMap: Sized {
     fn from_map(map: BTreeMap<String, String>) -> Result<Self, Error>;
 }
 
 #[doc(hidden)]
-pub trait FromIter : Sized {
+pub trait FromIter: Sized {
     fn from_iter<I: Iterator<Item = Result<(String, String), Error>>>(iter: I) -> Result<Self, Error>;
 }
 
@@ -100,7 +100,7 @@ pub trait IsId {
     }
 }
 
-pub trait ToQueueRangeOrPlace : IsId {
+pub trait ToQueueRangeOrPlace: IsId {
     fn to_range(self) -> String;
 }
 
@@ -162,7 +162,7 @@ impl ToQueueRangeOrPlace for RangeFull {
     }
 }
 
-pub trait ToQueuePlace : IsId {
+pub trait ToQueuePlace: IsId {
     fn to_place(self) -> u32;
 }
 

src/idle.rs

@@ -40,7 +40,8 @@ use proto::Proto;
 pub enum Subsystem {
     /// database: the song database has been modified after update.
     Database,
-    /// update: a database update has started or finished. If the database was modified during the update, the database event is also emitted.
+    /// update: a database update has started or finished.
+    /// If the database was modified during the update, the database event is also emitted.
     Update,
     /// stored_playlist: a stored playlist has been modified, renamed, created or deleted
     Playlist,
@@ -134,7 +135,7 @@ impl<'a, S: 'a + Read + Write> Drop for IdleGuard<'a, S> {
 /// See module's documentation for details.
 pub trait Idle {
     /// Stream type of a client
-    type Stream: Read+Write;
+    type Stream: Read + Write;
 
     /// Start listening for events from a set of subsystems
     ///

src/proto.rs

@@ -12,7 +12,8 @@ use convert::FromIter;
 
 pub struct Pairs<I>(pub I);
 
-impl<I> Iterator for Pairs<I> where I: Iterator<Item = io::Result<String>>
+impl<I> Iterator for Pairs<I>
+    where I: Iterator<Item = io::Result<String>>
 {
     type Item = Result<(String, String)>;
     fn next(&mut self) -> Option<Result<(String, String)>> {
@@ -36,7 +37,8 @@ struct Maps<'a, I: 'a> {
     first: bool,
 }
 
-impl<'a, I> Iterator for Maps<'a, I> where I: Iterator<Item = io::Result<String>>
+impl<'a, I> Iterator for Maps<'a, I>
+    where I: Iterator<Item = io::Result<String>>
 {
     type Item = Result<BTreeMap<String, String>>;
     fn next(&mut self) -> Option<Result<BTreeMap<String, String>>> {
@@ -72,15 +74,12 @@ impl<'a, I> Iterator for Maps<'a, I> where I: Iterator<Item = io::Result<String>
             }
         }
 
-        if map.is_empty() {
-            None
-        } else {
-            Some(Ok(map))
-        }
+        if map.is_empty() { None } else { Some(Ok(map)) }
     }
 }
 
-impl<I> Pairs<I> where I: Iterator<Item = io::Result<String>>
+impl<I> Pairs<I>
+    where I: Iterator<Item = io::Result<String>>
 {
     pub fn split<'a, 'b: 'a>(&'a mut self, f: &'b str) -> Maps<'a, I> {
         Maps {
@@ -96,7 +95,7 @@ impl<I> Pairs<I> where I: Iterator<Item = io::Result<String>>
 // Client inner communication methods {{{
 #[doc(hidden)]
 pub trait Proto {
-    type Stream: Read+Write;
+    type Stream: Read + Write;
 
     fn read_line(&mut self) -> Result<String>;
     fn read_pairs(&mut self) -> Pairs<Lines<&mut BufStream<Self::Stream>>>;