Bump crate version to 0.12.1 and edition to 2024

Author: maxstack

Cargo.lock

@@ -1,7 +1,7 @@
 [package]
 name = "reductionist"
-version = "0.12.0"
-edition = "2021"
+version = "0.12.1"
+edition = "2024"
 rust-version = "1.93.0"
 license = "Apache-2.0"
 description = "S3 Active Storage server"

Cargo.toml

@@ -1,5 +1,5 @@
 /// Benchmarks for the byte order reversal implementation.
-use criterion::{black_box, criterion_group, criterion_main, Criterion};
+use criterion::{Criterion, black_box, criterion_group, criterion_main};
 use reductionist::array::{build_array_mut_from_shape, get_shape, reverse_array_byte_order};
 use reductionist::models::{DType, RequestData, Slice};
 use url::Url;

benches/byte_order.rs

@@ -1,12 +1,12 @@
 /// Benchmarks for the byte shuffle filter implementation.
-use criterion::{black_box, criterion_group, criterion_main, Criterion};
+use criterion::{Criterion, black_box, criterion_group, criterion_main};
 use reductionist::compression;
 use reductionist::models;
 
 use axum::body::Bytes;
-use blusc::{blosc2_compress, BLOSC2_MAX_OVERHEAD, BLOSC_SHUFFLE};
-use flate2::read::{GzEncoder, ZlibEncoder};
+use blusc::{BLOSC_SHUFFLE, BLOSC2_MAX_OVERHEAD, blosc2_compress};
 use flate2::Compression;
+use flate2::read::{GzEncoder, ZlibEncoder};
 use std::io::Read;
 // Bring trait into scope to use as_bytes method.
 use zerocopy::AsBytes;

benches/compression.rs

@@ -1,5 +1,5 @@
 /// Benchmarks for numerical operations.
-use criterion::{black_box, criterion_group, criterion_main, Criterion};
+use criterion::{Criterion, black_box, criterion_group, criterion_main};
 use reductionist::error::ActiveStorageError;
 use reductionist::models::{DType, RequestData, Response};
 use reductionist::operation::Operation;

benches/operations.rs

@@ -1,10 +1,10 @@
 /// Benchmarks for S3 client implementation.
 use aws_credential_types::Credentials;
-use aws_sdk_s3::primitives::ByteStream;
 use aws_sdk_s3::Client;
+use aws_sdk_s3::primitives::ByteStream;
 use aws_types::region::Region;
 use axum::body::Bytes;
-use criterion::{black_box, criterion_group, criterion_main, Criterion};
+use criterion::{Criterion, black_box, criterion_group, criterion_main};
 use reductionist::resource_manager::ResourceManager;
 use reductionist::s3_client::{S3Client, S3ClientMap, S3Credentials};
 use url::Url;

benches/s3_client.rs

@@ -1,6 +1,6 @@
 /// Benchmarks for the byte shuffle filter implementations.
 use axum::body::Bytes;
-use criterion::{black_box, criterion_group, criterion_main, Criterion};
+use criterion::{Criterion, black_box, criterion_group, criterion_main};
 use reductionist::filters::shuffle;
 use reductionist::filters::shuffle_simd;
 // Bring trait into scope to use as_bytes method.

benches/shuffle.rs

@@ -12,13 +12,13 @@ use crate::validated_json::ValidatedJson;
 
 use axum::middleware;
 use axum::{
+    Router, TypedHeader,
     extract::{Path, State},
     headers::authorization::{Authorization, Basic},
-    http::header,
     http::StatusCode,
+    http::header,
     response::{IntoResponse, Response},
     routing::{get, post},
-    Router, TypedHeader,
 };
 use bytes::Bytes;
 use serde_cbor;

src/app.rs

@@ -516,10 +516,10 @@ impl SimpleDiskCache {
             self.prune_expired().await;
             // Do we need to prune further to keep within a maximum size threshold?
             state = self.load_state().await;
-            if let Some(max_size_bytes) = self.max_size_bytes {
-                if state.current_size_bytes + headroom_bytes >= max_size_bytes {
-                    self.prune_disk_space(headroom_bytes).await?;
-                }
+            if let Some(max_size_bytes) = self.max_size_bytes
+                && state.current_size_bytes + headroom_bytes >= max_size_bytes
+            {
+                self.prune_disk_space(headroom_bytes).await?;
             }
             // Update state with the time of the next periodic pruning.
             state = self.load_state().await;

src/chunk_cache.rs

@@ -4,8 +4,8 @@ use crate::models;
 use crate::resource_manager::ResourceManager;
 
 use axum::{
-    headers::authorization::{Authorization, Basic},
     TypedHeader,
+    headers::authorization::{Authorization, Basic},
 };
 use bytes::Bytes;
 use tokio::sync::SemaphorePermit;
@@ -109,7 +109,7 @@ impl<'a> chunk_store::ChunkDownloader<'a> for ChunkDownloaderHTTP {
                 _ => {
                     return Err(ActiveStorageError::HTTPRequestError {
                         error: format!("HTTP request failed with status: {}", response.status()),
-                    })
+                    });
                 }
             },
             Err(e) => return Err(ActiveStorageError::from(e)),