From fd9c9572e92b62cdc6adc2f6f24b911897f6fbf8 Mon Sep 17 00:00:00 2001 From: Ilan Joselevich Date: Wed, 19 Mar 2025 00:32:46 +0000 Subject: [PATCH] chore(snix/castore): edition 2021 -> 2024 Change-Id: I7c5998f720e3c8216a93e7274a78e5352aeffbca Reviewed-on: https://cl.snix.dev/c/snix/+/30135 Reviewed-by: edef . Reviewed-by: Florian Klink Tested-by: besadii Autosubmit: Ilan Joselevich --- snix/Cargo.nix | 2 +- snix/castore/Cargo.toml | 2 +- snix/castore/src/blobservice/grpc.rs | 4 ++-- snix/castore/src/blobservice/memory.rs | 2 +- snix/castore/src/blobservice/object_store.rs | 2 +- snix/castore/src/directoryservice/object_store.rs | 2 +- snix/castore/src/fs/inodes.rs | 2 +- snix/castore/src/import/mod.rs | 2 +- snix/castore/src/nodes/directory.rs | 2 +- snix/castore/src/path/mod.rs | 2 +- snix/castore/src/proto/grpc_blobservice_wrapper.rs | 4 +++- snix/castore/src/proto/grpc_directoryservice_wrapper.rs | 2 +- 12 files changed, 15 insertions(+), 13 deletions(-) diff --git a/snix/Cargo.nix b/snix/Cargo.nix index 39725bdd1..d4e0f8bbf 100644 --- a/snix/Cargo.nix +++ b/snix/Cargo.nix @@ -13574,7 +13574,7 @@ rec { "snix-castore" = rec { crateName = "snix-castore"; version = "0.1.0"; - edition = "2021"; + edition = "2024"; src = lib.cleanSourceWith { filter = sourceFilter; src = ./castore; }; libName = "snix_castore"; dependencies = [ diff --git a/snix/castore/Cargo.toml b/snix/castore/Cargo.toml index 65f85cc4e..805ea8369 100644 --- a/snix/castore/Cargo.toml +++ b/snix/castore/Cargo.toml @@ -1,7 +1,7 @@ [package] name = "snix-castore" version = "0.1.0" -edition = "2021" +edition = "2024" [dependencies] async-compression = { workspace = true, features = ["tokio", "zstd"] } diff --git a/snix/castore/src/blobservice/grpc.rs b/snix/castore/src/blobservice/grpc.rs index 8b1ab1d7f..c0f294b57 100644 --- a/snix/castore/src/blobservice/grpc.rs +++ b/snix/castore/src/blobservice/grpc.rs @@ -284,7 +284,7 @@ impl tokio::io::AsyncWrite for GRPCBlobWriter< io::ErrorKind::NotConnected, "already closed", ))), - Some((_, ref mut writer)) => { + Some((_, writer)) => { let pinned_writer = pin!(writer); pinned_writer.poll_write(cx, buf) } @@ -300,7 +300,7 @@ impl tokio::io::AsyncWrite for GRPCBlobWriter< io::ErrorKind::NotConnected, "already closed", ))), - Some((_, ref mut writer)) => { + Some((_, writer)) => { let pinned_writer = pin!(writer); pinned_writer.poll_flush(cx) } diff --git a/snix/castore/src/blobservice/memory.rs b/snix/castore/src/blobservice/memory.rs index 348b8bb56..0c8282145 100644 --- a/snix/castore/src/blobservice/memory.rs +++ b/snix/castore/src/blobservice/memory.rs @@ -99,7 +99,7 @@ impl tokio::io::AsyncWrite for MemoryBlobWriter { io::ErrorKind::NotConnected, "already closed", )), - Some((ref mut buf, ref mut hasher)) => { + Some((buf, hasher)) => { let bytes_written = buf.write(b)?; hasher.write(&b[..bytes_written]) } diff --git a/snix/castore/src/blobservice/object_store.rs b/snix/castore/src/blobservice/object_store.rs index b9a0e6404..37ece02a2 100644 --- a/snix/castore/src/blobservice/object_store.rs +++ b/snix/castore/src/blobservice/object_store.rs @@ -567,7 +567,7 @@ where None => { // called a second time, return self.fut_output. match self.fut_output.as_ref().unwrap() { - Ok(ref b3_digest) => Ok(b3_digest.clone()), + Ok(b3_digest) => Ok(b3_digest.clone()), Err(e) => Err(std::io::Error::new(e.kind(), e.to_string())), } } diff --git a/snix/castore/src/directoryservice/object_store.rs b/snix/castore/src/directoryservice/object_store.rs index ee253b588..979b85eca 100644 --- a/snix/castore/src/directoryservice/object_store.rs +++ b/snix/castore/src/directoryservice/object_store.rs @@ -129,7 +129,7 @@ impl DirectoryService for ObjectStoreDirectoryService { let stream = match object_store.get(&dir_path).await { Ok(v) => v.into_stream(), Err(object_store::Error::NotFound { .. }) => { - return Ok(Either::Left(futures::stream::empty())) + return Ok(Either::Left(futures::stream::empty())); } Err(e) => return Err(std::io::Error::from(e).into()), }; diff --git a/snix/castore/src/fs/inodes.rs b/snix/castore/src/fs/inodes.rs index 7f0364982..39d890d02 100644 --- a/snix/castore/src/fs/inodes.rs +++ b/snix/castore/src/fs/inodes.rs @@ -46,7 +46,7 @@ impl InodeData { InodeData::Regular(_, size, _) => *size, InodeData::Symlink(target) => target.len() as u64, InodeData::Directory(DirectoryInodeData::Sparse(_, size)) => *size, - InodeData::Directory(DirectoryInodeData::Populated(_, ref children)) => { + InodeData::Directory(DirectoryInodeData::Populated(_, children)) => { children.len() as u64 } }, diff --git a/snix/castore/src/import/mod.rs b/snix/castore/src/import/mod.rs index fa9c003b4..62a62d02f 100644 --- a/snix/castore/src/import/mod.rs +++ b/snix/castore/src/import/mod.rs @@ -89,7 +89,7 @@ where size: directory_size, } } - IngestionEntry::Symlink { ref target, .. } => Node::Symlink { + &mut IngestionEntry::Symlink { ref target, .. } => Node::Symlink { target: bytes::Bytes::copy_from_slice(target).try_into().map_err( |e: SymlinkTargetError| { IngestionError::UploadDirectoryError( diff --git a/snix/castore/src/nodes/directory.rs b/snix/castore/src/nodes/directory.rs index c836001f8..a9e8b36bd 100644 --- a/snix/castore/src/nodes/directory.rs +++ b/snix/castore/src/nodes/directory.rs @@ -115,7 +115,7 @@ fn check_insert_node( e.insert(node); } btree_map::Entry::Occupied(occupied) => { - return Err(DirectoryError::DuplicateName(occupied.key().to_owned())) + return Err(DirectoryError::DuplicateName(occupied.key().to_owned())); } } diff --git a/snix/castore/src/path/mod.rs b/snix/castore/src/path/mod.rs index 0b3ae620f..7a440dc7a 100644 --- a/snix/castore/src/path/mod.rs +++ b/snix/castore/src/path/mod.rs @@ -278,7 +278,7 @@ impl PathBuf { return Err(std::io::Error::new( std::io::ErrorKind::InvalidData, "found disallowed prefix or rootdir", - )) + )); } std::path::Component::CurDir => continue, // ignore std::path::Component::ParentDir => { diff --git a/snix/castore/src/proto/grpc_blobservice_wrapper.rs b/snix/castore/src/proto/grpc_blobservice_wrapper.rs index 86f5d7860..46a5da5f0 100644 --- a/snix/castore/src/proto/grpc_blobservice_wrapper.rs +++ b/snix/castore/src/proto/grpc_blobservice_wrapper.rs @@ -70,7 +70,9 @@ unsafe impl bytes::BufMut for BytesMutWithDefaultCapacity { } unsafe fn advance_mut(&mut self, cnt: usize) { - self.inner.advance_mut(cnt); + unsafe { + self.inner.advance_mut(cnt); + } } fn chunk_mut(&mut self) -> &mut bytes::buf::UninitSlice { diff --git a/snix/castore/src/proto/grpc_directoryservice_wrapper.rs b/snix/castore/src/proto/grpc_directoryservice_wrapper.rs index 62fdb34a2..c386d9324 100644 --- a/snix/castore/src/proto/grpc_directoryservice_wrapper.rs +++ b/snix/castore/src/proto/grpc_directoryservice_wrapper.rs @@ -36,7 +36,7 @@ where .ok_or_else(|| Status::invalid_argument("invalid by_what"))?; match by_what { - proto::get_directory_request::ByWhat::Digest(ref digest) => { + proto::get_directory_request::ByWhat::Digest(digest) => { let digest: B3Digest = digest .clone() .try_into()