Fix clippy (#988)

geoarrow · Jan 31, 2025 · 001aa42 · 001aa42
1 parent a2cbc7d
commit 001aa42
Show file tree

Hide file tree

Showing 7 changed files with 11 additions and 6 deletions.
diff --git a/js/Cargo.toml b/js/Cargo.toml
@@ -131,3 +131,8 @@ wasm-bindgen-test = "0.3.13"
 # Tell `rustc` to optimize for small code size.
 opt-level = "s"
 lto = true
+
+[lints.rust]
+unexpected_cfgs = { level = "warn", check-cfg = [
+    'cfg(wasm_bindgen_unstable_test_coverage)',
+] }
diff --git a/rust/geoarrow/src/array/linestring/array.rs b/rust/geoarrow/src/array/linestring/array.rs
@@ -48,7 +48,7 @@ pub(super) fn check(
     validity_len: Option<usize>,
     geom_offsets: &OffsetBuffer<i32>,
 ) -> Result<()> {
-    if validity_len.map_or(false, |len| len != geom_offsets.len_proxy()) {
+    if validity_len.is_some_and(|len| len != geom_offsets.len_proxy()) {
         return Err(GeoArrowError::General(
             "validity mask length must match the number of values".to_string(),
         ));

diff --git a/rust/geoarrow/src/array/multilinestring/array.rs b/rust/geoarrow/src/array/multilinestring/array.rs
@@ -50,7 +50,7 @@ pub(super) fn check(
     ring_offsets: &OffsetBuffer<i32>,
     validity_len: Option<usize>,
 ) -> Result<()> {
-    if validity_len.map_or(false, |len| len != geom_offsets.len_proxy()) {
+    if validity_len.is_some_and(|len| len != geom_offsets.len_proxy()) {
         return Err(GeoArrowError::General(
             "validity mask length must match the number of values".to_string(),
         ));

diff --git a/rust/geoarrow/src/array/multipoint/array.rs b/rust/geoarrow/src/array/multipoint/array.rs
@@ -45,7 +45,7 @@ pub(super) fn check(
     validity_len: Option<usize>,
     geom_offsets: &OffsetBuffer<i32>,
 ) -> Result<()> {
-    if validity_len.map_or(false, |len| len != geom_offsets.len_proxy()) {
+    if validity_len.is_some_and(|len| len != geom_offsets.len_proxy()) {
         return Err(GeoArrowError::General(
             "validity mask length must match the number of values".to_string(),
         ));

diff --git a/rust/geoarrow/src/array/multipolygon/array.rs b/rust/geoarrow/src/array/multipolygon/array.rs
@@ -54,7 +54,7 @@ pub(super) fn check(
     ring_offsets: &OffsetBuffer<i32>,
     validity_len: Option<usize>,
 ) -> Result<()> {
-    if validity_len.map_or(false, |len| len != geom_offsets.len_proxy()) {
+    if validity_len.is_some_and(|len| len != geom_offsets.len_proxy()) {
         return Err(GeoArrowError::General(
             "validity mask length must match the number of values".to_string(),
         ));

diff --git a/rust/geoarrow/src/array/point/array.rs b/rust/geoarrow/src/array/point/array.rs
@@ -34,7 +34,7 @@ pub struct PointArray {
 ///
 /// - Validity mask must have the same length as the coordinates.
 pub(super) fn check(coords: &CoordBuffer, validity_len: Option<usize>) -> Result<()> {
-    if validity_len.map_or(false, |len| len != coords.len()) {
+    if validity_len.is_some_and(|len| len != coords.len()) {
         return Err(GeoArrowError::General(
             "validity mask length must match the number of values".to_string(),
         ));

diff --git a/rust/geoarrow/src/array/polygon/array.rs b/rust/geoarrow/src/array/polygon/array.rs
@@ -53,7 +53,7 @@ pub(super) fn check(
     ring_offsets: &OffsetBuffer<i32>,
     validity_len: Option<usize>,
 ) -> Result<()> {
-    if validity_len.map_or(false, |len| len != geom_offsets.len_proxy()) {
+    if validity_len.is_some_and(|len| len != geom_offsets.len_proxy()) {
         return Err(GeoArrowError::General(
             "validity mask length must match the number of values".to_string(),
         ));