Skip to content

Commit

Permalink
Auto merge of rust-lang#6771 - MortenLohne:master, r=flip1995
Browse files Browse the repository at this point in the history
Fix FP in inherent_to_string when the function has generic parameters

Minimal example of the false positive:
````
struct G;

impl G {
    fn to_string<const _N: usize>(&self) -> String {
        "G.to_string()".to_string()
    }
}

fn main() {
    let g = G;
    g.to_string::<1>();
}
````
Clippy emits an `inherent_to_string` warning, and suggests that we implement `Display` for `G` instead. However, this is not possible, since the generic parameter _N only exists in this function, not in `G` itself. This particular example uses const generics, which is where the issue is most likely to come up, but this PR skips the lint if the `to_string` function has any kind of generic parameters.

changelog: Fix FP in `inherent_to_string`
  • Loading branch information
bors committed Feb 21, 2021
2 parents 208e957 + 19a3775 commit 728f397
Show file tree
Hide file tree
Showing 3 changed files with 14 additions and 2 deletions.
1 change: 1 addition & 0 deletions clippy_lints/src/inherent_to_string.rs
Original file line number Diff line number Diff line change
Expand Up @@ -106,6 +106,7 @@ impl<'tcx> LateLintPass<'tcx> for InherentToString {
let decl = &signature.decl;
if decl.implicit_self.has_implicit_self();
if decl.inputs.len() == 1;
if impl_item.generics.params.is_empty();

// Check if return type is String
if is_type_diagnostic_item(cx, return_ty(cx, impl_item.hir_id), sym::string_type);
Expand Down
11 changes: 11 additions & 0 deletions tests/ui/inherent_to_string.rs
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@ struct C;
struct D;
struct E;
struct F;
struct G;

impl A {
// Should be detected; emit warning
Expand Down Expand Up @@ -73,6 +74,13 @@ impl F {
}
}

impl G {
// Should not be detected, as it does not match the function signature
fn to_string<const _N: usize>(&self) -> String {
"G.to_string()".to_string()
}
}

fn main() {
let a = A;
a.to_string();
Expand All @@ -93,4 +101,7 @@ fn main() {

let f = F;
f.to_string(1);

let g = G;
g.to_string::<1>();
}
4 changes: 2 additions & 2 deletions tests/ui/inherent_to_string.stderr
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
error: implementation of inherent method `to_string(&self) -> String` for type `A`
--> $DIR/inherent_to_string.rs:20:5
--> $DIR/inherent_to_string.rs:21:5
|
LL | / fn to_string(&self) -> String {
LL | | "A.to_string()".to_string()
Expand All @@ -10,7 +10,7 @@ LL | | }
= help: implement trait `Display` for type `A` instead

error: type `C` implements inherent method `to_string(&self) -> String` which shadows the implementation of `Display`
--> $DIR/inherent_to_string.rs:44:5
--> $DIR/inherent_to_string.rs:45:5
|
LL | / fn to_string(&self) -> String {
LL | | "C.to_string()".to_string()
Expand Down

0 comments on commit 728f397

Please sign in to comment.