From 6b4cae18dde124dda30e53ade20b8d43315a6dc6 Mon Sep 17 00:00:00 2001 From: Krishna Sai Veera Reddy Date: Mon, 10 Feb 2020 19:24:01 -0800 Subject: [PATCH 1/3] Remove unnecessary imports from `new_lint` tool --- clippy_dev/src/new_lint.rs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/clippy_dev/src/new_lint.rs b/clippy_dev/src/new_lint.rs index 9d1f19f954b0..1149015cfb37 100644 --- a/clippy_dev/src/new_lint.rs +++ b/clippy_dev/src/new_lint.rs @@ -117,7 +117,7 @@ fn get_lint_file_contents( context_import: &str, ) -> String { format!( - "use rustc_lint::{{LintArray, LintPass, {type}, {context_import}}}; + "use rustc_lint::{{{type}, {context_import}}}; use rustc_session::{{declare_lint_pass, declare_tool_lint}}; {pass_import} From 1e117938cf12e59eaac89482e611ee4d95e2a953 Mon Sep 17 00:00:00 2001 From: Krishna Sai Veera Reddy Date: Mon, 10 Feb 2020 19:37:25 -0800 Subject: [PATCH 2/3] Remove unnecessary imports from documentation --- CONTRIBUTING.md | 2 +- doc/adding_lints.md | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 4a828051185f..68eb64c94b6d 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -110,7 +110,7 @@ It's worth noting that the majority of `clippy_lints/src/lib.rs` is autogenerate ```rust // ./clippy_lints/src/else_if_without_else.rs -use rustc::lint::{EarlyLintPass, LintArray, LintPass}; +use rustc_lint::{EarlyLintPass, EarlyContext}; // ... diff --git a/doc/adding_lints.md b/doc/adding_lints.md index 99178c2d75b9..e1f4ce016c5c 100644 --- a/doc/adding_lints.md +++ b/doc/adding_lints.md @@ -138,7 +138,7 @@ at `clippy_lints/src/foo_functions.rs`. That's the crate where all the lint code is. This file has already imported some initial things we will need: ```rust -use rustc::lint::{LintArray, LintPass, EarlyLintPass, EarlyContext}; +use rustc_lint::{EarlyLintPass, EarlyContext}; use rustc_session::{declare_lint_pass, declare_tool_lint}; use syntax::ast::*; ``` From fcc3e7238fc303881d7e3f06f423a0b105318bf0 Mon Sep 17 00:00:00 2001 From: Krishna Sai Veera Reddy Date: Tue, 11 Feb 2020 06:20:47 -0800 Subject: [PATCH 3/3] Remove unnecessary imports from tests --- tests/ui/default_lint.rs | 1 - tests/ui/default_lint.stderr | 2 +- tests/ui/lint_without_lint_pass.rs | 2 +- 3 files changed, 2 insertions(+), 3 deletions(-) diff --git a/tests/ui/default_lint.rs b/tests/ui/default_lint.rs index 988a7b866dea..0c6f29a43c6d 100644 --- a/tests/ui/default_lint.rs +++ b/tests/ui/default_lint.rs @@ -6,7 +6,6 @@ extern crate rustc; #[macro_use] extern crate rustc_session; extern crate rustc_lint; -use rustc_lint::{LintArray, LintPass}; declare_tool_lint! { pub clippy::TEST_LINT, diff --git a/tests/ui/default_lint.stderr b/tests/ui/default_lint.stderr index fc76dec82223..5c5836a7d297 100644 --- a/tests/ui/default_lint.stderr +++ b/tests/ui/default_lint.stderr @@ -1,5 +1,5 @@ error: the lint `TEST_LINT_DEFAULT` has the default lint description - --> $DIR/default_lint.rs:18:1 + --> $DIR/default_lint.rs:17:1 | LL | / declare_tool_lint! { LL | | pub clippy::TEST_LINT_DEFAULT, diff --git a/tests/ui/lint_without_lint_pass.rs b/tests/ui/lint_without_lint_pass.rs index 5b0b4d12d134..8eb1f7b64610 100644 --- a/tests/ui/lint_without_lint_pass.rs +++ b/tests/ui/lint_without_lint_pass.rs @@ -6,7 +6,7 @@ extern crate rustc; #[macro_use] extern crate rustc_session; extern crate rustc_lint; -use rustc_lint::{LintArray, LintPass}; +use rustc_lint::LintPass; declare_tool_lint! { pub clippy::TEST_LINT,