Merge pull request #147 from georust/bugfix/duplicated-attribute

Remove duplicated attribute
georust · Jun 17, 2024 · e1788c1 · e1788c1
2 parents a5669e4 + 6fa28af
commit e1788c1
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 8 deletions.
diff --git a/netcdf-sys/src/mmap.rs b/netcdf-sys/src/mmap.rs
@@ -1,18 +1,15 @@
-#![cfg(feature = "has-mmap")]
-
 use std::os::raw::{c_char, c_int, c_void};
 
 #[repr(C)]
 #[derive(Copy, Clone)]
-#[cfg(all(feature = "has-mmap", feature = "1.6.2"))]
+#[cfg(feature = "1.6.2")]
 pub struct NC_memio {
     size: usize,
     memory: *mut c_void,
     flags: c_int,
 }
 
 extern "C" {
-    #[cfg(feature = "has-mmap")]
     pub fn nc_open_mem(
         path: *const c_char,
         mode: c_int,
@@ -21,21 +18,21 @@ extern "C" {
         ncidp: *mut c_int,
     ) -> c_int;
 
-    #[cfg(all(feature = "has-mmap", feature = "1.6.2"))]
+    #[cfg(feature = "1.6.2")]
     pub fn nc_create_mem(
         path: *const c_char,
         mode: c_int,
         initialsize: usize,
         ncidp: *mut c_int,
     ) -> c_int;
-    #[cfg(all(feature = "has-mmap", feature = "1.6.2"))]
+    #[cfg(feature = "1.6.2")]
     pub fn nc_open_memio(
         path: *const c_char,
         mode: c_int,
         info: *mut NC_memio,
         ncidp: *mut c_int,
     ) -> c_int;
 
-    #[cfg(all(feature = "has-mmap", feature = "1.6.2"))]
+    #[cfg(feature = "1.6.2")]
     pub fn nc_close_memio(ncid: c_int, info: *mut NC_memio) -> c_int;
 }
diff --git a/netcdf/src/variable.rs b/netcdf/src/variable.rs
@@ -244,7 +244,7 @@ impl<'g> VariableMut<'g> {
             .iter()
             .copied()
             .fold(1_usize, usize::saturating_mul);
-        if len == usize::max_value() {
+        if len == usize::MAX {
             return Err(error::Error::Overflow);
         }
         unsafe {