From 3a39bbaf741f74342c694e59a3e0b1888279131c Mon Sep 17 00:00:00 2001
From: mcarton <cartonmartin+git@gmail.com>
Date: Fri, 29 Jan 2016 22:19:14 +0100
Subject: [PATCH] Small cleanup

---
 src/entry.rs   | 6 +++---
 src/matches.rs | 4 ++--
 src/utils.rs   | 2 +-
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/src/entry.rs b/src/entry.rs
index d9fb7269be6b..64d6fa7be38b 100644
--- a/src/entry.rs
+++ b/src/entry.rs
@@ -93,19 +93,19 @@ fn check_for_insert(cx: &LateContext, span: Span, map: &Expr, key: &Expr, expr:
         ], {
             let help = if sole_expr {
                 format!("{}.entry({}).or_insert({})",
-                        snippet(cx, map.span, ".."),
+                        snippet(cx, map.span, "map"),
                         snippet(cx, params[1].span, ".."),
                         snippet(cx, params[2].span, ".."))
             }
             else {
                 format!("{}.entry({})",
-                        snippet(cx, map.span, ".."),
+                        snippet(cx, map.span, "map"),
                         snippet(cx, params[1].span, ".."))
             };
 
             span_lint_and_then(cx, MAP_ENTRY, span,
                                &format!("usage of `contains_key` followed by `insert` on `{}`", kind), |db| {
-                db.span_suggestion(span, "Consider using", help.clone());
+                db.span_suggestion(span, "Consider using", help);
             });
         }
     }
diff --git a/src/matches.rs b/src/matches.rs
index 4cb4df19bf80..0c18d35fa128 100644
--- a/src/matches.rs
+++ b/src/matches.rs
@@ -223,8 +223,8 @@ fn check_match_bool(cx: &LateContext, ex: &Expr, arms: &[Arm], expr: &Expr) {
                            expr.span,
                            "you seem to be trying to match on a boolean expression. Consider using \
                            an if..else block:", move |db| {
-            if let Some(ref sugg) = sugg {
-                db.span_suggestion(expr.span, "try this", sugg.clone());
+            if let Some(sugg) = sugg {
+                db.span_suggestion(expr.span, "try this", sugg);
             }
         });
     }
diff --git a/src/utils.rs b/src/utils.rs
index a6dbcfd9e2fb..b5355919496e 100644
--- a/src/utils.rs
+++ b/src/utils.rs
@@ -649,7 +649,7 @@ fn is_cast_ty_equal(left: &Ty, right: &Ty) -> bool {
     }
 }
 
-/// Return the pre-expansion span is this comes from a expansion of the macro `name`.
+/// Return the pre-expansion span if is this comes from an expansion of the macro `name`.
 pub fn is_expn_of(cx: &LateContext, mut span: Span, name: &str) -> Option<Span> {
     loop {
         let span_name_span = cx.tcx.sess.codemap().with_expn_info(span.expn_id, |expn| {