From 90e2d22ebaf36dc12cd50d2983208863f10b1160 Mon Sep 17 00:00:00 2001 From: Jonas Bostoen Date: Tue, 6 May 2025 16:33:25 +0200 Subject: [PATCH 1/2] deps: update deps --- Cargo.lock | 26 +++++++++++++------------- Cargo.toml | 10 ++++++---- 2 files changed, 19 insertions(+), 17 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 15e76ee..e7b8963 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -788,9 +788,9 @@ dependencies = [ [[package]] name = "hermit-abi" -version = "0.3.5" +version = "0.3.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d0c62115964e08cb8039170eb33c1d0e2388a256930279edca206fff675f82c3" +checksum = "d231dfb89cfffdbc30e7fc41579ed6066ad03abda9e567ccafae602b97ec5024" [[package]] name = "hex" @@ -1048,7 +1048,7 @@ version = "1.16.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "4161fcb6d602d4d2081af7c3a45852d875a03dd337a6bfdd6e06407b61342a43" dependencies = [ - "hermit-abi 0.3.5", + "hermit-abi 0.3.9", "libc", ] @@ -1087,9 +1087,9 @@ checksum = "bb813b8af86854136c6922af0598d719255ecb2179515e6e7730d468f05c9cae" [[package]] name = "parking_lot" -version = "0.12.1" +version = "0.12.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3742b2c103b9f06bc9fff0a37ff4912935851bee6d36f3c02bcc755bcfec228f" +checksum = "f1bf18183cf54e8d6059647fc3063646a1801cf30896933ec2311622cc4b9a27" dependencies = [ "lock_api", "parking_lot_core", @@ -1097,15 +1097,15 @@ dependencies = [ [[package]] name = "parking_lot_core" -version = "0.9.9" +version = "0.9.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4c42a9226546d68acdd9c0a280d17ce19bfe27a46bf68784e4066115788d008e" +checksum = "1e401f977ab385c9e4e3ab30627d6f26d00e2c73eef317493c4ec6d468726cf8" dependencies = [ "cfg-if", "libc", "redox_syscall", "smallvec", - "windows-targets 0.48.5", + "windows-targets 0.52.0", ] [[package]] @@ -1351,11 +1351,11 @@ dependencies = [ [[package]] name = "redox_syscall" -version = "0.4.1" +version = "0.5.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4722d768eff46b75989dd134e5c353f0d6296e5aaa3132e776cbdb56be7731aa" +checksum = "928fca9cf2aa042393a8325b9ead81d2f0df4cb12e1e24cef072922ccd99c5af" dependencies = [ - "bitflags 1.3.2", + "bitflags 2.4.2", ] [[package]] @@ -1557,9 +1557,9 @@ checksum = "0fda2ff0d084019ba4d7c6f371c95d8fd75ce3524c3cb8fb653a3023f6323e64" [[package]] name = "signal-hook-registry" -version = "1.4.1" +version = "1.4.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d8229b473baa5980ac72ef434c4415e70c4b5e71b423043adb4ba059f89c99a1" +checksum = "9203b8055f63a2a00e2f593bb0510367fe707d7ff1e5c872de2f537b339e5410" dependencies = [ "libc", ] diff --git a/Cargo.toml b/Cargo.toml index 92cd71a..4aba997 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -23,16 +23,18 @@ self_cell = { version = "1" } iroh-io = { version = "0.6.2", default-features = false, optional = true } positioned-io = { version = "0.3.1", default-features = false } genawaiter = { version = "0.99.1", features = ["futures03"], optional = true } -tokio = { version = "1", features = ["sync"], default-features = false, optional = true } +tokio = { version = "1", features = [ + "sync", +], default-features = false, optional = true } blake3 = { version = "1.8" } serde = { version = "1", features = ["derive"], optional = true } [features] serde = ["dep:serde", "bytes/serde"] -tokio_fsm = ["dep:futures-lite", "dep:iroh-io"] +fsm = ["dep:futures-lite", "dep:iroh-io"] validate = ["dep:genawaiter"] experimental-mixed = ["dep:tokio", "dep:serde"] -default = ["tokio_fsm", "validate", "serde"] +default = ["fsm", "validate", "serde"] [dev-dependencies] hex = "0.4.3" @@ -63,4 +65,4 @@ all-features = true [[example]] name = "cli" -required-features = ["tokio_fsm"] +required-features = ["fsm"] From 42500df2705d0d0a0638672098d7b0ba1fed0e28 Mon Sep 17 00:00:00 2001 From: Jonas Bostoen Date: Tue, 6 May 2025 16:34:11 +0200 Subject: [PATCH 2/2] chore: rename `tokio-fsm` -> `fsm` feature --- src/io/error.rs | 4 ++-- src/io/mod.rs | 2 +- src/io/outboard.rs | 12 ++++++------ src/lib.rs | 6 +++--- src/rec.rs | 16 ++++++++-------- src/tests.rs | 2 +- 6 files changed, 21 insertions(+), 21 deletions(-) diff --git a/src/io/error.rs b/src/io/error.rs index 9e1f057..efb1fe0 100644 --- a/src/io/error.rs +++ b/src/io/error.rs @@ -161,7 +161,7 @@ impl From for EncodeError { } impl EncodeError { - #[cfg(feature = "tokio_fsm")] + #[cfg(feature = "fsm")] pub(crate) fn maybe_parent_write(e: io::Error, node: TreeNode) -> Self { if e.kind() == io::ErrorKind::ConnectionReset { Self::ParentWrite(node) @@ -170,7 +170,7 @@ impl EncodeError { } } - #[cfg(feature = "tokio_fsm")] + #[cfg(feature = "fsm")] pub(crate) fn maybe_leaf_write(e: io::Error, chunk: ChunkNum) -> Self { if e.kind() == io::ErrorKind::ConnectionReset { Self::LeafWrite(chunk) diff --git a/src/io/mod.rs b/src/io/mod.rs index 440018f..b42a5c2 100644 --- a/src/io/mod.rs +++ b/src/io/mod.rs @@ -8,7 +8,7 @@ mod error; pub use error::*; use range_collections::{range_set::RangeSetRange, RangeSetRef}; -#[cfg(feature = "tokio_fsm")] +#[cfg(feature = "fsm")] pub mod fsm; #[cfg(feature = "experimental-mixed")] pub mod mixed; diff --git a/src/io/outboard.rs b/src/io/outboard.rs index 327456f..0cf27a4 100644 --- a/src/io/outboard.rs +++ b/src/io/outboard.rs @@ -35,7 +35,7 @@ impl crate::io::sync::Outboard for EmptyOutboard { } } -#[cfg(feature = "tokio_fsm")] +#[cfg(feature = "fsm")] impl crate::io::fsm::Outboard for EmptyOutboard { fn root(&self) -> blake3::Hash { self.root @@ -70,7 +70,7 @@ impl crate::io::sync::OutboardMut for EmptyOutboard { } } -#[cfg(feature = "tokio_fsm")] +#[cfg(feature = "fsm")] impl crate::io::fsm::OutboardMut for EmptyOutboard { async fn save( &mut self, @@ -242,7 +242,7 @@ impl> crate::io::sync::Outboard for PostOrderMemOutboard { } } -#[cfg(feature = "tokio_fsm")] +#[cfg(feature = "fsm")] impl> crate::io::fsm::Outboard for PostOrderMemOutboard { fn root(&self) -> blake3::Hash { self.root @@ -277,7 +277,7 @@ impl> crate::io::sync::OutboardMut for PostOrderMemOutboard { } } -#[cfg(feature = "tokio_fsm")] +#[cfg(feature = "fsm")] impl> crate::io::fsm::OutboardMut for PostOrderMemOutboard { async fn save( &mut self, @@ -432,7 +432,7 @@ impl> crate::io::sync::OutboardMut for PreOrderMemOutboard { } } -#[cfg(feature = "tokio_fsm")] +#[cfg(feature = "fsm")] impl> crate::io::fsm::Outboard for PreOrderMemOutboard { fn root(&self) -> blake3::Hash { self.root @@ -445,7 +445,7 @@ impl> crate::io::fsm::Outboard for PreOrderMemOutboard { } } -#[cfg(feature = "tokio_fsm")] +#[cfg(feature = "fsm")] impl> crate::io::fsm::OutboardMut for PreOrderMemOutboard { async fn save( &mut self, diff --git a/src/lib.rs b/src/lib.rs index b0d8ec1..8aeff6d 100644 --- a/src/lib.rs +++ b/src/lib.rs @@ -216,9 +216,9 @@ pub use tree::{BlockSize, ChunkNum}; pub mod io; pub use blake3; -#[cfg(all(test, feature = "tokio_fsm"))] +#[cfg(all(test, feature = "fsm"))] mod tests; -#[cfg(all(test, feature = "tokio_fsm"))] +#[cfg(all(test, feature = "fsm"))] mod tests2; /// A set of chunk ranges @@ -578,7 +578,7 @@ impl TreeNode { /// /// This is a bridge from the recursive reference implementation to the node /// based implementations, and is therefore only used in tests. - #[cfg(all(test, feature = "tokio_fsm"))] + #[cfg(all(test, feature = "fsm"))] fn from_start_chunk_and_level(start_chunk: ChunkNum, level: BlockSize) -> Self { let start_chunk = start_chunk.0; let level = level.0; diff --git a/src/rec.rs b/src/rec.rs index 4673991..6159cfc 100644 --- a/src/rec.rs +++ b/src/rec.rs @@ -31,7 +31,7 @@ pub fn truncate_ranges(ranges: &ChunkRangesRef, size: u64) -> &ChunkRangesRef { /// A version of [canonicalize_ranges] that takes and returns an owned [ChunkRanges]. /// /// This is needed for the state machines that own their ranges. -#[cfg(feature = "tokio_fsm")] +#[cfg(feature = "fsm")] pub fn truncate_ranges_owned(ranges: crate::ChunkRanges, size: u64) -> crate::ChunkRanges { let n = truncated_len(&ranges, size); let mut boundaries = ranges.into_inner(); @@ -163,7 +163,7 @@ pub(crate) fn encode_selected_rec( #[cfg(test)] mod test_support { - #[cfg(feature = "tokio_fsm")] + #[cfg(feature = "fsm")] use { crate::{split_inner, TreeNode}, range_collections::{range_set::RangeSetEntry, RangeSet2}, @@ -188,7 +188,7 @@ mod test_support { /// within the query range. /// /// To disable chunk groups entirely, just set both `tree_level` and `min_full_level` to 0. - #[cfg(feature = "tokio_fsm")] + #[cfg(feature = "fsm")] pub(crate) fn select_nodes_rec<'a>( start_chunk: ChunkNum, size: usize, @@ -296,7 +296,7 @@ mod test_support { /// Reference implementation of the response iterator, using just the simple recursive /// implementation [select_nodes_rec]. - #[cfg(feature = "tokio_fsm")] + #[cfg(feature = "fsm")] pub(crate) fn partial_chunk_iter_reference( tree: BaoTree, ranges: &ChunkRangesRef, @@ -317,7 +317,7 @@ mod test_support { /// Reference implementation of the response iterator, using just the simple recursive /// implementation [select_nodes_rec]. - #[cfg(feature = "tokio_fsm")] + #[cfg(feature = "fsm")] pub(crate) fn response_iter_reference(tree: BaoTree, ranges: &ChunkRangesRef) -> Vec { let mut res = Vec::new(); select_nodes_rec( @@ -345,7 +345,7 @@ mod test_support { impl<'a> ReferencePreOrderPartialChunkIterRef<'a> { /// Create a new iterator over the tree. - #[cfg(feature = "tokio_fsm")] + #[cfg(feature = "fsm")] pub fn new(tree: BaoTree, ranges: &'a ChunkRangesRef, min_full_level: u8) -> Self { let iter = partial_chunk_iter_reference(tree, ranges, min_full_level).into_iter(); Self { iter, tree } @@ -380,7 +380,7 @@ mod test_support { /// Compute the union of an iterator of ranges. The ranges should be non-overlapping, otherwise /// the result is None - #[cfg(feature = "tokio_fsm")] + #[cfg(feature = "fsm")] pub fn range_union( ranges: impl IntoIterator>, ) -> Option> { @@ -395,7 +395,7 @@ mod test_support { Some(res) } - #[cfg(feature = "tokio_fsm")] + #[cfg(feature = "fsm")] pub fn get_leaf_ranges( iter: impl IntoIterator>, ) -> impl Iterator> { diff --git a/src/tests.rs b/src/tests.rs index a5271bf..95b5ed2 100644 --- a/src/tests.rs +++ b/src/tests.rs @@ -126,7 +126,7 @@ fn bao_tree_decode_slice_iter_impl(data: Vec, range: Range) { } } -#[cfg(feature = "tokio_fsm")] +#[cfg(feature = "fsm")] mod fsm_tests { use super::*;