fix clippy beta

PyO3 · Nov 27, 2024 · 719ca30 · 719ca30
1 parent 7bd8df8
commit 719ca30
Show file tree

Hide file tree

Showing 9 changed files with 10 additions and 7 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -44,7 +44,7 @@ jobs:
           python-version: "3.12"
       - name: resolve MSRV
         id: resolve-msrv
-        run: echo MSRV=`python -c 'import tomllib; print(tomllib.load(open("Cargo.toml", "rb"))["package"]["rust-version"])'` >> $GITHUB_OUTPUT
+        run: echo MSRV=`python -c 'import tomllib; print(tomllib.load(open("Cargo.toml", "rb"))["workspace"]["package"]["rust-version"])'` >> $GITHUB_OUTPUT
 
   semver-checks:
     if: github.ref != 'refs/heads/main'

diff --git a/Cargo.toml b/Cargo.toml
@@ -12,7 +12,7 @@ categories = ["api-bindings", "development-tools::ffi"]
 license = "MIT OR Apache-2.0"
 exclude = ["/.gitignore", ".cargo/config", "/codecov.yml", "/Makefile", "/pyproject.toml", "/noxfile.py", "/.github", "/tests/test_compile_error.rs", "/tests/ui"]
 edition = "2021"
-rust-version = "1.63"
+rust-version.workspace = true
 
 [dependencies]
 cfg-if = "1.0"
@@ -144,6 +144,7 @@ members = [
     "pytests",
     "examples",
 ]
+package.rust-version = "1.63"
 
 [package.metadata.docs.rs]
 no-default-features = true

diff --git a/examples/Cargo.toml b/examples/Cargo.toml
@@ -3,6 +3,7 @@ name = "pyo3-examples"
 version = "0.0.0"
 publish = false
 edition = "2021"
+rust-version.workspace = true
 
 [dev-dependencies]
 pyo3 = { path = "..", features = ["auto-initialize", "extension-module"] }

diff --git a/pyo3-build-config/Cargo.toml b/pyo3-build-config/Cargo.toml
@@ -9,6 +9,7 @@ repository = "https://github.com/pyo3/pyo3"
 categories = ["api-bindings", "development-tools::ffi"]
 license = "MIT OR Apache-2.0"
 edition = "2021"
+rust-version.workspace = true
 
 [dependencies]
 once_cell = "1"

diff --git a/pyo3-build-config/src/impl_.rs b/pyo3-build-config/src/impl_.rs
@@ -1122,11 +1122,7 @@ impl BuildFlags {
         Self(
             BuildFlags::ALL
                 .iter()
-                .filter(|flag| {
-                    config_map
-                        .get_value(flag.to_string())
-                        .map_or(false, |value| value == "1")
-                })
+                .filter(|flag| config_map.get_value(flag.to_string()) == Some("1"))
                 .cloned()
                 .collect(),
         )

diff --git a/pyo3-ffi/Cargo.toml b/pyo3-ffi/Cargo.toml
@@ -10,6 +10,7 @@ categories = ["api-bindings", "development-tools::ffi"]
 license = "MIT OR Apache-2.0"
 edition = "2021"
 links = "python"
+rust-version.workspace = true
 
 [dependencies]
 libc = "0.2.62"

diff --git a/pyo3-macros-backend/Cargo.toml b/pyo3-macros-backend/Cargo.toml
@@ -9,6 +9,7 @@ repository = "https://github.com/pyo3/pyo3"
 categories = ["api-bindings", "development-tools::ffi"]
 license = "MIT OR Apache-2.0"
 edition = "2021"
+rust-version.workspace = true
 
 # Note: we use default-features = false for proc-macro related crates
 # not to depend on proc-macro itself.

diff --git a/pyo3-macros/Cargo.toml b/pyo3-macros/Cargo.toml
@@ -9,6 +9,7 @@ repository = "https://github.com/pyo3/pyo3"
 categories = ["api-bindings", "development-tools::ffi"]
 license = "MIT OR Apache-2.0"
 edition = "2021"
+rust-version.workspace = true
 
 [lib]
 proc-macro = true

diff --git a/pytests/Cargo.toml b/pytests/Cargo.toml
@@ -5,6 +5,7 @@ version = "0.1.0"
 description = "Python-based tests for PyO3"
 edition = "2021"
 publish = false
+rust-version.workspace = true
 
 [dependencies]
 pyo3 = { path = "../", features = ["extension-module"] }