Skip to content

fix lint warning with Rust 1.87 #494

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
May 18, 2025
+21 −34
Merged

fix lint warning with Rust 1.87 #494

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
6868dad
move lint config into `Cargo.toml`
davidhewitt May 18, 2025
fc3ef94
fix lint warning on 1.87
davidhewitt May 18, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
17 changes: 14 additions & 3 deletions Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ name = "numpy"
version = "0.25.0"
authors = [
"The rust-numpy Project Developers",
"PyO3 Project and Contributors <https://github.com/PyO3>"
"PyO3 Project and Contributors <https://github.com/PyO3>",
]
description = "PyO3-based Rust bindings of the NumPy C-API"
documentation = "https://docs.rs/numpy"
Expand All @@ -26,11 +26,22 @@ pyo3 = { version = "0.25.0", default-features = false, features = ["macros"] }
rustc-hash = "2.0"

[dev-dependencies]
pyo3 = { version = "0.25", default-features = false, features = ["auto-initialize"] }
nalgebra = { version = ">=0.30, <0.34", default-features = false, features = ["std"] }
pyo3 = { version = "0.25", default-features = false, features = [
"auto-initialize",
] }
nalgebra = { version = ">=0.30, <0.34", default-features = false, features = [
"std",
] }

[build-dependencies]
pyo3-build-config = { version = "0.25", features = ["resolve-config"] }

[package.metadata.docs.rs]
all-features = true

[lints.rust]
# We usually want to make the GIL lifetime explicit.
elided-lifetimes-in-paths = "deny"

[lints.clippy]
needless-lifetimes = "allow"
2 changes: 1 addition & 1 deletion src/untyped_array.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -241,7 +241,7 @@ pub trait PyUntypedArrayMethods<'py>: Sealed {

/// Returns `true` if the there are no elements in the array.
fn is_empty(&self) -> bool {
self.shape().iter().any(|dim| *dim == 0)
self.shape().contains(&0)
}
}

Expand Down
36 changes: 6 additions & 30 deletions x.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,15 +29,7 @@ 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",
)
DENY_WARNINGS = ("--deny", "warnings")


def default(args):
Expand All @@ -51,40 +43,24 @@ def default(args):
"--tests",
"--benches",
"--",
*LINT_CONFIG,
*DENY_WARNINGS,
)
else:
run("cargo", "clippy", "--all-features", "--tests", "--", *LINT_CONFIG)
run("cargo", "clippy", "--all-features", "--tests", "--", *DENY_WARNINGS)

for manifest in gen_examples("Cargo.toml"):
run("cargo", "clippy", "--manifest-path", manifest, "--", *LINT_CONFIG)
run("cargo", "clippy", "--manifest-path", manifest, "--", *DENY_WARNINGS)

run("cargo", "test", "--all-features", "--lib", "--tests")


def check(args):
run("cargo", "fmt", "--", "--check")

run(
"cargo",
"clippy",
"--all-features",
"--tests",
"--",
*LINT_CONFIG,
)
run("cargo", "clippy", "--all-features", "--tests", "--", *DENY_WARNINGS)

for manifest in gen_examples("Cargo.toml"):
run("cargo", "fmt", "--manifest-path", manifest, "--", "--check")

run(
"cargo",
"clippy",
"--manifest-path",
manifest,
"--",
*LINT_CONFIG,
)
run("cargo", "clippy", "--manifest-path", manifest, "--", *DENY_WARNINGS)


def doc(args):
Expand Down