Auto merge of #7099 - ABouttefeux:master, r=llogiq

bors · bors · commit e441b33ba00d · 2021-04-16T21:22:24.000Z
add type in help message of from_over_into fixes #7088 changelog: add type in help message of from_over_into
diff --git a/clippy_lints/src/from_over_into.rs b/clippy_lints/src/from_over_into.rs
@@ -73,7 +73,7 @@ impl LateLintPass<'_> for FromOverInto {
                     cx.tcx.sess.source_map().guess_head_span(item.span),
                     "an implementation of `From` is preferred since it gives you `Into<_>` for free where the reverse isn't true",
                     None,
-                    "consider to implement `From` instead",
+                    &format!("consider to implement `From<{}>` instead", impl_trait_ref.self_ty()),
                 );
             }
         }
diff --git a/tests/ui/from_over_into.stderr b/tests/ui/from_over_into.stderr
@@ -5,7 +5,7 @@ LL | impl Into<StringWrapper> for String {
    | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
    |
    = note: `-D clippy::from-over-into` implied by `-D warnings`
-   = help: consider to implement `From` instead
+   = help: consider to implement `From<std::string::String>` instead
 
 error: aborting due to previous error
 

Original file line number	Diff line number	Diff line change
`@@ -73,7 +73,7 @@ impl LateLintPass<'_> for FromOverInto {`
`73`	`73`	`cx.tcx.sess.source_map().guess_head_span(item.span),`
`74`	`74`	"an implementation of `From` is preferred since it gives you `Into<_>` for free where the reverse isn't true",
`75`	`75`	`None,`
`76`		- "consider to implement `From` instead",
	`76`	+ &format!("consider to implement `From<{}>` instead", impl_trait_ref.self_ty()),
`77`	`77`	`);`
`78`	`78`	`}`
`79`	`79`	`}`
Original file line number	Diff line number	Diff line change
`@@ -5,7 +5,7 @@ LL \| impl Into<StringWrapper> for String {`
`5`	`5`	`\| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^`
`6`	`6`	`\|`
`7`	`7`	= note: `-D clippy::from-over-into` implied by `-D warnings`
`8`		- = help: consider to implement `From` instead
	`8`	+ = help: consider to implement `From<std::string::String>` instead
`9`	`9`
`10`	`10`	`error: aborting due to previous error`
`11`	`11`