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.

Sign up for GitHub

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

Remove extern crate clippy_lints from tests #4784

Merged
merged 2 commits into from
Nov 7, 2019
Merged

Remove extern crate clippy_lints from tests #4784

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
fe90b82
Remove clippy_lints from useless attribute test
Manishearth Nov 6, 2019
4721f44
Remove clippy dependency in lint_without_lint_pass
Manishearth Nov 7, 2019
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
2 changes: 1 addition & 1 deletion tests/ui/auxiliary/proc_macro_derive.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ pub fn derive(_: TokenStream) -> TokenStream {
let output = quote! {
// Should not trigger `useless_attribute`
#[allow(dead_code)]
extern crate clippy_lints;
extern crate rustc;
};
output
}
30 changes: 15 additions & 15 deletions tests/ui/lint_without_lint_pass.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,25 +5,25 @@
extern crate rustc;
use rustc::lint::{LintArray, LintPass};

#[macro_use]
extern crate clippy_lints;

declare_clippy_lint! {
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Instead of removing this test, we can change this to the declare_lint macro from rustc. The intend of this test would persist.

pub TEST_LINT,
correctness,
""
declare_tool_lint! {
pub clippy::TEST_LINT,
Warn,
"",
report_in_external_macro: true
}

declare_clippy_lint! {
pub TEST_LINT_REGISTERED,
correctness,
""
declare_tool_lint! {
pub clippy::TEST_LINT_REGISTERED,
Warn,
"",
report_in_external_macro: true
}

declare_clippy_lint! {
pub TEST_LINT_REGISTERED_ONLY_IMPL,
correctness,
""
declare_tool_lint! {
pub clippy::TEST_LINT_REGISTERED_ONLY_IMPL,
Warn,
"",
report_in_external_macro: true
}

pub struct Pass;
Expand Down
11 changes: 6 additions & 5 deletions tests/ui/lint_without_lint_pass.stderr
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,10 +1,11 @@
error: the lint `TEST_LINT` is not added to any `LintPass`
--> $DIR/lint_without_lint_pass.rs:11:1
--> $DIR/lint_without_lint_pass.rs:8:1
|
LL | / declare_clippy_lint! {
LL | | pub TEST_LINT,
LL | | correctness,
LL | | ""
LL | / declare_tool_lint! {
LL | | pub clippy::TEST_LINT,
LL | | Warn,
LL | | "",
LL | | report_in_external_macro: true
LL | | }
| |_^
|
Expand Down
1 change: 1 addition & 0 deletions tests/ui/used_underscore_binding.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
// aux-build:proc_macro_derive.rs

#![feature(rustc_private)]
#![warn(clippy::all)]
#![allow(clippy::blacklisted_name)]
#![warn(clippy::used_underscore_binding)]
Expand Down
10 changes: 5 additions & 5 deletions tests/ui/used_underscore_binding.stderr
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,31 +1,31 @@
error: used binding `_foo` which is prefixed with an underscore. A leading underscore signals that a binding will not be used.
--> $DIR/used_underscore_binding.rs:24:5
--> $DIR/used_underscore_binding.rs:25:5
|
LL | _foo + 1
| ^^^^
|
= note: `-D clippy::used-underscore-binding` implied by `-D warnings`

error: used binding `_foo` which is prefixed with an underscore. A leading underscore signals that a binding will not be used.
--> $DIR/used_underscore_binding.rs:29:20
--> $DIR/used_underscore_binding.rs:30:20
|
LL | println!("{}", _foo);
| ^^^^

error: used binding `_foo` which is prefixed with an underscore. A leading underscore signals that a binding will not be used.
--> $DIR/used_underscore_binding.rs:30:16
--> $DIR/used_underscore_binding.rs:31:16
|
LL | assert_eq!(_foo, _foo);
| ^^^^

error: used binding `_foo` which is prefixed with an underscore. A leading underscore signals that a binding will not be used.
--> $DIR/used_underscore_binding.rs:30:22
--> $DIR/used_underscore_binding.rs:31:22
|
LL | assert_eq!(_foo, _foo);
| ^^^^

error: used binding `_underscore_field` which is prefixed with an underscore. A leading underscore signals that a binding will not be used.
--> $DIR/used_underscore_binding.rs:43:5
--> $DIR/used_underscore_binding.rs:44:5
|
LL | s._underscore_field += 1;
| ^^^^^^^^^^^^^^^^^^^
Expand Down
5 changes: 2 additions & 3 deletions tests/ui/useless_attribute.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,16 +2,15 @@

#![warn(clippy::useless_attribute)]
#![warn(unreachable_pub)]
#![feature(rustc_private)]

#[allow(dead_code)]
#[cfg_attr(feature = "cargo-clippy", allow(dead_code))]
#[rustfmt::skip]
#[cfg_attr(feature = "cargo-clippy",
allow(dead_code))]
#[allow(unused_imports)]
#[allow(unused_extern_crates)]
#[macro_use]
extern crate clippy_lints;
extern crate rustc;

#[macro_use]
extern crate proc_macro_derive;
Expand Down
4 changes: 2 additions & 2 deletions tests/ui/useless_attribute.stderr
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
error: useless lint attribute
--> $DIR/useless_attribute.rs:6:1
--> $DIR/useless_attribute.rs:7:1
|
LL | #[allow(dead_code)]
| ^^^^^^^^^^^^^^^^^^^ help: if you just forgot a `!`, use: `#![allow(dead_code)]`
|
= note: `-D clippy::useless-attribute` implied by `-D warnings`

error: useless lint attribute
--> $DIR/useless_attribute.rs:7:1
--> $DIR/useless_attribute.rs:8:1
|
LL | #[cfg_attr(feature = "cargo-clippy", allow(dead_code))]
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ help: if you just forgot a `!`, use: `#![cfg_attr(feature = "cargo-clippy", allow(dead_code)`
Expand Down