From 03c22ed67a2d48378952a352851866db82e74688 Mon Sep 17 00:00:00 2001
From: Benjamin Bouvier <public@benj.me>
Date: Thu, 3 Jan 2019 18:09:38 +0100
Subject: [PATCH] Remove warnings in tests;

---
 lib/entity/src/list.rs           | 1 -
 lib/frontend/src/switch.rs       | 4 ++--
 lib/serde/src/clif-json.rs       | 3 +--
 lib/serde/src/serde_clif_json.rs | 4 ++--
 4 files changed, 5 insertions(+), 7 deletions(-)

diff --git a/lib/entity/src/list.rs b/lib/entity/src/list.rs
index 617ea2db32..4dc3ce575d 100644
--- a/lib/entity/src/list.rs
+++ b/lib/entity/src/list.rs
@@ -484,7 +484,6 @@ impl<T: EntityRef + ReservedValue> EntityList<T> {
 mod tests {
     use super::*;
     use super::{sclass_for_length, sclass_size};
-    use crate::packed_option::ReservedValue;
     use crate::EntityRef;
 
     /// An opaque reference to an instruction in a function.
diff --git a/lib/frontend/src/switch.rs b/lib/frontend/src/switch.rs
index d5af64ed8c..5ecb4edc38 100644
--- a/lib/frontend/src/switch.rs
+++ b/lib/frontend/src/switch.rs
@@ -223,8 +223,8 @@ mod tests {
             }
             func
                 .to_string()
-                .trim_left_matches("function u0:0() fast {\n")
-                .trim_right_matches("\n}\n")
+                .trim_start_matches("function u0:0() fast {\n")
+                .trim_end_matches("\n}\n")
                 .to_string()
         }};
     }
diff --git a/lib/serde/src/clif-json.rs b/lib/serde/src/clif-json.rs
index fa25a723ed..9253d08d1c 100644
--- a/lib/serde/src/clif-json.rs
+++ b/lib/serde/src/clif-json.rs
@@ -100,8 +100,7 @@ fn main() {
             }
         }
         ("deserialize", Some(m)) => {
-            let mut file =
-                File::open(m.value_of("FILE").unwrap()).expect("Unable to open the file");
+            let file = File::open(m.value_of("FILE").unwrap()).expect("Unable to open the file");
             call_de(&file)
         }
         _ => Err("Invalid subcommand.".to_string()),
diff --git a/lib/serde/src/serde_clif_json.rs b/lib/serde/src/serde_clif_json.rs
index f771fc7438..50655b732d 100644
--- a/lib/serde/src/serde_clif_json.rs
+++ b/lib/serde/src/serde_clif_json.rs
@@ -745,7 +745,7 @@ pub fn populate_inst(func: &Function, ebb: Ebb) -> Vec<SerInst> {
     let mut ser_vec: Vec<SerInst> = Vec::new();
     let ret_iter = func.layout.ebb_insts(ebb);
     for inst in ret_iter {
-        let mut ser_inst: SerInst = SerInst::new(inst, &func);
+        let ser_inst: SerInst = SerInst::new(inst, &func);
         ser_vec.push(ser_inst);
     }
     ser_vec
@@ -867,7 +867,7 @@ impl SerObj {
     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);
+            let ser_func: SerFunction = SerFunction::new(&func);
             func_vec.push(ser_func);
         }
         Self::create_new(func_vec)