Fix sticker implementation.

Author: tomprince

src/client.rs

@@ -598,8 +598,10 @@ impl<S: Read + Write> Client<S> {
     // Sticker methods {{{
     /// Show sticker value for a given object, identified by type and uri
     pub fn sticker(&mut self, typ: &str, uri: &str, name: &str) -> Result<String> {
-        self.run_command("sticker set", (typ, uri, name))
-            .and_then(|_| self.read_field("sticker"))
+        self.run_command("sticker get", (typ, uri, name))
+            // TODO: This should parse to a `Sticker` type.
+            .and_then(|_| self.read_field::<String>("sticker"))
+            .and_then(|s| s.splitn(2, '=').nth(1).map(str::to_owned).ok_or_else(|| Error::Proto(ProtoError::BadSticker)))
     }
 
     /// Set sticker value for a given object, identified by type and uri

src/error.rs

@@ -370,6 +370,8 @@ pub enum ProtoError {
     BadBanner,
     /// expected some field, but it was missing
     NoField(&'static str),
+    /// expected sticker value, but didn't find it
+    BadSticker,
 }
 
 impl fmt::Display for ProtoError {
@@ -385,6 +387,7 @@ impl StdError for ProtoError {
             ProtoError::NotPair => "pair expected",
             ProtoError::BadBanner => "banner error",
             ProtoError::NoField(_) => "missing field",
+            ProtoError::BadSticker => "sticker error",
         }
     }
 }

src/proto.rs

@@ -162,9 +162,8 @@ pub trait Proto {
         }
     }
 
-    fn read_field<T, E>(&mut self, field: &'static str) -> Result<T>
-        where T: FromStr<Err = E>,
-              ParseError: From<E>
+    fn read_field<T: FromStr>(&mut self, field: &'static str) -> Result<T>
+        where ParseError: From<T::Err>
     {
         let (a, b) = self.read_pair()?;
         self.expect_ok()?;