Bump zarrs to 0.17.0-beta.2

CHANGELOG.md

@@ -9,7 +9,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ### Changed
  - Use `FetchContent_MakeAvailable` for `zarrs_ffi` source in `Findzarrs.cmake`
- - Bump `zarrs` to 0.17.0-beta.1
+ - Bump `zarrs` to 0.17.0-beta.2
  - Raise MSRV to 1.76
 
 ### Fixed

Cargo.toml

@@ -29,8 +29,7 @@ cbindgen = { version = "0.27", optional = true }
 ffi-support = "0.4.4"
 once_cell = "1.18.0"
 serde_json = "1.0.71"
-zarrs = { version = "0.17.0-beta.1" }
-zarrs_filesystem = { version = "0.1.0" }
+zarrs = { version = "0.17.0-beta.2" }
 
 # [patch.crates-io]
 # zarrs = { path = "../zarrs" }

src/array/array_sharded.rs

@@ -12,10 +12,10 @@ use crate::{ZarrsResult, LAST_ERROR};
 use super::{array_fn, ZarrsArray, ZarrsArrayEnum};
 
 #[doc(hidden)]
-pub struct ZarrsShardIndexCache_T(pub ArrayShardedReadableExtCache<'static>);
+pub struct ZarrsShardIndexCache_T(pub ArrayShardedReadableExtCache);
 
 impl std::ops::Deref for ZarrsShardIndexCache_T {
-    type Target = ArrayShardedReadableExtCache<'static>;
+    type Target = ArrayShardedReadableExtCache;
     fn deref(&self) -> &Self::Target {
         &self.0
     }
@@ -155,9 +155,9 @@ pub unsafe extern "C" fn zarrsDestroyShardIndexCache(
     }
 }
 
-fn zarrsArrayRetrieveInnerChunkImpl<'a, T: ReadableStorageTraits + ?Sized + 'static>(
-    array: &'a Array<T>,
-    cache: &'a ArrayShardedReadableExtCache<'a>,
+fn zarrsArrayRetrieveInnerChunkImpl<T: ReadableStorageTraits + ?Sized + 'static>(
+    array: &Array<T>,
+    cache: &ArrayShardedReadableExtCache,
     chunk_indices: &[u64],
     chunk_bytes_length: usize,
     chunk_bytes: *mut u8,
@@ -252,9 +252,9 @@ pub unsafe extern "C" fn zarrsArrayRetrieveInnerChunk(
     }
 }
 
-fn zarrsArrayRetrieveSubsetShardedImpl<'a, T: ReadableStorageTraits + ?Sized + 'static>(
-    array: &'a Array<T>,
-    cache: &'a ArrayShardedReadableExtCache<'a>,
+fn zarrsArrayRetrieveSubsetShardedImpl<T: ReadableStorageTraits + ?Sized + 'static>(
+    array: &Array<T>,
+    cache: &ArrayShardedReadableExtCache,
     array_subset: &ArraySubset,
     subset_bytes_length: usize,
     subset_bytes: *mut u8,

src/storage.rs

@@ -39,7 +39,7 @@ pub unsafe extern "C" fn zarrsCreateStorageFilesystem(
     pStorage: *mut ZarrsStorage,
 ) -> ZarrsResult {
     let path = std::path::Path::new(path.as_str());
-    match zarrs_filesystem::FilesystemStore::new(path) {
+    match zarrs::filesystem::FilesystemStore::new(path) {
         Ok(store) => {
             *pStorage = Box::into_raw(Box::new(ZarrsStorage_T(ZarrsStorageEnum::RW(Arc::new(
                 store,

tests/array.rs

@@ -10,7 +10,7 @@ pub fn assert_cxx_str(input_as_string: &str) -> Assert {
 fn ffi_array_write_rust_read_c() {
     use std::sync::Arc;
     use zarrs::array::{DataType, FillValue};
-    use zarrs_filesystem::FilesystemStore;
+    use zarrs::filesystem::FilesystemStore;
 
     let tmp_path = tempfile::tempdir().unwrap();
     std::env::set_var(