diff --git a/Cargo.lock b/Cargo.lock index bb17ea5..498cfda 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -1213,6 +1213,12 @@ version = "0.1.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d9c4f5dac5e15c24eb999c26181a6ca40b39fe946cbe4c263c7209467bc83af2" +[[package]] +name = "foldhash" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "77ce24cb58228fbb8aa041425bb1050850ac19177686ea6e0f41a70416f56fdb" + [[package]] name = "foreign-types" version = "0.3.2" @@ -1515,7 +1521,7 @@ checksum = "9229cfe53dfd69f0609a49f65461bd93001ea1ef889cd5529dd176593f5338a1" dependencies = [ "allocator-api2", "equivalent", - "foldhash", + "foldhash 0.1.5", ] [[package]] @@ -1523,6 +1529,11 @@ name = "hashbrown" version = "0.16.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "841d1cc9bed7f9236f321df977030373f4a4163ae1a7dbfe1a51a2c1a51d9100" +dependencies = [ + "allocator-api2", + "equivalent", + "foldhash 0.2.0", +] [[package]] name = "hashlink" @@ -2070,9 +2081,9 @@ checksum = "6800badb6cb2082ffd7b6a67e6125bb39f18782f793520caee8cb8846be06112" [[package]] name = "libfuse-fs" -version = "0.1.12" +version = "0.1.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c5aa54193dd60028e43274b0e43fd2b68629af72714589820d1f50b97f0a8f85" +checksum = "d61be2a0235d6a5ba30064c172f12d5465da0f013281a0e6675604d0781496e9" dependencies = [ "async-trait", "bitflags 2.11.0", @@ -2082,6 +2093,7 @@ dependencies = [ "futures-util", "itertools 0.14.0", "libc", + "lru", "memmap2", "moka", "nix", @@ -2180,6 +2192,15 @@ version = "0.4.29" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "5e5032e24019045c762d3c0f28f5b6b8bbf38563a65908389bf7978758920897" +[[package]] +name = "lru" +version = "0.16.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7f66e8d5d03f609abc3a39e6f08e4164ebf1447a732906d39eb9b99b7919ef39" +dependencies = [ + "hashbrown 0.16.1", +] + [[package]] name = "lru-mem" version = "0.3.0" @@ -3269,9 +3290,9 @@ dependencies = [ [[package]] name = "rfuse3" -version = "0.0.7" +version = "0.0.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "854bcb0ce09254f1e597c2c810b297576b7372b55b6dc7407bfdf79d91ec7f3f" +checksum = "c5d7bea55817b58bd3a706ac0671f9aedc06d2d91e2f68272bd4fbe62f817d2b" dependencies = [ "aligned_box", "async-notify", diff --git a/Cargo.toml b/Cargo.toml index 2014f4f..bd42da3 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "scorpiofs" -version = "0.2.1" +version = "0.2.2" edition = "2021" description = "FUSE-based virtual filesystem with Antares overlay for monorepo builds" license = "MIT OR Apache-2.0" @@ -22,7 +22,7 @@ reqwest = { version = "0.13.1", features = ["json", "blocking"] } serde = { version = "1.0.228", features = ["derive"] } tokio = { version = "1.49.0", features = ["full"] } axum = { version = "0.8.8", features = ["macros"] } -rfuse3 = { version = "0.0.7", features = ["tokio-runtime", "unprivileged", "file-lock"] } +rfuse3 = { version = "0.0.8", features = ["tokio-runtime", "unprivileged", "file-lock"] } clap = { version = "4.5.57", features = ["derive"] } toml = "0.9.8" @@ -39,7 +39,7 @@ async-recursion = "1.1.1" bytes = "1.11.1" futures = "0.3.31" uuid = { version = "1.20.0", features = ["v4"] } -libfuse-fs = { version = "0.1.12"} +libfuse-fs = { version = "0.1.13"} whoami = "1.6.0" thiserror = "2.0.18" crossbeam = "0.8.4" diff --git a/src/antares/fuse.rs b/src/antares/fuse.rs index c1efbdc..1bc43bf 100644 --- a/src/antares/fuse.rs +++ b/src/antares/fuse.rs @@ -645,9 +645,7 @@ mod tests { } } - Ok(ReplyDirectory { - entries: iter(out.into_iter()), - }) + Ok(ReplyDirectory { entries: iter(out) }) } async fn releasedir( diff --git a/src/dicfuse/async_io.rs b/src/dicfuse/async_io.rs index 8971c39..c7524fd 100644 --- a/src/dicfuse/async_io.rs +++ b/src/dicfuse/async_io.rs @@ -675,9 +675,7 @@ impl Filesystem for Dicfuse { })); } } - Ok(ReplyDirectory { - entries: iter(d.into_iter()), - }) + Ok(ReplyDirectory { entries: iter(d) }) } async fn readdirplus<'a>( @@ -797,9 +795,7 @@ impl Filesystem for Dicfuse { })); } } - Ok(ReplyDirectoryPlus { - entries: iter(d.into_iter()), - }) + Ok(ReplyDirectoryPlus { entries: iter(d) }) } async fn create(