Move a map out of an and_then.

tomprince · tomprince · commit 9feef04da8fe · 2017-01-27T17:16:13.000-07:00
diff --git a/src/client.rs b/src/client.rs
@@ -221,7 +221,8 @@ impl<S: Read + Write> Client<S> {
     /// Get current playing song
     pub fn currentsong(&mut self) -> Result<Option<Song>> {
         self.run_command("currentsong", ())
-            .and_then(|_| self.read_struct::<Song>().map(|s| if s.place.is_none() { None } else { Some(s) }))
+            .and_then(|_| self.read_struct::<Song>())
+            .map(|s| if s.place.is_none() { None } else { Some(s) })
     }
 
     /// Clear current queue

Original file line number	Diff line number	Diff line change
`@@ -221,7 +221,8 @@ impl<S: Read + Write> Client<S> {`
`221`	`221`	`/// Get current playing song`
`222`	`222`	`pub fn currentsong(&mut self) -> Result<Option<Song>> {`
`223`	`223`	`self.run_command("currentsong", ())`
`224`		`- .and_then(\|_\| self.read_struct::<Song>().map(\|s\| if s.place.is_none() { None } else { Some(s) }))`
	`224`	`+ .and_then(\|_\| self.read_struct::<Song>())`
	`225`	`+ .map(\|s\| if s.place.is_none() { None } else { Some(s) })`
`225`	`226`	`}`
`226`	`227`
`227`	`228`	`/// Clear current queue`