Skip to content

Commit fd7ec8c

Browse files
EmilgardisEmilgardis
committed
implement disallowed trait methods
1 parent 76a75bf commit fd7ec8c

File tree

4 files changed

+94
-21
lines changed

4 files changed

+94
-21
lines changed

‎clippy_lints/src/disallowed_methods.rs

+62-6
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,12 @@
11
use clippy_config::types::DisallowedPath;
22
use clippy_utils::diagnostics::span_lint_and_then;
33
use clippy_utils::{fn_def_id, get_parent_expr, path_def_id};
4-
use rustc_hir::def_id::DefIdMap;
5-
use rustc_hir::{Expr, ExprKind};
4+
use itertools::Itertools as _;
5+
use rustc_hir::def::Res;
6+
use rustc_hir::def_id::{DefId, DefIdMap};
7+
use rustc_hir::{Expr, ExprKind, PrimTy};
68
use rustc_lint::{LateContext, LateLintPass};
9+
use rustc_middle::ty::{self, AdtKind};
710
use rustc_session::impl_lint_pass;
811

912
declare_clippy_lint! {
@@ -59,13 +62,16 @@ declare_clippy_lint! {
5962
pub struct DisallowedMethods {
6063
conf_disallowed: Vec<DisallowedPath>,
6164
disallowed: DefIdMap<usize>,
65+
// (Self, TraitMethod)
66+
disallowed_qualified_trait: rustc_data_structures::unord::UnordMap<(Res, DefId), usize>,
6267
}
6368

6469
impl DisallowedMethods {
6570
pub fn new(conf_disallowed: Vec<DisallowedPath>) -> Self {
6671
Self {
6772
conf_disallowed,
6873
disallowed: DefIdMap::default(),
74+
disallowed_qualified_trait: Default::default(),
6975
}
7076
}
7177
}
@@ -75,9 +81,31 @@ impl_lint_pass!(DisallowedMethods => [DISALLOWED_METHODS]);
7581
impl<'tcx> LateLintPass<'tcx> for DisallowedMethods {
7682
fn check_crate(&mut self, cx: &LateContext<'_>) {
7783
for (index, conf) in self.conf_disallowed.iter().enumerate() {
78-
let segs: Vec<_> = conf.path().split("::").collect();
79-
for id in clippy_utils::def_path_def_ids(cx, &segs) {
80-
self.disallowed.insert(id, index);
84+
let path = conf.path();
85+
if let Some(path) = path.strip_prefix('<') {
86+
// a qualified associated item
87+
let Some((tr, method)) = path.split_once(">::") else {
88+
continue;
89+
};
90+
let Some((self_ty, _as, trait_path)) = tr.split_whitespace().next_tuple() else {
91+
continue;
92+
};
93+
let self_segs: Vec<_> = self_ty.split("::").collect();
94+
let self_ress: Vec<_> = clippy_utils::def_path_res(cx, &self_segs);
95+
let mut method_segs: Vec<_> = trait_path.split("::").collect();
96+
method_segs.push(method);
97+
let method_id: Vec<_> = clippy_utils::def_path_def_ids(cx, &method_segs).collect();
98+
for self_res in &self_ress {
99+
for method_id in &method_id {
100+
self.disallowed_qualified_trait.insert((*self_res, *method_id), index);
101+
}
102+
}
103+
} else {
104+
// simple path
105+
let segs: Vec<_> = path.split("::").collect();
106+
for id in clippy_utils::def_path_def_ids(cx, &segs) {
107+
self.disallowed.insert(id, index);
108+
}
81109
}
82110
}
83111
}
@@ -96,7 +124,35 @@ impl<'tcx> LateLintPass<'tcx> for DisallowedMethods {
96124
};
97125
let conf = match self.disallowed.get(&def_id) {
98126
Some(&index) => &self.conf_disallowed[index],
99-
None => return,
127+
None => match expr.kind {
128+
ExprKind::MethodCall(_, self_arg, _, _) if !self.disallowed_qualified_trait.is_empty() => {
129+
let typeck = cx.typeck_results();
130+
let trait_method_def_id = typeck.type_dependent_def_id(expr.hir_id).unwrap();
131+
let self_ty = typeck.expr_ty(self_arg);
132+
let self_res: Res<rustc_hir::HirId> = match self_ty.kind() {
133+
ty::Bool | ty::Char | ty::Int(_) | ty::Uint(_) | ty::Float(_) => {
134+
Res::PrimTy(PrimTy::from_name(self_ty.primitive_symbol().unwrap()).unwrap())
135+
},
136+
ty::Str => Res::PrimTy(PrimTy::Str),
137+
ty::Adt(adt, _) => Res::Def(
138+
match adt.adt_kind() {
139+
AdtKind::Struct => rustc_hir::def::DefKind::Struct,
140+
AdtKind::Union => rustc_hir::def::DefKind::Union,
141+
AdtKind::Enum => rustc_hir::def::DefKind::Enum,
142+
},
143+
adt.did(),
144+
),
145+
// FIXME: these other kinds are not currently supported by disallowed_methods due to how
146+
// def_path_ref is implemented
147+
_ => return,
148+
};
149+
match self.disallowed_qualified_trait.get(&(self_res, trait_method_def_id)) {
150+
Some(&index) => &self.conf_disallowed[index],
151+
None => return,
152+
}
153+
},
154+
_ => return,
155+
},
100156
};
101157
let msg = format!("use of a disallowed method `{}`", conf.path());
102158
span_lint_and_then(cx, DISALLOWED_METHODS, expr.span, &msg, |diag| {

‎tests/ui-toml/toml_disallowed_methods/clippy.toml

+1
Original file line numberDiff line numberDiff line change
@@ -14,4 +14,5 @@ disallowed-methods = [
1414
"conf_disallowed_methods::Struct::method",
1515
"conf_disallowed_methods::Trait::provided_method",
1616
"conf_disallowed_methods::Trait::implemented_method",
17+
"<conf_disallowed_methods::StructBad as conf_disallowed_methods::Trait>::provided_bad_method",
1718
]

‎tests/ui-toml/toml_disallowed_methods/conf_disallowed_methods.rs

+10
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@ use regex::Regex;
1313
fn local_fn() {}
1414

1515
struct Struct;
16+
struct StructBad;
1617

1718
impl Struct {
1819
fn method(&self) {}
@@ -21,12 +22,17 @@ impl Struct {
2122
trait Trait {
2223
fn provided_method(&self) {}
2324
fn implemented_method(&self);
25+
fn provided_bad_method(&self) {}
2426
}
2527

2628
impl Trait for Struct {
2729
fn implemented_method(&self) {}
2830
}
2931

32+
impl Trait for StructBad {
33+
fn implemented_method(&self) {}
34+
}
35+
3036
mod local_mod {
3137
pub fn f() {}
3238
}
@@ -58,4 +64,8 @@ fn main() {
5864
s.method();
5965
s.provided_method();
6066
s.implemented_method();
67+
_ = String::default();
68+
s.provided_bad_method();
69+
let s_bad = StructBad;
70+
s_bad.provided_bad_method();
6171
}

‎tests/ui-toml/toml_disallowed_methods/conf_disallowed_methods.stderr

+21-15
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
error: use of a disallowed method `regex::Regex::new`
2-
--> $DIR/conf_disallowed_methods.rs:35:14
2+
--> $DIR/conf_disallowed_methods.rs:41:14
33
|
44
LL | let re = Regex::new(r"ab.*c").unwrap();
55
| ^^^^^^^^^^^^^^^^^^^^
@@ -8,84 +8,90 @@ LL | let re = Regex::new(r"ab.*c").unwrap();
88
= help: to override `-D warnings` add `#[allow(clippy::disallowed_methods)]`
99

1010
error: use of a disallowed method `regex::Regex::is_match`
11-
--> $DIR/conf_disallowed_methods.rs:36:5
11+
--> $DIR/conf_disallowed_methods.rs:42:5
1212
|
1313
LL | re.is_match("abc");
1414
| ^^^^^^^^^^^^^^^^^^
1515
|
1616
= note: no matching allowed (from clippy.toml)
1717

1818
error: use of a disallowed method `std::iter::Iterator::sum`
19-
--> $DIR/conf_disallowed_methods.rs:39:5
19+
--> $DIR/conf_disallowed_methods.rs:45:5
2020
|
2121
LL | a.iter().sum::<i32>();
2222
| ^^^^^^^^^^^^^^^^^^^^^
2323

2424
error: use of a disallowed method `slice::sort_unstable`
25-
--> $DIR/conf_disallowed_methods.rs:41:5
25+
--> $DIR/conf_disallowed_methods.rs:47:5
2626
|
2727
LL | a.sort_unstable();
2828
| ^^^^^^^^^^^^^^^^^
2929

3030
error: use of a disallowed method `f32::clamp`
31-
--> $DIR/conf_disallowed_methods.rs:43:13
31+
--> $DIR/conf_disallowed_methods.rs:49:13
3232
|
3333
LL | let _ = 2.0f32.clamp(3.0f32, 4.0f32);
3434
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^
3535

3636
error: use of a disallowed method `regex::Regex::new`
37-
--> $DIR/conf_disallowed_methods.rs:46:61
37+
--> $DIR/conf_disallowed_methods.rs:52:61
3838
|
3939
LL | let indirect: fn(&str) -> Result<Regex, regex::Error> = Regex::new;
4040
| ^^^^^^^^^^
4141

4242
error: use of a disallowed method `f32::clamp`
43-
--> $DIR/conf_disallowed_methods.rs:49:28
43+
--> $DIR/conf_disallowed_methods.rs:55:28
4444
|
4545
LL | let in_call = Box::new(f32::clamp);
4646
| ^^^^^^^^^^
4747

4848
error: use of a disallowed method `regex::Regex::new`
49-
--> $DIR/conf_disallowed_methods.rs:50:53
49+
--> $DIR/conf_disallowed_methods.rs:56:53
5050
|
5151
LL | let in_method_call = ["^", "$"].into_iter().map(Regex::new);
5252
| ^^^^^^^^^^
5353

5454
error: use of a disallowed method `futures::stream::select_all`
55-
--> $DIR/conf_disallowed_methods.rs:53:31
55+
--> $DIR/conf_disallowed_methods.rs:59:31
5656
|
5757
LL | let same_name_as_module = select_all(vec![empty::<()>()]);
5858
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
5959

6060
error: use of a disallowed method `conf_disallowed_methods::local_fn`
61-
--> $DIR/conf_disallowed_methods.rs:55:5
61+
--> $DIR/conf_disallowed_methods.rs:61:5
6262
|
6363
LL | local_fn();
6464
| ^^^^^^^^^^
6565

6666
error: use of a disallowed method `conf_disallowed_methods::local_mod::f`
67-
--> $DIR/conf_disallowed_methods.rs:56:5
67+
--> $DIR/conf_disallowed_methods.rs:62:5
6868
|
6969
LL | local_mod::f();
7070
| ^^^^^^^^^^^^^^
7171

7272
error: use of a disallowed method `conf_disallowed_methods::Struct::method`
73-
--> $DIR/conf_disallowed_methods.rs:58:5
73+
--> $DIR/conf_disallowed_methods.rs:64:5
7474
|
7575
LL | s.method();
7676
| ^^^^^^^^^^
7777

7878
error: use of a disallowed method `conf_disallowed_methods::Trait::provided_method`
79-
--> $DIR/conf_disallowed_methods.rs:59:5
79+
--> $DIR/conf_disallowed_methods.rs:65:5
8080
|
8181
LL | s.provided_method();
8282
| ^^^^^^^^^^^^^^^^^^^
8383

8484
error: use of a disallowed method `conf_disallowed_methods::Trait::implemented_method`
85-
--> $DIR/conf_disallowed_methods.rs:60:5
85+
--> $DIR/conf_disallowed_methods.rs:66:5
8686
|
8787
LL | s.implemented_method();
8888
| ^^^^^^^^^^^^^^^^^^^^^^
8989

90-
error: aborting due to 14 previous errors
90+
error: use of a disallowed method `<conf_disallowed_methods::StructBad as conf_disallowed_methods::Trait>::provided_bad_method`
91+
--> $DIR/conf_disallowed_methods.rs:70:5
92+
|
93+
LL | s_bad.provided_bad_method();
94+
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^
95+
96+
error: aborting due to 15 previous errors
9197

0 commit comments

Comments
 (0)