Skip to content

Commit

Permalink
Bump MSRV to 1.77 for all packages
Browse files Browse the repository at this point in the history
- Bump `zfp-sys` to 0.2.0
- Remove `async-recursion` dependency
  • Loading branch information
LDeakin committed Oct 28, 2024
1 parent 6882268 commit 6fc914e
Show file tree
Hide file tree
Showing 19 changed files with 21 additions and 19 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ jobs:
strategy:
fail-fast: false
matrix:
toolchain: ["stable", "1.76", "beta", "nightly"]
toolchain: ["stable", "1.77", "beta", "nightly"]
features: ["--features \"\"", "--all-features", "--no-default-features"]
runs-on: ubuntu-latest
steps:
Expand Down
1 change: 1 addition & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
- **Breaking**: Add `dynamic()` to all `CodecTraits`
- **Breaking**: Add `options` parameter to `[Async]ArrayPartialDecoderTraits::partial_decode` and remove `partial_decode_opt`
- Make `array::update_array_bytes()` public
- **Breaking**: Bump MSRV to 1.77 (21 March, 2024)

## [0.17.1] - 2024-10-18

Expand Down
8 changes: 3 additions & 5 deletions zarrs/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ name = "zarrs"
version = "0.18.0-dev"
authors = ["Lachlan Deakin <[email protected]>"]
edition = "2021"
rust-version = "1.76"
rust-version = "1.77"
description = "A library for the Zarr storage format for multidimensional arrays and metadata"
documentation = "https://docs.rs/zarrs"
repository = "https://github.com/LDeakin/zarrs"
Expand All @@ -27,7 +27,7 @@ transpose = ["dep:ndarray"] # Enable the transpose codec
zfp = ["dep:zfp-sys"] # Enable the experimental zfp codec
zstd = ["dep:zstd"] # Enable the zstd codec
ndarray = ["dep:ndarray"] # Adds ndarray utility functions to Array
async = ["dep:async-trait", "dep:async-recursion", "dep:futures", "zarrs_storage/async"] # Enable experimental async API
async = ["dep:async-trait", "dep:futures", "zarrs_storage/async"] # Enable experimental async API

[package.metadata.docs.rs]
all-features = true
Expand All @@ -37,7 +37,6 @@ crate-type = ["lib"]
bench = false

[dependencies]
async-recursion = { version = "1.0.5", optional = true }
async-trait = { version = "0.1.74", optional = true }
blosc-sys = { version = "0.3.4", package = "blosc-src", features = ["snappy", "lz4", "zlib", "zstd"], optional = true }
bytemuck = { version = "1.14.0", features = ["extern_crate_alloc", "must_cast", "min_const_generics"] }
Expand Down Expand Up @@ -66,8 +65,7 @@ unsafe_cell_slice = "0.2.0"
zarrs_filesystem = { workspace = true, optional = true }
zarrs_metadata = { workspace = true }
zarrs_storage = { workspace = true }
# zfp-sys is pinned to 0.1.15 to mainain 1.76 MSRV
zfp-sys = {version = "=0.1.15", features = ["static"], optional = true }
zfp-sys = {version = "0.2.0", features = ["static"], optional = true }
zstd = { version = "0.13.1", features = ["zstdmt"], optional = true }

[dependencies.num-complex]
Expand Down
3 changes: 1 addition & 2 deletions zarrs/src/array/array_bytes.rs
Original file line number Diff line number Diff line change
Expand Up @@ -596,8 +596,7 @@ impl From<Vec<u8>> for ArrayBytes<'_> {

impl<'a, const N: usize> From<&'a [u8; N]> for ArrayBytes<'a> {
fn from(bytes: &'a [u8; N]) -> Self {
// NOTE: as_slice() is needed for rust <1.77
ArrayBytes::new_flen(bytes.as_slice())
ArrayBytes::new_flen(bytes)
}
}

Expand Down
5 changes: 1 addition & 4 deletions zarrs/src/node/node_async.rs
Original file line number Diff line number Diff line change
@@ -1,7 +1,5 @@
use std::sync::Arc;

use async_recursion::async_recursion;

use crate::{
array::{ArrayMetadata, ArrayMetadataV2},
group::GroupMetadata,
Expand Down Expand Up @@ -91,7 +89,6 @@ async fn get_metadata_v2<
///
/// # Errors
/// Returns a [`StorageError`] if there is an underlying error with the store.
#[async_recursion]
pub async fn async_get_child_nodes<TStorage>(
storage: &Arc<TStorage>,
path: &NodePath,
Expand All @@ -117,7 +114,7 @@ where
.map_err(|err: NodePathError| StorageError::Other(err.to_string()))?;
let children = match child_metadata {
NodeMetadata::Array(_) => Vec::default(),
NodeMetadata::Group(_) => async_get_child_nodes(storage, &path).await?,
NodeMetadata::Group(_) => Box::pin(async_get_child_nodes(storage, &path)).await?,

Check warning on line 117 in zarrs/src/node/node_async.rs

View check run for this annotation

Codecov / codecov/patch

zarrs/src/node/node_async.rs#L117

Added line #L117 was not covered by tests
};
nodes.push(Node::new_with_metadata(path, child_metadata, children));
}
Expand Down
1 change: 1 addition & 0 deletions zarrs_filesystem/CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0

### Changed
- Bump `zarrs_storage` to 0.3.0-dev
- **Breaking**: Bump MSRV to 1.77 (21 March, 2024)

## [0.1.0] - 2024-09-15

Expand Down
2 changes: 1 addition & 1 deletion zarrs_filesystem/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ name = "zarrs_filesystem"
version = "0.1.0"
authors = ["Lachlan Deakin <[email protected]>"]
edition = "2021"
rust-version = "1.76"
rust-version = "1.77"
description = "A filesystem store for the zarrs crate"
documentation = "https://docs.rs/zarrs_filesystem"
repository = "https://github.com/LDeakin/zarrs"
Expand Down
1 change: 1 addition & 0 deletions zarrs_http/CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0

### Changed
- Bump `zarrs_storage` to 0.3.0-dev
- **Breaking**: Bump MSRV to 1.77 (21 March, 2024)

## [0.1.0] - 2024-09-15

Expand Down
2 changes: 1 addition & 1 deletion zarrs_http/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ name = "zarrs_http"
version = "0.1.0"
authors = ["Lachlan Deakin <[email protected]>"]
edition = "2021"
rust-version = "1.76"
rust-version = "1.77"
description = "A synchronous http store for the zarrs crate"
documentation = "https://docs.rs/zarrs_storage"
repository = "https://github.com/LDeakin/zarrs"
Expand Down
1 change: 1 addition & 0 deletions zarrs_metadata/CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0

### Changed
- **Breaking**: Mark `GroupMetadataV3` and `ArrayMetadataV3` as non-exhaustive
- **Breaking**: Bump MSRV to 1.77 (21 March, 2024)

## [0.1.0] - 2024-09-02

Expand Down
2 changes: 1 addition & 1 deletion zarrs_metadata/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ name = "zarrs_metadata"
version = "0.2.0"
authors = ["Lachlan Deakin <[email protected]>"]
edition = "2021"
rust-version = "1.76"
rust-version = "1.77"
description = "Zarr metadata support for the zarrs crate"
documentation = "https://docs.rs/zarrs_object_store"
repository = "https://github.com/LDeakin/zarrs"
Expand Down
1 change: 1 addition & 0 deletions zarrs_object_store/CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0

### Changed
- Bump `zarrs_storage` to 0.3.0-dev
- **Breaking**: Bump MSRV to 1.77 (21 March, 2024)

## [0.2.1] - 2024-09-23

Expand Down
2 changes: 1 addition & 1 deletion zarrs_object_store/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ name = "zarrs_object_store"
version = "0.2.1"
authors = ["Lachlan Deakin <[email protected]>"]
edition = "2021"
rust-version = "1.76"
rust-version = "1.77"
description = "object_store store support for the zarrs crate"
documentation = "https://docs.rs/zarrs_object_store"
repository = "https://github.com/LDeakin/zarrs"
Expand Down
1 change: 1 addition & 0 deletions zarrs_opendal/CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0

### Changed
- Bump `zarrs_storage` to 0.3.0-dev
- **Breaking**: Bump MSRV to 1.77 (21 March, 2024)

## [0.3.1] - 2024-09-23

Expand Down
2 changes: 1 addition & 1 deletion zarrs_opendal/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ name = "zarrs_opendal"
version = "0.3.1"
authors = ["Lachlan Deakin <[email protected]>"]
edition = "2021"
rust-version = "1.76"
rust-version = "1.77"
description = "opendal store support for the zarrs crate"
documentation = "https://docs.rs/zarrs_opendal"
repository = "https://github.com/LDeakin/zarrs"
Expand Down
1 change: 1 addition & 0 deletions zarrs_storage/CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
- Bump `unsafe_cell_slice` to 0.2.0
- **Breaking**: Change `ByteRange::FromEnd` to `ByteRange::Suffix`
- **Breaking**: implement `AsyncReadableWritableStorageTraits` for `T: AsyncReadableStorageTraits + AsyncWritableStorageTraits`
- **Breaking**: Bump MSRV to 1.77 (21 March, 2024)

### Removed
- **Breaking**: Remove `ByteRange::offset()`
Expand Down
2 changes: 1 addition & 1 deletion zarrs_storage/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ name = "zarrs_storage"
version = "0.3.0-dev"
authors = ["Lachlan Deakin <[email protected]>"]
edition = "2021"
rust-version = "1.76"
rust-version = "1.77"
description = "The storage API and default stores for the zarrs crate"
documentation = "https://docs.rs/zarrs_storage"
repository = "https://github.com/LDeakin/zarrs"
Expand Down
1 change: 1 addition & 0 deletions zarrs_zip/CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0

### Changed
- Bump `zarrs_storage` to 0.3.0-dev
- **Breaking**: Bump MSRV to 1.77 (21 March, 2024)

## [0.1.0] - 2024-09-15

Expand Down
2 changes: 1 addition & 1 deletion zarrs_zip/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ name = "zarrs_zip"
version = "0.1.0"
authors = ["Lachlan Deakin <[email protected]>"]
edition = "2021"
rust-version = "1.76"
rust-version = "1.77"
description = "A storage adapter for zip files for the zarrs crate"
documentation = "https://docs.rs/zarrs_zip"
repository = "https://github.com/LDeakin/zarrs"
Expand Down

0 comments on commit 6fc914e

Please sign in to comment.