FillValueMetadata::try_as_uint/int from uint/int

CHANGELOG.md

@@ -7,6 +7,9 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [Unreleased]
 
+### Changed
+ - `FillValueMetadata::try_as_uint/int` can both now handle `FillValueMetadata::Uint/Int`
+
 ## [0.5.0] - 2023-10-08
 
 ### Added

Cargo.toml

@@ -1,7 +1,7 @@
 [package]
 name = "zarrs"
 description = "A library for the Zarr V3 storage format for multidimensional arrays and metadata"
-version = "0.5.0"
+version = "0.5.1"
 authors = ["Lachlan Deakin <ljdgit@gmail.com>"]
 edition = "2021"
 license = "MIT OR Apache-2.0"

src/array/fill_value_metadata.rs

@@ -18,7 +18,7 @@ pub enum FillValueMetadata {
     /// A boolean value.
     Bool(bool),
     /// An unsigned integer.
-    Uint(u64),
+    Uint(u64), // FIXME: UInt for consistency?
     /// A signed integer.
     Int(i64),
     /// A float.
@@ -132,25 +132,31 @@ impl FillValueMetadata {
         }
     }
 
-    /// Convert the fill value an int.
+    /// Convert the fill value to int.
     #[must_use]
-    pub fn try_as_int<T: std::convert::TryFrom<i64>>(&self) -> Option<T> {
+    pub fn try_as_int<T: std::convert::TryFrom<i64> + std::convert::TryFrom<u64>>(
+        &self,
+    ) -> Option<T> {
         match self {
             FillValueMetadata::Int(int) => T::try_from(*int).ok(),
+            FillValueMetadata::Uint(uint) => T::try_from(*uint).ok(),
             _ => None,
         }
     }
 
-    /// Convert the fill value a uint.
+    /// Convert the fill value to uint.
     #[must_use]
-    pub fn try_as_uint<T: std::convert::TryFrom<u64>>(&self) -> Option<T> {
+    pub fn try_as_uint<T: std::convert::TryFrom<i64> + std::convert::TryFrom<u64>>(
+        &self,
+    ) -> Option<T> {
         match self {
+            FillValueMetadata::Int(int) => T::try_from(*int).ok(),
             FillValueMetadata::Uint(uint) => T::try_from(*uint).ok(),
             _ => None,
         }
     }
 
-    /// Convert the fill value a float.
+    /// Convert the fill value to float.
     #[must_use]
     pub fn try_as_float<T: FloatCore>(&self) -> Option<T> {
         match self {