Fix incomplete application of Clippy configuration in x helper script.

PyO3 · Oct 3, 2023 · 06a93f1 · 06a93f1
1 parent 2df6cba
commit 06a93f1
Show file tree

Hide file tree

Showing 2 changed files with 23 additions and 14 deletions.
diff --git a/benches/array.rs b/benches/array.rs
@@ -185,7 +185,7 @@ fn from_vec3_large(bencher: &mut Bencher) {
     from_vec3(bencher, 2_usize.pow(5));
 }
 
-fn iter_with_gil(bencher: &mut Bencher, mut f: impl FnMut(Python)) {
+fn iter_with_gil(bencher: &mut Bencher, mut f: impl FnMut(Python<'_>)) {
     Python::with_gil(|py| {
         bencher.iter(|| {
             let pool = unsafe { py.new_pool() };

diff --git a/x.py b/x.py
@@ -29,31 +29,40 @@ def gen_examples(manifest):
         yield dir_ / manifest
 
 
+LINT_CONFIG = (
+    "--deny",
+    "warnings",
+    # We usually want to make the GIL lifetime explicit.
+    "--deny",
+    "elided-lifetimes-in-paths",
+    "--allow",
+    "clippy::needless-lifetimes",
+)
+
+
 def default(args):
     format_(args)
 
     if nightly():
-        run("cargo", "clippy", "--all-features", "--tests", "--benches")
+        run(
+            "cargo",
+            "clippy",
+            "--all-features",
+            "--tests",
+            "--benches",
+            "--",
+            *LINT_CONFIG,
+        )
     else:
-        run("cargo", "clippy", "--all-features", "--tests")
+        run("cargo", "clippy", "--all-features", "--tests", "--", *LINT_CONFIG)
 
     for manifest in gen_examples("Cargo.toml"):
-        run("cargo", "clippy", "--manifest-path", manifest)
+        run("cargo", "clippy", "--manifest-path", manifest, "--", *LINT_CONFIG)
 
     run("cargo", "test", "--all-features", "--lib", "--tests")
 
 
 def check(args):
-    LINT_CONFIG = (
-        "--deny",
-        "warnings",
-        # We usually want to make the GIL lifetime explicit.
-        "--deny",
-        "elided-lifetimes-in-paths",
-        "--allow",
-        "clippy::needless-lifetimes",
-    )
-
     run("cargo", "fmt", "--", "--check")
 
     run(