From 30d09cf6b06cc8de9e4e37b4cd07699a78187902 Mon Sep 17 00:00:00 2001
From: ms2300 <matt.sewall@gmail.com>
Date: Fri, 17 Aug 2018 11:13:06 -0600
Subject: [PATCH] Fixing a couple clippy warnings : #392

---
 lib/filetests/src/test_verifier.rs |  6 +++---
 lib/serde/src/clif-json.rs         | 13 ++++++-------
 lib/serde/src/serde_clif_json.rs   |  8 ++++----
 lib/simplejit/src/backend.rs       |  4 ++--
 4 files changed, 15 insertions(+), 16 deletions(-)

diff --git a/lib/filetests/src/test_verifier.rs b/lib/filetests/src/test_verifier.rs
index 9c356d6733..0f5291c70c 100644
--- a/lib/filetests/src/test_verifier.rs
+++ b/lib/filetests/src/test_verifier.rs
@@ -51,10 +51,10 @@ impl SubTest for TestVerifier {
         }
 
         match verify_function(func, context.flags_or_isa()) {
-            Ok(()) if expected.len() == 0 => Ok(()),
+            Ok(()) if expected.is_empty() => Ok(()),
             Ok(()) => Err(format!("passed, but expected errors: {:?}", expected)),
 
-            Err(ref errors) if expected.len() == 0 => {
+            Err(ref errors) if expected.is_empty() => {
                 Err(format!("expected no error, but got:\n{}", errors))
             }
 
@@ -78,7 +78,7 @@ impl SubTest for TestVerifier {
                     }
                 }
 
-                if msg.len() == 0 {
+                if msg.is_empty() {
                     Ok(())
                 } else {
                     Err(msg)
diff --git a/lib/serde/src/clif-json.rs b/lib/serde/src/clif-json.rs
index 7cc674c2b6..228b13703d 100644
--- a/lib/serde/src/clif-json.rs
+++ b/lib/serde/src/clif-json.rs
@@ -33,16 +33,15 @@ fn call_ser(file: &str, pretty: bool) -> Result<(), String> {
     match ret_of_parse {
         Ok(funcs) => {
             let ser_funcs = serde_clif_json::SerObj::new(&funcs);
-            let ser_str: String;
-            if pretty {
-                ser_str = serde_json::to_string_pretty(&ser_funcs).unwrap();
+            let ser_str = if pretty {
+                serde_json::to_string_pretty(&ser_funcs).unwrap()
             } else {
-                ser_str = serde_json::to_string(&ser_funcs).unwrap();
-            }
+                serde_json::to_string(&ser_funcs).unwrap()
+            };
             println!("{}", ser_str);
             Ok(())
         }
-        Err(_pe) => Err(format!("There was a parsing error")),
+        Err(_pe) => Err("There was a parsing error".to_string()),
     }
 }
 
@@ -99,7 +98,7 @@ fn main() {
                 File::open(m.value_of("FILE").unwrap()).expect("Unable to open the file");
             call_de(&file)
         }
-        _ => Err(format!("Invalid subcommand.")),
+        _ => Err("Invalid subcommand.".to_string()),
     };
 
     if let Err(mut msg) = res_serde {
diff --git a/lib/serde/src/serde_clif_json.rs b/lib/serde/src/serde_clif_json.rs
index c113f8622b..52fdc6fca1 100644
--- a/lib/serde/src/serde_clif_json.rs
+++ b/lib/serde/src/serde_clif_json.rs
@@ -250,7 +250,7 @@ pub fn get_inst_data(inst_index: Inst, func: &Function) -> SerInstData {
         },
         InstructionData::UnaryBool { opcode, imm } => SerInstData::UnaryBool {
             opcode: opcode.to_string(),
-            imm: imm,
+            imm,
         },
         InstructionData::UnaryGlobalValue {
             opcode,
@@ -759,10 +759,10 @@ impl SerSignature {
     fn create_new(sig: &Signature) -> Self {
         let mut params_vec: Vec<String> = Vec::new();
         let mut returns_vec: Vec<String> = Vec::new();
-        for param in sig.params.iter() {
+        for param in &sig.params {
             params_vec.push(param.to_string());
         }
-        for ret in sig.returns.iter() {
+        for ret in &sig.returns {
             returns_vec.push(ret.to_string());
         }
         Self {
@@ -818,7 +818,7 @@ impl SerObj {
         Self { functions: funcs }
     }
 
-    pub fn new(funcs: &Vec<Function>) -> Self {
+    pub fn new(funcs: &[Function]) -> Self {
         let mut func_vec: Vec<SerFunction> = Vec::new();
         for func in funcs {
             let mut ser_func: SerFunction = SerFunction::new(&func);
diff --git a/lib/simplejit/src/backend.rs b/lib/simplejit/src/backend.rs
index 043e765be4..15c3f2b2c1 100644
--- a/lib/simplejit/src/backend.rs
+++ b/lib/simplejit/src/backend.rs
@@ -60,7 +60,7 @@ impl SimpleJITBuilder {
     /// back to a platform-specific search (this typically involves searching
     /// the current process for public symbols, followed by searching the
     /// platform's C runtime).
-    pub fn symbol<'a, K>(&'a mut self, name: K, ptr: *const u8) -> &'a mut Self
+    pub fn symbol<K>(&mut self, name: K, ptr: *const u8) -> &Self
     where
         K: Into<String>,
     {
@@ -71,7 +71,7 @@ impl SimpleJITBuilder {
     /// Define multiple symbols in the internal symbol table.
     ///
     /// Using this is equivalent to calling `symbol` on each element.
-    pub fn symbols<'a, It, K>(&'a mut self, symbols: It) -> &'a mut Self
+    pub fn symbols<It, K>(&mut self, symbols: It) -> &Self
     where
         It: IntoIterator<Item = (K, *const u8)>,
         K: Into<String>,