Merge topic 'simplify-hook-deserialize'

badf390b

 hooks: simplify hook kind extraction
Acked-by: Kitware Robot <kwrobot@kitware.com>
Reviewed-by: Brad King <brad.king@kitware.com>
Merge-request: !30

src/systemhooks.rs.in

@@ -261,14 +261,10 @@ impl Deserialize for SystemHook {
         let val = try!(Value::deserialize(deserializer));
 
         let event_name = match val.pointer("/event_name") {
-                Some(mstring) => {
-                    match mstring.as_string() {
-                        Some(string) => string,
-                        None => {
-                            return Err(D::Error::invalid_type(Type::String));
-                        },
-                    }
-                },
+                Some(&Value::String(ref name)) => name,
+                Some(_) => {
+                    return Err(D::Error::invalid_type(Type::String));
+                }
                 None => {
                     return Err(D::Error::missing_field("event_name"));
                 },

src/webhooks.rs.in

@@ -539,13 +539,9 @@ impl Deserialize for WebHook {
         let val = try!(Value::deserialize(deserializer));
 
         let object_kind = match val.pointer("/object_kind") {
-                Some(mstring) => {
-                    match mstring.as_string() {
-                        Some(string) => string,
-                        None => {
-                            return Err(D::Error::invalid_type(Type::String));
-                        },
-                    }
+                Some(&Value::String(ref kind)) => kind,
+                Some(_) => {
+                    return Err(D::Error::invalid_type(Type::String));
                 },
                 None => {
                     return Err(D::Error::missing_field("object_kind"));