Skip to content

Commit

Permalink
Auto merge of rust-lang#10865 - Centri3:let_with_type_underscore_trac…
Browse files Browse the repository at this point in the history
…ing, r=Jarcho

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

closes rust-lang#10498

changelog: [`let_with_type_underscore`]: Don't emit on locals from procedural macros
  • Loading branch information
bors authored and MabezDev committed Jul 13, 2023
1 parent 1c4dd9c commit c1d5c53
Show file tree
Hide file tree
Showing 3 changed files with 65 additions and 10 deletions.
12 changes: 10 additions & 2 deletions src/tools/clippy/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 All @@ -25,14 +26,21 @@ declare_clippy_lint! {
declare_lint_pass!(UnderscoreTyped => [LET_WITH_TYPE_UNDERSCORE]);

impl LateLintPass<'_> for UnderscoreTyped {
fn check_local<'tcx>(&mut self, cx: &LateContext<'tcx>, local: &'tcx Local<'tcx>) {
fn check_local(&mut self, cx: &LateContext<'_>, local: &Local<'_>) {
if_chain! {
if !in_external_macro(cx.tcx.sess, local.span);
if let Some(ty) = local.ty; // Ensure that it has a type defined
if let TyKind::Infer = &ty.kind; // that type is '_'
if local.span.ctxt() == ty.span.ctxt();
then {
span_lint_and_help(cx,
// 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(cx, ty.span, "_").trim() != "_" {
return;
}

span_lint_and_help(
cx,
LET_WITH_TYPE_UNDERSCORE,
local.span,
"variable declared with type underscore",
Expand Down
25 changes: 24 additions & 1 deletion src/tools/clippy/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 src/tools/clippy/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

0 comments on commit c1d5c53

Please sign in to comment.