From bf513229b1be77aca80199d7220257548dff32c8 Mon Sep 17 00:00:00 2001
From: mcarton <cartonmartin+git@gmail.com>
Date: Wed, 6 Jul 2016 15:36:42 +0200
Subject: [PATCH] Address PR's comments

---
 clippy_lints/src/needless_bool.rs | 2 +-
 clippy_lints/src/transmute.rs     | 4 ++--
 clippy_lints/src/utils/sugg.rs    | 4 ++--
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/clippy_lints/src/needless_bool.rs b/clippy_lints/src/needless_bool.rs
index fa2a350c36f0..c3e2a0e61679 100644
--- a/clippy_lints/src/needless_bool.rs
+++ b/clippy_lints/src/needless_bool.rs
@@ -59,7 +59,7 @@ impl LateLintPass for NeedlessBool {
                 };
 
                 let hint = if ret {
-                    format!("return {};", snip)
+                    format!("return {}", snip)
                 } else {
                     snip.to_string()
                 };
diff --git a/clippy_lints/src/transmute.rs b/clippy_lints/src/transmute.rs
index 88ed11d26e58..ba4da0e8f654 100644
--- a/clippy_lints/src/transmute.rs
+++ b/clippy_lints/src/transmute.rs
@@ -95,9 +95,9 @@ impl LateLintPass for Transmute {
                             |db| {
                                 if let Some(arg) = sugg::Sugg::hir_opt(cx, &*args[0]) {
                                     let sugg = if ptr_ty == rty {
-                                        arg.as_ty(&to_ty.to_string())
+                                        arg.as_ty(to_ty)
                                     } else {
-                                        arg.as_ty(&format!("{} as {}", cx.tcx.mk_ptr(rty), to_ty))
+                                        arg.as_ty(cx.tcx.mk_ptr(rty)).as_ty(to_ty)
                                     };
 
                                     db.span_suggestion(e.span, "try", sugg.to_string());
diff --git a/clippy_lints/src/utils/sugg.rs b/clippy_lints/src/utils/sugg.rs
index 4a9543d47c1c..624c030cdd44 100644
--- a/clippy_lints/src/utils/sugg.rs
+++ b/clippy_lints/src/utils/sugg.rs
@@ -126,8 +126,8 @@ impl<'a> Sugg<'a> {
     }
 
     /// Convenience method to create the `<lhs> as <rhs>` suggestion.
-    pub fn as_ty(self, rhs: &str) -> Sugg<'static> {
-        make_assoc(AssocOp::As, &self, &Sugg::NonParen(rhs.into()))
+    pub fn as_ty<R: std::fmt::Display>(self, rhs: R) -> Sugg<'static> {
+        make_assoc(AssocOp::As, &self, &Sugg::NonParen(rhs.to_string().into()))
     }
 
     /// Convenience method to create the `&<expr>` suggestion.