From 1bdac8712868e1418dcb13e817254620a8c01158 Mon Sep 17 00:00:00 2001
From: Hirochika Matsumoto <matsujika@gmail.com>
Date: Mon, 12 Oct 2020 19:27:47 +0900
Subject: [PATCH] Improve lint message

---
 clippy_lints/src/unnecessary_wrap.rs | 2 +-
 tests/ui/unnecessary_wrap.stderr     | 8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/clippy_lints/src/unnecessary_wrap.rs b/clippy_lints/src/unnecessary_wrap.rs
index 28762b8d265..db51ee681ef 100644
--- a/clippy_lints/src/unnecessary_wrap.rs
+++ b/clippy_lints/src/unnecessary_wrap.rs
@@ -100,7 +100,7 @@ impl<'tcx> LateLintPass<'tcx> for UnnecessaryWrap {
                 cx,
                 UNNECESSARY_WRAP,
                 span,
-                format!("this function's return value is unnecessarily wrapped by `{}`, return_type)",
+                format!("this function's return value is unnecessarily wrapped by `{}`", return_type).as_str(),
                 |diag| {
                     let inner_ty = return_ty(cx, hir_id)
                         .walk()
diff --git a/tests/ui/unnecessary_wrap.stderr b/tests/ui/unnecessary_wrap.stderr
index a3481330e99..958bc998022 100644
--- a/tests/ui/unnecessary_wrap.stderr
+++ b/tests/ui/unnecessary_wrap.stderr
@@ -1,4 +1,4 @@
-error: this function returns unnecessarily wrapping data
+error: this function's return value is unnecessarily wrapped by `Option`
   --> $DIR/unnecessary_wrap.rs:8:1
    |
 LL | / fn func1(a: bool, b: bool) -> Option<i32> {
@@ -25,7 +25,7 @@ LL |         2
 LL |     } else {
  ...
 
-error: this function returns unnecessarily wrapping data
+error: this function's return value is unnecessarily wrapped by `Option`
   --> $DIR/unnecessary_wrap.rs:21:1
    |
 LL | / fn func2(a: bool, b: bool) -> Option<i32> {
@@ -51,7 +51,7 @@ LL |     } else {
 LL |         30
    |
 
-error: this function returns unnecessarily wrapping data
+error: this function's return value is unnecessarily wrapped by `Option`
   --> $DIR/unnecessary_wrap.rs:51:1
    |
 LL | / fn func5() -> Option<i32> {
@@ -68,7 +68,7 @@ help: ...and change the returning expressions
 LL |     1
    |
 
-error: this function returns unnecessarily wrapping data
+error: this function's return value is unnecessarily wrapped by `Result`
   --> $DIR/unnecessary_wrap.rs:61:1
    |
 LL | / fn func7() -> Result<i32, ()> {