Skip to content

Commit

Permalink
Auto merge of rust-lang#12264 - y21:issue12263, r=Jarcho
Browse files Browse the repository at this point in the history
[`to_string_trait_impl`]: avoid linting if the impl is a specialization

Fixes rust-lang#12263

Oh well... rust-lang#12122 (comment) 🙃

changelog: [`to_string_trait_impl`]: avoid linting if the impl is a specialization
  • Loading branch information
bors committed Feb 10, 2024
2 parents e67b7e0 + b3b9919 commit 51c89a4
Show file tree
Hide file tree
Showing 3 changed files with 61 additions and 2 deletions.
3 changes: 3 additions & 0 deletions clippy_lints/src/to_string_trait_impl.rs
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
use clippy_utils::diagnostics::span_lint_and_help;
use clippy_utils::ty::implements_trait;
use rustc_hir::{Impl, Item, ItemKind};
use rustc_lint::{LateContext, LateLintPass};
use rustc_session::declare_lint_pass;
Expand Down Expand Up @@ -53,6 +54,8 @@ impl<'tcx> LateLintPass<'tcx> for ToStringTraitImpl {
}) = it.kind
&& let Some(trait_did) = trait_ref.trait_def_id()
&& cx.tcx.is_diagnostic_item(sym::ToString, trait_did)
&& let Some(display_did) = cx.tcx.get_diagnostic_item(sym::Display)
&& !implements_trait(cx, cx.tcx.type_of(it.owner_id).instantiate_identity(), display_did, &[])
{
span_lint_and_help(
cx,
Expand Down
44 changes: 44 additions & 0 deletions tests/ui/to_string_trait_impl.rs
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
#![warn(clippy::to_string_trait_impl)]
#![feature(min_specialization)]

use std::fmt::{self, Display};

Expand Down Expand Up @@ -29,3 +30,46 @@ impl Bar {
String::from("Bar")
}
}

mod issue12263 {
pub struct MyStringWrapper<'a>(&'a str);

impl std::fmt::Display for MyStringWrapper<'_> {
fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
self.0.fmt(f)
}
}

impl ToString for MyStringWrapper<'_> {
fn to_string(&self) -> String {
self.0.to_string()
}
}

pub struct S<T>(T);
impl std::fmt::Display for S<String> {
fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
todo!()
}
}
// no specialization if the generics differ, so lint
impl ToString for S<i32> {
fn to_string(&self) -> String {
todo!()
}
}

pub struct S2<T>(T);
impl std::fmt::Display for S2<String> {
fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
todo!()
}
}

// also specialization if the generics don't differ
impl ToString for S2<String> {
fn to_string(&self) -> String {
todo!()
}
}
}
16 changes: 14 additions & 2 deletions tests/ui/to_string_trait_impl.stderr
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
error: direct implementation of `ToString`
--> $DIR/to_string_trait_impl.rs:10:1
--> $DIR/to_string_trait_impl.rs:11:1
|
LL | / impl ToString for Point {
LL | | fn to_string(&self) -> String {
Expand All @@ -12,5 +12,17 @@ LL | | }
= note: `-D clippy::to-string-trait-impl` implied by `-D warnings`
= help: to override `-D warnings` add `#[allow(clippy::to_string_trait_impl)]`

error: aborting due to 1 previous error
error: direct implementation of `ToString`
--> $DIR/to_string_trait_impl.rs:56:5
|
LL | / impl ToString for S<i32> {
LL | | fn to_string(&self) -> String {
LL | | todo!()
LL | | }
LL | | }
| |_____^
|
= help: prefer implementing `Display` instead

error: aborting due to 2 previous errors

0 comments on commit 51c89a4

Please sign in to comment.