Fix some clippy warnings

iorust · Apr 11, 2017 · e75a575 · e75a575
1 parent c1cc23e
commit e75a575
Show file tree

Hide file tree

Showing 3 changed files with 19 additions and 20 deletions.
diff --git a/src/serialize.rs b/src/serialize.rs
@@ -152,11 +152,11 @@ impl<R: Read> Decoder<R> {
         let bytes = res[1..len - 2].as_ref();
         match res[0] {
             // Value::String
-            b'+' => parse_string(bytes).map(|val| Value::String(val)),
+            b'+' => parse_string(bytes).map(Value::String),
             // Value::Error
-            b'-' => parse_string(bytes).map(|val| Value::Error(val)),
+            b'-' => parse_string(bytes).map(Value::Error),
             // Value::Integer
-            b':' => parse_integer(bytes).map(|val| Value::Integer(val)),
+            b':' => parse_integer(bytes).map(Value::Integer),
             // Value::Bulk
             b'$' => {
                 let int = parse_integer(bytes)?;
@@ -181,7 +181,7 @@ impl<R: Read> Decoder<R> {
                 if self.buf_bulk {
                     return Ok(Value::BufBulk(buf));
                 }
-                return parse_string(buf.as_slice()).map(|val| Value::Bulk(val));
+                parse_string(buf.as_slice()).map(Value::Bulk)
             }
             // Value::Array
             b'*' => {
@@ -200,7 +200,7 @@ impl<R: Read> Decoder<R> {
                     let val = self.decode()?;
                     array.push(val);
                 }
-                return Ok(Value::Array(array));
+                Ok(Value::Array(array))
             }
             prefix => {
                 Err(Error::new(ErrorKind::InvalidInput,
@@ -536,4 +536,4 @@ mod tests {
         let mut decoder = Decoder::new(BufReader::new(buf.as_slice()));
         assert!(decoder.decode().is_err());
     }
-}
+}
diff --git a/src/value.rs b/src/value.rs
@@ -38,8 +38,7 @@ impl Value {
     /// ```
     pub fn is_null(&self) -> bool {
         match *self {
-            Value::Null => true,
-            Value::NullArray => true,
+            Value::Null | Value::NullArray => true,
             _ => false,
         }
     }
@@ -149,15 +148,15 @@ impl Value {
     /// ```
     pub fn to_string_pretty(&self) -> String {
         match *self {
-            Value::Null => format!("{}", "(Null)"),
-            Value::NullArray => format!("{}", "(Null Array)"),
-            Value::String(ref val) => format!("{}", val),
+            Value::Null => "(Null)".to_string(),
+            Value::NullArray => "(Null Array)".to_string(),
+            Value::String(ref val) => val.to_string(),
             Value::Error(ref val) => format!("(Error) {}", val),
             Value::Integer(ref val) => format!("(Integer) {}", val.to_string()),
             Value::Bulk(ref val) => format!("\"{}\"", val),
             Value::BufBulk(ref val) => {
-                if val.len() == 0 {
-                    return format!("{}", "(Empty Buffer)");
+                if val.is_empty() {
+                    return "(Empty Buffer)".to_string();
                 }
                 let mut string = String::new();
                 for u in val.iter().take(16) {
@@ -168,7 +167,7 @@ impl Value {
                 }
                 format!("(Buffer) {}", &string[1..])
             }
-            Value::Array(ref val) => format!("{}", format_array_to_str(val, 0)),
+            Value::Array(ref val) => format_array_to_str(val, 0),
         }
     }
     /// [DEPRECATED] Alias of to_string_pretty.
@@ -206,9 +205,9 @@ fn format_index_str(index: usize, num_len: usize) -> String {
     format!("{}) ", string)
 }
 
-fn format_array_to_str(array: &Vec<Value>, min_index_len: usize) -> String {
-    if array.len() == 0 {
-        return format!("{}", "(Empty Array)");
+fn format_array_to_str(array: &[Value], min_index_len: usize) -> String {
+    if array.is_empty() {
+        return "(Empty Array)".to_string();
     }
 
     let mut string = String::new();
@@ -226,8 +225,8 @@ fn format_array_to_str(array: &Vec<Value>, min_index_len: usize) -> String {
             index_len
         };
         string.push_str(&format_index_str(i + 1, num_len));
-        match value {
-            &Value::Array(ref sub) => string.push_str(&format_array_to_str(sub, index_len + 3)),
+        match *value {
+            Value::Array(ref sub) => string.push_str(&format_array_to_str(sub, index_len + 3)),
             _ => string.push_str(&value.to_string_pretty()),
         };
         if i + 1 < len {

diff --git a/tests/lib.rs b/tests/lib.rs
@@ -193,7 +193,7 @@ fn struct_decoder() {
                                       Value::Bulk("bar".to_string())]),
           },
           Case {
-              data: encode_slice(&vec!["SET", "a", "1"]),
+              data: encode_slice(&["SET", "a", "1"]),
               want: Value::Array(vec![Value::Bulk("SET".to_string()),
                                       Value::Bulk("a".to_string()),
                                       Value::Bulk("1".to_string())]),