Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[let_with_type_underscore]: Don't emit on locals from procedural macros #10865

Merged
merged 3 commits into from
Jun 7, 2023
Merged
Show file tree
Hide file tree
Changes from 2 commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 13 additions & 2 deletions clippy_lints/src/let_with_type_underscore.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::source::snippet;
use rustc_hir::{Local, TyKind};
use rustc_lint::{LateContext, LateLintPass};
use rustc_middle::lint::in_external_macro;
Expand Down Expand Up @@ -32,11 +33,21 @@ impl LateLintPass<'_> for UnderscoreTyped {
if let TyKind::Infer = &ty.kind; // that type is '_'
if local.span.ctxt() == ty.span.ctxt();
then {
span_lint_and_help(cx,
let underscore_span = ty.span.with_lo(local.pat.span.hi());
let snippet = snippet(cx, underscore_span, ": _");

// NOTE: Using `is_from_proc_macro` on `init` will require that it's initialized,
// this doesn't. Alternatively, `WithSearchPat` can be implemented for `Ty`
if !snippet.trim().starts_with(':') && !snippet.trim().ends_with('_') {
Centri3 marked this conversation as resolved.
Show resolved Hide resolved
return;
}

span_lint_and_help(
cx,
LET_WITH_TYPE_UNDERSCORE,
local.span,
"variable declared with type underscore",
Some(ty.span.with_lo(local.pat.span.hi())),
Some(underscore_span),
"remove the explicit type `_` declaration"
)
}
Expand Down
25 changes: 24 additions & 1 deletion tests/ui/let_with_type_underscore.rs
Original file line number Diff line number Diff line change
@@ -1,19 +1,42 @@
//@aux-build: proc_macros.rs
#![allow(unused)]
#![warn(clippy::let_with_type_underscore)]
#![allow(clippy::let_unit_value)]
#![allow(clippy::let_unit_value, clippy::needless_late_init)]

extern crate proc_macros;

fn func() -> &'static str {
""
}

#[rustfmt::skip]
fn main() {
// Will lint
let x: _ = 1;
let _: _ = 2;
let x: _ = func();
let x: _;
x = ();

let x = 1; // Will not lint, Rust infers this to an integer before Clippy
let x = func();
let x: Vec<_> = Vec::<u32>::new();
let x: [_; 1] = [1];
let x : _ = 1;

// Do not lint from procedural macros
proc_macros::with_span! {
span
let x: _ = ();
// Late initialization
let x: _;
x = ();
// Ensure weird formatting will not break it (hopefully)
let x : _ = 1;
let x
: _ = 1;
let x :
_;
x = ();
};
}
38 changes: 31 additions & 7 deletions tests/ui/let_with_type_underscore.stderr
Original file line number Diff line number Diff line change
@@ -1,39 +1,63 @@
error: variable declared with type underscore
--> $DIR/let_with_type_underscore.rs:11:5
--> $DIR/let_with_type_underscore.rs:15:5
|
LL | let x: _ = 1;
| ^^^^^^^^^^^^^
|
help: remove the explicit type `_` declaration
--> $DIR/let_with_type_underscore.rs:11:10
--> $DIR/let_with_type_underscore.rs:15:10
|
LL | let x: _ = 1;
| ^^^
= note: `-D clippy::let-with-type-underscore` implied by `-D warnings`

error: variable declared with type underscore
--> $DIR/let_with_type_underscore.rs:12:5
--> $DIR/let_with_type_underscore.rs:16:5
|
LL | let _: _ = 2;
| ^^^^^^^^^^^^^
|
help: remove the explicit type `_` declaration
--> $DIR/let_with_type_underscore.rs:12:10
--> $DIR/let_with_type_underscore.rs:16:10
|
LL | let _: _ = 2;
| ^^^

error: variable declared with type underscore
--> $DIR/let_with_type_underscore.rs:13:5
--> $DIR/let_with_type_underscore.rs:17:5
|
LL | let x: _ = func();
| ^^^^^^^^^^^^^^^^^^
|
help: remove the explicit type `_` declaration
--> $DIR/let_with_type_underscore.rs:13:10
--> $DIR/let_with_type_underscore.rs:17:10
|
LL | let x: _ = func();
| ^^^

error: aborting due to 3 previous errors
error: variable declared with type underscore
--> $DIR/let_with_type_underscore.rs:18:5
|
LL | let x: _;
| ^^^^^^^^^
|
help: remove the explicit type `_` declaration
--> $DIR/let_with_type_underscore.rs:18:10
|
LL | let x: _;
| ^^^

error: variable declared with type underscore
--> $DIR/let_with_type_underscore.rs:25:5
|
LL | let x : _ = 1;
| ^^^^^^^^^^^^^^
|
help: remove the explicit type `_` declaration
--> $DIR/let_with_type_underscore.rs:25:10
|
LL | let x : _ = 1;
| ^^^^

error: aborting due to 5 previous errors