Merge 6233d7d into b54f352

vercel · Aug 16, 2023 · 4c4c171 · 4c4c171
2 parents b54f352 + 6233d7d
commit 4c4c171
Show file tree

Hide file tree

Showing 10 changed files with 16 additions and 10 deletions.
diff --git 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
@@ -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
@@ -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
@@ -5,7 +5,6 @@
 #![feature(box_patterns)]
 #![feature(int_roundings)]
 #![deny(unsafe_op_in_unsafe_fn)]
-#![allow(clippy::too_many_arguments)]
 
 mod cell;
 mod concurrent_priority_queue;

diff --git 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
@@ -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-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
@@ -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};
 

diff --git 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;

diff --git a/rust-toolchain b/rust-toolchain
@@ -1 +1 @@
-nightly-2023-07-03
+nightly-2023-07-21