From 1b5d723e93d29d88b8b9743571fa1d3335423808 Mon Sep 17 00:00:00 2001 From: Justin Ridgewell Date: Wed, 16 Aug 2023 12:29:28 -0400 Subject: [PATCH 1/5] Update rust toolchain --- rust-toolchain | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/rust-toolchain b/rust-toolchain index cf53f1cbd52279..cd9bf832ae2a4e 100644 --- a/rust-toolchain +++ b/rust-toolchain @@ -1 +1 @@ -nightly-2023-07-03 \ No newline at end of file +nightly-2023-07-21 From 45a5c4f29a3955a0ffff03f588c83543a6379682 Mon Sep 17 00:00:00 2001 From: Justin Ridgewell Date: Wed, 16 Aug 2023 14:43:43 -0400 Subject: [PATCH 2/5] Allow buggy clippy lint --- crates/turborepo-lib/src/lib.rs | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/crates/turborepo-lib/src/lib.rs b/crates/turborepo-lib/src/lib.rs index 9de7fbf0a81cda..f63ec03e6d0be6 100644 --- a/crates/turborepo-lib/src/lib.rs +++ b/crates/turborepo-lib/src/lib.rs @@ -2,8 +2,10 @@ #![feature(box_patterns)] #![feature(error_generic_member_access)] #![feature(provide_any)] -#![deny(clippy::all)] #![feature(option_get_or_insert_default)] +#![deny(clippy::all)] +// Clippy's needless mut lint is buggy: https://github.com/rust-lang/rust-clippy/issues/11299 +#![allow(clippy::needless_pass_by_ref_mut)] mod child; mod cli; From 073ccff2d751971aeab217291ecc7b847bae85ea Mon Sep 17 00:00:00 2001 From: Justin Ridgewell Date: Wed, 16 Aug 2023 15:07:59 -0400 Subject: [PATCH 3/5] Clippy is dumb --- crates/turbo-tasks/src/lib.rs | 2 ++ crates/turbopack-dev/src/ecmascript/optimize.rs | 2 ++ 2 files changed, 4 insertions(+) diff --git a/crates/turbo-tasks/src/lib.rs b/crates/turbo-tasks/src/lib.rs index 072f6192e745bf..5c85af773f08e1 100644 --- a/crates/turbo-tasks/src/lib.rs +++ b/crates/turbo-tasks/src/lib.rs @@ -35,6 +35,8 @@ #![feature(async_fn_in_trait)] #![feature(type_alias_impl_trait)] #![feature(never_type)] +// Clippy's partial_eq lint doesn't like delegation: https://github.com/rust-lang/rust-clippy/issues/11178 +#![allow(clippy::incorrect_partial_ord_impl_on_ord_type)] pub mod backend; mod collectibles; diff --git a/crates/turbopack-dev/src/ecmascript/optimize.rs b/crates/turbopack-dev/src/ecmascript/optimize.rs index 060a5a5fcf0b4e..2816904265ab6a 100644 --- a/crates/turbopack-dev/src/ecmascript/optimize.rs +++ b/crates/turbopack-dev/src/ecmascript/optimize.rs @@ -137,6 +137,8 @@ async fn merge_duplicated_and_contained( } impl Eq for FloatOrd {} + // Clippy's partial_eq lint doesn't like delegation: https://github.com/rust-lang/rust-clippy/issues/11178 + #[allow(clippy::incorrect_partial_ord_impl_on_ord_type)] impl PartialOrd for FloatOrd { fn partial_cmp(&self, other: &Self) -> Option { self.0.partial_cmp(&other.0) From 7a4092d28c929c508dbab3dabf750db03239a60d Mon Sep 17 00:00:00 2001 From: Justin Ridgewell Date: Wed, 16 Aug 2023 15:19:06 -0400 Subject: [PATCH 4/5] No, Clippy, you're wrong. --- crates/turbo-tasks-memory/src/lib.rs | 2 ++ 1 file changed, 2 insertions(+) diff --git a/crates/turbo-tasks-memory/src/lib.rs b/crates/turbo-tasks-memory/src/lib.rs index 7f71d8b7114d51..44d22bbd9e428d 100644 --- a/crates/turbo-tasks-memory/src/lib.rs +++ b/crates/turbo-tasks-memory/src/lib.rs @@ -6,6 +6,8 @@ #![feature(int_roundings)] #![deny(unsafe_op_in_unsafe_fn)] #![allow(clippy::too_many_arguments)] +// Clippy's needless mut lint is buggy: https://github.com/rust-lang/rust-clippy/issues/11299 +#![allow(clippy::needless_pass_by_ref_mut)] mod cell; mod concurrent_priority_queue; From 6233d7dddb7235703c9e1575f0cd63fec33efce6 Mon Sep 17 00:00:00 2001 From: Justin Ridgewell Date: Wed, 16 Aug 2023 16:28:12 -0400 Subject: [PATCH 5/5] CLIPPY I WILL STRANGLE YOU --- .cargo/config.toml | 12 +++++++++++- .github/workflows/test.yml | 2 +- crates/turbo-tasks-macros/src/lib.rs | 1 - crates/turbo-tasks-memory/src/lib.rs | 3 --- crates/turbo-tasks/src/lib.rs | 2 -- crates/turbopack-cli/src/dev/mod.rs | 1 - crates/turbopack-cli/src/lib.rs | 1 - crates/turbopack-dev/src/ecmascript/optimize.rs | 2 -- crates/turbopack-ecmascript/src/lib.rs | 1 - crates/turbopack-node/src/lib.rs | 1 - 10 files changed, 12 insertions(+), 14 deletions(-) diff --git a/.cargo/config.toml b/.cargo/config.toml index b3fecec793f498..66dd8d9d85b3ee 100644 --- a/.cargo/config.toml +++ b/.cargo/config.toml @@ -23,4 +23,14 @@ tp-check = "check --workspace --exclude turbo --exclude turborepo-* --exclude tu tp-clippy = "clippy --workspace --exclude turbo --exclude turborepo-* --exclude turbopath --exclude vercel-api-mock --exclude wax --exclude globwalk --exclude globwatch --exclude pidlock" [target.'cfg(all())'] -rustflags = ["--cfg", "tokio_unstable", "-Zshare-generics=y", "-Csymbol-mangling-version=v0", "-Aclippy::too_many_arguments"] +rustflags = [ + "--cfg", + "tokio_unstable", + "-Zshare-generics=y", + "-Csymbol-mangling-version=v0", + "-Aclippy::too_many_arguments", + # Clippy's needless mut lint is buggy: https://github.com/rust-lang/rust-clippy/issues/11299 + "-Aclippy::needless_pass_by_ref_mut", + # Clippy's partial_eq lint is buggy: https://github.com/rust-lang/rust-clippy/issues/11178 + "-Aclippy::incorrect_partial_ord_impl_on_ord_type", +] diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 2749f3bd949583..8b2fda5265f11a 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -597,7 +597,7 @@ jobs: - name: Run cargo clippy run: | - RUSTFLAGS="-D warnings -A deprecated -Aclippy::too_many_arguments" cargo groups clippy turbopack --features rustls-tls + RUSTFLAGS="-D warnings -A deprecated -Aclippy::too_many_arguments -Aclippy::needless_pass_by_ref_mut -Aclippy::incorrect_partial_ord_impl_on_ord_type" cargo groups clippy turbopack --features rustls-tls - name: Run ast-grep lints run: | diff --git a/crates/turbo-tasks-macros/src/lib.rs b/crates/turbo-tasks-macros/src/lib.rs index a2c9ccc702c636..2dfafc68641373 100644 --- a/crates/turbo-tasks-macros/src/lib.rs +++ b/crates/turbo-tasks-macros/src/lib.rs @@ -1,7 +1,6 @@ #![feature(proc_macro_diagnostic)] #![feature(allow_internal_unstable)] #![feature(box_patterns)] -#![allow(clippy::too_many_arguments)] mod derive; mod func; diff --git a/crates/turbo-tasks-memory/src/lib.rs b/crates/turbo-tasks-memory/src/lib.rs index 44d22bbd9e428d..171ce94d53de35 100644 --- a/crates/turbo-tasks-memory/src/lib.rs +++ b/crates/turbo-tasks-memory/src/lib.rs @@ -5,9 +5,6 @@ #![feature(box_patterns)] #![feature(int_roundings)] #![deny(unsafe_op_in_unsafe_fn)] -#![allow(clippy::too_many_arguments)] -// Clippy's needless mut lint is buggy: https://github.com/rust-lang/rust-clippy/issues/11299 -#![allow(clippy::needless_pass_by_ref_mut)] mod cell; mod concurrent_priority_queue; diff --git a/crates/turbo-tasks/src/lib.rs b/crates/turbo-tasks/src/lib.rs index 5c85af773f08e1..072f6192e745bf 100644 --- a/crates/turbo-tasks/src/lib.rs +++ b/crates/turbo-tasks/src/lib.rs @@ -35,8 +35,6 @@ #![feature(async_fn_in_trait)] #![feature(type_alias_impl_trait)] #![feature(never_type)] -// Clippy's partial_eq lint doesn't like delegation: https://github.com/rust-lang/rust-clippy/issues/11178 -#![allow(clippy::incorrect_partial_ord_impl_on_ord_type)] pub mod backend; mod collectibles; diff --git a/crates/turbopack-cli/src/dev/mod.rs b/crates/turbopack-cli/src/dev/mod.rs index 893583fc56c792..484dad1ad3cfcc 100644 --- a/crates/turbopack-cli/src/dev/mod.rs +++ b/crates/turbopack-cli/src/dev/mod.rs @@ -228,7 +228,6 @@ impl TurbopackDevServerBuilder { } } -#[allow(clippy::too_many_arguments)] #[turbo_tasks::function] async fn source( root_dir: String, diff --git a/crates/turbopack-cli/src/lib.rs b/crates/turbopack-cli/src/lib.rs index f81dc0a6b71d6a..a6750ecba4a2b8 100644 --- a/crates/turbopack-cli/src/lib.rs +++ b/crates/turbopack-cli/src/lib.rs @@ -2,7 +2,6 @@ #![feature(min_specialization)] #![feature(arbitrary_self_types)] #![feature(async_fn_in_trait)] -#![allow(clippy::too_many_arguments)] pub mod arguments; pub mod build; diff --git a/crates/turbopack-dev/src/ecmascript/optimize.rs b/crates/turbopack-dev/src/ecmascript/optimize.rs index 2816904265ab6a..060a5a5fcf0b4e 100644 --- a/crates/turbopack-dev/src/ecmascript/optimize.rs +++ b/crates/turbopack-dev/src/ecmascript/optimize.rs @@ -137,8 +137,6 @@ async fn merge_duplicated_and_contained( } impl Eq for FloatOrd {} - // Clippy's partial_eq lint doesn't like delegation: https://github.com/rust-lang/rust-clippy/issues/11178 - #[allow(clippy::incorrect_partial_ord_impl_on_ord_type)] impl PartialOrd for FloatOrd { fn partial_cmp(&self, other: &Self) -> Option { self.0.partial_cmp(&other.0) diff --git a/crates/turbopack-ecmascript/src/lib.rs b/crates/turbopack-ecmascript/src/lib.rs index 906ba188766d8f..2d6d33b1308a7d 100644 --- a/crates/turbopack-ecmascript/src/lib.rs +++ b/crates/turbopack-ecmascript/src/lib.rs @@ -6,7 +6,6 @@ #![feature(async_fn_in_trait)] #![feature(arbitrary_self_types)] #![recursion_limit = "256"] -#![allow(clippy::too_many_arguments)] pub mod analyzer; pub mod chunk; diff --git a/crates/turbopack-node/src/lib.rs b/crates/turbopack-node/src/lib.rs index 0caef15741ac7c..ea42d53e670b6c 100644 --- a/crates/turbopack-node/src/lib.rs +++ b/crates/turbopack-node/src/lib.rs @@ -3,7 +3,6 @@ #![feature(lint_reasons)] #![feature(arbitrary_self_types)] #![feature(async_fn_in_trait)] -#![allow(clippy::too_many_arguments)] use std::{collections::HashMap, iter::once, thread::available_parallelism};