rust-lang/rust
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Unnecessary -> Unused

Browse Source
This commit is contained in:
Jackson Lewis
2021-05-14 17:07:30 -07:00
parent c6e0e843d2
commit 1d8f3b51e6
4 changed files with 13 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
clippy_lints/src/lib.rs
View File

@@ -360,7 +360,7 @@ mod unnamed_address;
mod unnecessary_self_imports; mod unnecessary_self_imports;
mod unnecessary_sort_by; mod unnecessary_sort_by;
mod unnecessary_wraps; mod unnecessary_wraps;
mod unnecessary_async; mod unused_async;
mod unnested_or_patterns; mod unnested_or_patterns;
mod unsafe_removed_from_name; mod unsafe_removed_from_name;
mod unused_io_amount; mod unused_io_amount;
@@ -955,7 +955,7 @@ pub fn register_plugins(store: &mut rustc_lint::LintStore, sess: &Session, conf:
unit_types::UNIT_CMP, unit_types::UNIT_CMP,
unnamed_address::FN_ADDRESS_COMPARISONS, unnamed_address::FN_ADDRESS_COMPARISONS,
unnamed_address::VTABLE_ADDRESS_COMPARISONS, unnamed_address::VTABLE_ADDRESS_COMPARISONS,
unnecessary_async::UNNECESSARY_ASYNC, unused_async::UNUSED_ASYNC,
unnecessary_self_imports::UNNECESSARY_SELF_IMPORTS, unnecessary_self_imports::UNNECESSARY_SELF_IMPORTS,
unnecessary_sort_by::UNNECESSARY_SORT_BY, unnecessary_sort_by::UNNECESSARY_SORT_BY,
unnecessary_wraps::UNNECESSARY_WRAPS, unnecessary_wraps::UNNECESSARY_WRAPS,
@@ -1273,7 +1273,7 @@ pub fn register_plugins(store: &mut rustc_lint::LintStore, sess: &Session, conf:
store.register_late_pass(|| box manual_map::ManualMap); store.register_late_pass(|| box manual_map::ManualMap);
store.register_late_pass(move || box if_then_some_else_none::IfThenSomeElseNone::new(msrv)); store.register_late_pass(move || box if_then_some_else_none::IfThenSomeElseNone::new(msrv));
store.register_early_pass(|| box bool_assert_comparison::BoolAssertComparison); store.register_early_pass(|| box bool_assert_comparison::BoolAssertComparison);
store.register_late_pass(|| box unnecessary_async::UnnecessaryAsync); store.register_late_pass(|| box unused_async::UnusedAsync);
store.register_group(true, "clippy::restriction", Some("clippy_restriction"), vec![ store.register_group(true, "clippy::restriction", Some("clippy_restriction"), vec![
LintId::of(arithmetic::FLOAT_ARITHMETIC), LintId::of(arithmetic::FLOAT_ARITHMETIC),
@@ -1415,7 +1415,7 @@ pub fn register_plugins(store: &mut rustc_lint::LintStore, sess: &Session, conf:
LintId::of(unicode::NON_ASCII_LITERAL), LintId::of(unicode::NON_ASCII_LITERAL),
LintId::of(unicode::UNICODE_NOT_NFC), LintId::of(unicode::UNICODE_NOT_NFC),
LintId::of(unit_types::LET_UNIT_VALUE), LintId::of(unit_types::LET_UNIT_VALUE),
LintId::of(unnecessary_async::UNNECESSARY_ASYNC), LintId::of(unused_async::UNUSED_ASYNC),
LintId::of(unnecessary_wraps::UNNECESSARY_WRAPS), LintId::of(unnecessary_wraps::UNNECESSARY_WRAPS),
LintId::of(unnested_or_patterns::UNNESTED_OR_PATTERNS), LintId::of(unnested_or_patterns::UNNESTED_OR_PATTERNS),
LintId::of(unused_self::UNUSED_SELF), LintId::of(unused_self::UNUSED_SELF),

10
clippy_lints/src/unnecessary_async.rs → clippy_lints/src/unused_async.rs
View File

@@ -30,12 +30,12 @@ declare_clippy_lint! {
/// } /// }
/// let number_future = async { get_random_number_improved() }; /// let number_future = async { get_random_number_improved() };
/// ``` /// ```
pub UNNECESSARY_ASYNC, pub UNUSED_ASYNC,
pedantic, pedantic,
"finds async functions with no await statements" "finds async functions with no await statements"
} }
declare_lint_pass!(UnnecessaryAsync => [UNNECESSARY_ASYNC]); declare_lint_pass!(UnusedAsync => [UNUSED_ASYNC]);
struct AsyncFnVisitor<'a, 'tcx> { struct AsyncFnVisitor<'a, 'tcx> {
cx: &'a LateContext<'tcx>, cx: &'a LateContext<'tcx>,
@@ -57,7 +57,7 @@ impl<'a, 'tcx> Visitor<'tcx> for AsyncFnVisitor<'a, 'tcx> {
} }
} }
impl<'tcx> LateLintPass<'tcx> for UnnecessaryAsync { impl<'tcx> LateLintPass<'tcx> for UnusedAsync {
fn check_item(&mut self, _: &LateContext<'tcx>, item: &'tcx Item<'tcx>) { fn check_item(&mut self, _: &LateContext<'tcx>, item: &'tcx Item<'tcx>) {
if let ItemKind::Trait(..) = item.kind { if let ItemKind::Trait(..) = item.kind {
return; return;
@@ -79,9 +79,9 @@ impl<'tcx> LateLintPass<'tcx> for UnnecessaryAsync {
if !visitor.found_await { if !visitor.found_await {
span_lint_and_help( span_lint_and_help(
cx, cx,
UNNECESSARY_ASYNC, UNUSED_ASYNC,
span, span,
"unnecessary `async` for function with no await statements", "unused `async` for function with no await statements",
None, None,
"consider removing the `async` from this function", "consider removing the `async` from this function",
); );

2
tests/ui/unnecessary_async.rs → tests/ui/unused_async.rs
View File

@@ -1,5 +1,5 @@
// edition:2018 // edition:2018
#![warn(clippy::unnecessary_async)] #![warn(clippy::unused_async)]
async fn foo() -> i32 { async fn foo() -> i32 {
4 4

6
tests/ui/unnecessary_async.stderr → tests/ui/unused_async.stderr
View File

@@ -1,12 +1,12 @@
error: unnecessary `async` for function with no await statements error: unused `async` for function with no await statements
--> $DIR/unnecessary_async.rs:4:1 --> $DIR/unused_async.rs:4:1
| |
LL | / async fn foo() -> i32 { LL | / async fn foo() -> i32 {
LL | | 4 LL | | 4
LL | | } LL | | }
| |_^ | |_^
| |
= note: `-D clippy::unnecessary-async` implied by `-D warnings` = note: `-D clippy::unused-async` implied by `-D warnings`
= help: consider removing the `async` from this function = help: consider removing the `async` from this function
error: aborting due to previous error error: aborting due to previous error