Skip to content

Commit 6b4ab82

Browse files
ThibsGThibsG
committed
Global rework + fix imports
1 parent b2d9868 commit 6b4ab82

File tree

6 files changed

+89
-93
lines changed

6 files changed

+89
-93
lines changed

‎CHANGELOG.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1256,6 +1256,7 @@ Released 2018-09-13
12561256
[`expect_fun_call`]: https://rust-lang.github.io/rust-clippy/master/index.html#expect_fun_call
12571257
[`expl_impl_clone_on_copy`]: https://rust-lang.github.io/rust-clippy/master/index.html#expl_impl_clone_on_copy
12581258
[`explicit_counter_loop`]: https://rust-lang.github.io/rust-clippy/master/index.html#explicit_counter_loop
1259+
[`explicit_deref_method`]: https://rust-lang.github.io/rust-clippy/master/index.html#explicit_deref_method
12591260
[`explicit_into_iter_loop`]: https://rust-lang.github.io/rust-clippy/master/index.html#explicit_into_iter_loop
12601261
[`explicit_iter_loop`]: https://rust-lang.github.io/rust-clippy/master/index.html#explicit_iter_loop
12611262
[`explicit_write`]: https://rust-lang.github.io/rust-clippy/master/index.html#explicit_write

‎clippy_lints/src/dereference.rs

Lines changed: 33 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -1,47 +1,51 @@
1-
use crate::rustc::hir::{Expr, ExprKind, QPath};
2-
use crate::rustc::lint::{LateContext, LateLintPass, LintArray, LintPass};
3-
use crate::rustc::{declare_tool_lint, lint_array};
1+
use rustc_hir::{Expr, ExprKind, QPath};
2+
use rustc_errors::Applicability;
3+
use rustc_lint::{LateContext, LateLintPass};
4+
use rustc_session::{declare_tool_lint, declare_lint_pass};
45
use crate::utils::{in_macro, span_lint_and_sugg};
56
use if_chain::if_chain;
67

7-
/// **What it does:** Checks for explicit deref() or deref_mut() method calls.
8-
///
9-
/// **Why is this bad?** Derefencing by &*x or &mut *x is clearer and more concise,
10-
/// when not part of a method chain.
11-
///
12-
/// **Example:**
13-
/// ```rust
14-
/// let b = a.deref();
15-
/// let c = a.deref_mut();
16-
///
17-
/// // excludes
18-
/// let e = d.unwrap().deref();
19-
/// ```
208
declare_clippy_lint! {
9+
/// **What it does:** Checks for explicit `deref()` or `deref_mut()` method calls.
10+
///
11+
/// **Why is this bad?** Derefencing by `&*x` or `&mut *x` is clearer and more concise,
12+
/// when not part of a method chain.
13+
///
14+
/// **Example:**
15+
/// ```rust
16+
/// let b = a.deref();
17+
/// let c = a.deref_mut();
18+
/// ```
19+
/// Could be written as:
20+
/// ```rust
21+
/// let b = &*a;
22+
/// let c = &mut *a;
23+
/// ```
24+
///
25+
/// This lint excludes
26+
/// ```rust
27+
/// let e = d.unwrap().deref();
28+
/// ```
2129
pub EXPLICIT_DEREF_METHOD,
2230
pedantic,
2331
"Explicit use of deref or deref_mut method while not in a method chain."
2432
}
2533

26-
pub struct Pass;
34+
declare_lint_pass!(Dereferencing => [
35+
EXPLICIT_DEREF_METHOD
36+
]);
2737

28-
impl LintPass for Pass {
29-
fn get_lints(&self) -> LintArray {
30-
lint_array!(EXPLICIT_DEREF_METHOD)
31-
}
32-
}
33-
34-
impl<'a, 'tcx> LateLintPass<'a, 'tcx> for Pass {
35-
fn check_expr(&mut self, cx: &LateContext<'_, '_>, expr: &Expr) {
38+
impl<'a, 'tcx> LateLintPass<'a, 'tcx> for Dereferencing {
39+
fn check_expr(&mut self, cx: &LateContext<'a, 'tcx>, expr: &'tcx Expr<'_>) {
3640
if in_macro(expr.span) {
3741
return;
3842
}
3943

4044
if_chain! {
4145
// if this is a method call
42-
if let ExprKind::MethodCall(ref method_name, _, ref args) = &expr.node;
46+
if let ExprKind::MethodCall(ref method_name, _, ref args) = &expr.kind;
4347
// on a Path (i.e. a variable/name, not another method)
44-
if let ExprKind::Path(QPath::Resolved(None, path)) = &args[0].node;
48+
if let ExprKind::Path(QPath::Resolved(None, path)) = &args[0].kind;
4549
then {
4650
let name = method_name.ident.as_str();
4751
// alter help slightly to account for _mut
@@ -54,6 +58,7 @@ impl<'a, 'tcx> LateLintPass<'a, 'tcx> for Pass {
5458
"explicit deref method call",
5559
"try this",
5660
format!("&*{}", path),
61+
Applicability::MachineApplicable
5762
);
5863
},
5964
"deref_mut" => {
@@ -64,6 +69,7 @@ impl<'a, 'tcx> LateLintPass<'a, 'tcx> for Pass {
6469
"explicit deref_mut method call",
6570
"try this",
6671
format!("&mut *{}", path),
72+
Applicability::MachineApplicable
6773
);
6874
},
6975
_ => ()

‎clippy_lints/src/lib.rs

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -391,7 +391,7 @@ pub fn read_conf(args: &[rustc_ast::ast::NestedMetaItem], sess: &Session) -> Con
391391
}
392392

393393
conf
394-
}
394+
},
395395
Err((err, span)) => {
396396
sess.struct_span_err(span, err)
397397
.span_note(span, "Clippy will use default configuration")
@@ -513,7 +513,7 @@ pub fn register_plugins(store: &mut rustc_lint::LintStore, sess: &Session, conf:
513513
&copy_iterator::COPY_ITERATOR,
514514
&dbg_macro::DBG_MACRO,
515515
&default_trait_access::DEFAULT_TRAIT_ACCESS,
516-
&dereference::DEREF_METHOD_EXPLICIT,
516+
&dereference::EXPLICIT_DEREF_METHOD,
517517
&derive::DERIVE_HASH_XOR_EQ,
518518
&derive::EXPL_IMPL_CLONE_ON_COPY,
519519
&doc::DOC_MARKDOWN,
@@ -1040,7 +1040,7 @@ pub fn register_plugins(store: &mut rustc_lint::LintStore, sess: &Session, conf:
10401040
store.register_late_pass(|| box verbose_file_reads::VerboseFileReads);
10411041
store.register_late_pass(|| box redundant_pub_crate::RedundantPubCrate::default());
10421042
store.register_late_pass(|| box unnamed_address::UnnamedAddress);
1043-
store.register_late_pass(|| box dereference::DerefMethodExplicit);
1043+
store.register_late_pass(|| box dereference::Dereferencing);
10441044

10451045
store.register_group(true, "clippy::restriction", Some("clippy_restriction"), vec![
10461046
LintId::of(&arithmetic::FLOAT_ARITHMETIC),
@@ -1181,7 +1181,6 @@ pub fn register_plugins(store: &mut rustc_lint::LintStore, sess: &Session, conf:
11811181
LintId::of(&comparison_chain::COMPARISON_CHAIN),
11821182
LintId::of(&copies::IFS_SAME_COND),
11831183
LintId::of(&copies::IF_SAME_THEN_ELSE),
1184-
LintId::of(&dereference::EXPLICIT_DEREF_METHOD),
11851184
LintId::of(&derive::DERIVE_HASH_XOR_EQ),
11861185
LintId::of(&doc::MISSING_SAFETY_DOC),
11871186
LintId::of(&doc::NEEDLESS_DOCTEST_MAIN),

‎src/lintlist/mod.rs

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -528,6 +528,13 @@ pub static ref ALL_LINTS: Vec<Lint> = vec![
528528
deprecation: None,
529529
module: "loops",
530530
},
531+
Lint {
532+
name: "explicit_deref_method",
533+
group: "pedantic",
534+
desc: "Explicit use of deref or deref_mut method while not in a method chain.",
535+
deprecation: None,
536+
module: "dereference",
537+
},
531538
Lint {
532539
name: "explicit_into_iter_loop",
533540
group: "pedantic",

‎tests/ui/dereference.rs

Lines changed: 21 additions & 38 deletions
Original file line numberDiff line numberDiff line change
@@ -1,55 +1,38 @@
1-
#![feature(tool_lints)]
1+
#![allow(unused_variables, clippy::many_single_char_names, clippy::clone_double_ref)]
2+
#![warn(clippy::explicit_deref_method)]
23

34
use std::ops::{Deref, DerefMut};
45

5-
#[allow(clippy::many_single_char_names, clippy::clone_double_ref)]
6-
#[allow(unused_variables)]
7-
#[warn(clippy::explicit_deref_method)]
86
fn main() {
97
let a: &mut String = &mut String::from("foo");
108

119
// these should require linting
12-
{
13-
let b: &str = a.deref();
14-
}
10+
let b: &str = a.deref();
1511

16-
{
17-
let b: &mut str = a.deref_mut();
18-
}
12+
let b: &mut str = a.deref_mut();
1913

20-
{
21-
let b: String = a.deref().clone();
22-
}
23-
24-
{
25-
let b: usize = a.deref_mut().len();
26-
}
27-
28-
{
29-
let b: &usize = &a.deref().len();
30-
}
14+
let b: String = a.deref().clone();
3115

32-
{
33-
// only first deref should get linted here
34-
let b: &str = a.deref().deref();
35-
}
16+
let b: usize = a.deref_mut().len();
3617

37-
{
38-
// both derefs should get linted here
39-
let b: String = format!("{}, {}", a.deref(), a.deref());
40-
}
18+
let b: &usize = &a.deref().len();
19+
20+
// only first deref should get linted here
21+
let b: &str = a.deref().deref();
22+
23+
// both derefs should get linted here
24+
let b: String = format!("{}, {}", a.deref(), a.deref());
4125

4226
// these should not require linting
43-
{
44-
let b: &str = &*a;
45-
}
4627

47-
{
48-
let b: &mut str = &mut *a;
49-
}
28+
let b: &str = &*a;
29+
30+
let b: &mut str = &mut *a;
5031

51-
{
52-
macro_rules! expr_deref { ($body:expr) => { $body.deref() } }
53-
let b: &str = expr_deref!(a);
32+
macro_rules! expr_deref {
33+
($body:expr) => {
34+
$body.deref()
35+
};
5436
}
37+
let b: &str = expr_deref!(a);
5538
}

‎tests/ui/dereference.stderr

Lines changed: 24 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -1,52 +1,52 @@
11
error: explicit deref method call
2-
--> $DIR/dereference.rs:13:23
2+
--> $DIR/dereference.rs:10:19
33
|
4-
13 | let b: &str = a.deref();
5-
| ^^^^^^^^^ help: try this: `&*a`
4+
LL | let b: &str = a.deref();
5+
| ^^^^^^^^^ help: try this: `&*a`
66
|
77
= note: `-D clippy::explicit-deref-method` implied by `-D warnings`
88

99
error: explicit deref_mut method call
10-
--> $DIR/dereference.rs:17:27
10+
--> $DIR/dereference.rs:12:23
1111
|
12-
17 | let b: &mut str = a.deref_mut();
13-
| ^^^^^^^^^^^^^ help: try this: `&mut *a`
12+
LL | let b: &mut str = a.deref_mut();
13+
| ^^^^^^^^^^^^^ help: try this: `&mut *a`
1414

1515
error: explicit deref method call
16-
--> $DIR/dereference.rs:21:25
16+
--> $DIR/dereference.rs:14:21
1717
|
18-
21 | let b: String = a.deref().clone();
19-
| ^^^^^^^^^ help: try this: `&*a`
18+
LL | let b: String = a.deref().clone();
19+
| ^^^^^^^^^ help: try this: `&*a`
2020

2121
error: explicit deref_mut method call
22-
--> $DIR/dereference.rs:25:24
22+
--> $DIR/dereference.rs:16:20
2323
|
24-
25 | let b: usize = a.deref_mut().len();
25-
| ^^^^^^^^^^^^^ help: try this: `&mut *a`
24+
LL | let b: usize = a.deref_mut().len();
25+
| ^^^^^^^^^^^^^ help: try this: `&mut *a`
2626

2727
error: explicit deref method call
28-
--> $DIR/dereference.rs:29:26
28+
--> $DIR/dereference.rs:18:22
2929
|
30-
29 | let b: &usize = &a.deref().len();
31-
| ^^^^^^^^^ help: try this: `&*a`
30+
LL | let b: &usize = &a.deref().len();
31+
| ^^^^^^^^^ help: try this: `&*a`
3232

3333
error: explicit deref method call
34-
--> $DIR/dereference.rs:34:23
34+
--> $DIR/dereference.rs:21:19
3535
|
36-
34 | let b: &str = a.deref().deref();
37-
| ^^^^^^^^^ help: try this: `&*a`
36+
LL | let b: &str = a.deref().deref();
37+
| ^^^^^^^^^ help: try this: `&*a`
3838

3939
error: explicit deref method call
40-
--> $DIR/dereference.rs:39:43
40+
--> $DIR/dereference.rs:24:39
4141
|
42-
39 | let b: String = format!("{}, {}", a.deref(), a.deref());
43-
| ^^^^^^^^^ help: try this: `&*a`
42+
LL | let b: String = format!("{}, {}", a.deref(), a.deref());
43+
| ^^^^^^^^^ help: try this: `&*a`
4444

4545
error: explicit deref method call
46-
--> $DIR/dereference.rs:39:54
46+
--> $DIR/dereference.rs:24:50
4747
|
48-
39 | let b: String = format!("{}, {}", a.deref(), a.deref());
49-
| ^^^^^^^^^ help: try this: `&*a`
48+
LL | let b: String = format!("{}, {}", a.deref(), a.deref());
49+
| ^^^^^^^^^ help: try this: `&*a`
5050

5151
error: aborting due to 8 previous errors
5252

0 commit comments

Comments
 (0)