feat: smol

.github/workflows/ci.yml

@@ -28,7 +28,7 @@ jobs:
     runs-on: ${{ matrix.os }}
     strategy:
       matrix:
-        rust: [1.70.0, stable]
+        rust: [1.81.0, stable]
         os: [ubuntu-latest, macOS-latest, windows-latest]
 
     steps:
@@ -42,9 +42,9 @@ jobs:
           override: true
       - name: Clippy
         run: cargo clippy -- -D warnings
-      - name: Check (async-std)
+      - name: Check (smol)
         run: cargo check --features link_to
-      - name: Run tests (async-std)
+      - name: Run tests (smol)
         run: cargo test --verbose  --features link_to
       - name: Check (Tokio)
         run: cargo check --no-default-features --features tokio-runtime,link_to

Cargo.toml

@@ -11,12 +11,12 @@ readme = "README.md"
 categories = ["caching", "filesystem"]
 
 [dependencies]
-async-std = { version = "1.10.0", features = ["unstable"], optional = true }
 digest = "0.10.6"
 either = "1.6.1"
 futures = { version = "0.3.17", optional = true }
 hex = "0.4.3"
 memmap2 = { version = "0.5.8", optional = true }
+smol = { version = "2.0.0", optional = true }
 miette = "5.7.0"
 reflink-copy = "0.1.9"
 serde = "1.0.130"
@@ -40,9 +40,10 @@ walkdir = "2.3.2"
 libc = { version = "0.2.144", optional = true }
 
 [dev-dependencies]
-async-attributes = { version = "1.1.2" }
 criterion = "0.4.0"
 lazy_static = "1.4.0"
+smol-macros = "0.1.1"
+macro_rules_attribute = "0.2.0"
 tokio = { version = "1.12.0", features = [
     "fs",
     "io-util",
@@ -56,8 +57,8 @@ name = "benchmarks"
 harness = false
 
 [features]
-default = ["async-std", "mmap"]
+default = ["smol-runtime", "mmap"]
 mmap = ["memmap2", "libc"]
-async-std = ["dep:async-std", "futures"]
 link_to = []
 tokio-runtime = ["tokio", "tokio-stream", "futures"]
+smol-runtime = ["smol", "futures"]

benches/benchmarks.rs

@@ -1,13 +1,10 @@
-#[cfg(feature = "async-std")]
-use async_std::fs as afs;
+#[cfg(feature = "smol")]
+use smol::fs as afs;
 #[cfg(feature = "link_to")]
 use std::path::PathBuf;
 #[cfg(all(test, feature = "tokio"))]
 use tokio::fs as afs;
 
-#[cfg(all(test, feature = "async-std"))]
-pub use async_std::task::block_on;
-
 #[cfg(all(test, feature = "tokio"))]
 lazy_static::lazy_static! {
     static ref TOKIO_RUNTIME: tokio::runtime::Runtime = tokio::runtime::Runtime::new().unwrap();
@@ -22,6 +19,15 @@ where
     TOKIO_RUNTIME.block_on(future)
 }
 
+#[cfg(all(test, feature = "smol"))]
+#[inline]
+pub fn block_on<F, T>(future: F) -> T
+where
+    F: std::future::Future<Output = T>,
+{
+    smol::block_on(future)
+}
+
 use std::fs::{self, File};
 use std::io::prelude::*;
 
@@ -62,7 +68,7 @@ fn baseline_read_many_sync(c: &mut Criterion) {
     });
 }
 
-#[cfg(any(feature = "async-std", feature = "tokio"))]
+#[cfg(any(feature = "tokio", feature = "smol"))]
 fn baseline_read_async(c: &mut Criterion) {
     let tmp = tempfile::tempdir().unwrap();
     let path = tmp.path().join("test_file");
@@ -75,7 +81,7 @@ fn baseline_read_async(c: &mut Criterion) {
     });
 }
 
-#[cfg(any(feature = "async-std", feature = "tokio"))]
+#[cfg(any(feature = "tokio", feature = "smol"))]
 fn baseline_read_many_async(c: &mut Criterion) {
     let tmp = tempfile::tempdir().unwrap();
     let paths: Vec<_> = (0..)
@@ -190,7 +196,7 @@ fn read_hash_sync_big_data_xxh3(c: &mut Criterion) {
     });
 }
 
-#[cfg(any(feature = "async-std", feature = "tokio"))]
+#[cfg(any(feature = "tokio", feature = "smol"))]
 fn read_hash_many_async(c: &mut Criterion) {
     let tmp = tempfile::tempdir().unwrap();
     let cache = tmp.path().to_owned();
@@ -212,7 +218,7 @@ fn read_hash_many_async(c: &mut Criterion) {
     });
 }
 
-#[cfg(any(feature = "async-std", feature = "tokio"))]
+#[cfg(any(feature = "tokio", feature = "smol"))]
 fn read_hash_async(c: &mut Criterion) {
     let tmp = tempfile::tempdir().unwrap();
     let cache = tmp.path().to_owned();
@@ -223,7 +229,7 @@ fn read_hash_async(c: &mut Criterion) {
     });
 }
 
-#[cfg(any(feature = "async-std", feature = "tokio"))]
+#[cfg(any(feature = "tokio", feature = "smol"))]
 fn read_async(c: &mut Criterion) {
     let tmp = tempfile::tempdir().unwrap();
     let cache = tmp.path().to_owned();
@@ -234,7 +240,7 @@ fn read_async(c: &mut Criterion) {
     });
 }
 
-#[cfg(any(feature = "async-std", feature = "tokio"))]
+#[cfg(any(feature = "tokio", feature = "smol"))]
 fn read_hash_async_big_data(c: &mut Criterion) {
     let tmp = tempfile::tempdir().unwrap();
     let cache = tmp.path().to_owned();
@@ -278,7 +284,7 @@ fn write_hash_xxh3(c: &mut Criterion) {
     });
 }
 
-#[cfg(any(feature = "async-std", feature = "tokio"))]
+#[cfg(any(feature = "tokio", feature = "smol"))]
 fn write_hash_async(c: &mut Criterion) {
     let tmp = tempfile::tempdir().unwrap();
     let cache = tmp.path().to_owned();
@@ -293,7 +299,7 @@ fn write_hash_async(c: &mut Criterion) {
     });
 }
 
-#[cfg(any(feature = "async-std", feature = "tokio"))]
+#[cfg(any(feature = "tokio", feature = "smol"))]
 fn write_hash_async_xxh3(c: &mut Criterion) {
     let tmp = tempfile::tempdir().unwrap();
     let cache = tmp.path().to_owned();
@@ -325,7 +331,7 @@ fn create_tmpfile(tmp: &tempfile::TempDir, buf: &[u8]) -> PathBuf {
 }
 
 #[cfg(feature = "link_to")]
-#[cfg(any(feature = "async-std", feature = "tokio"))]
+#[cfg(any(feature = "tokio", feature = "smol"))]
 fn link_to_async(c: &mut Criterion) {
     let tmp = tempfile::tempdir().unwrap();
     let target = create_tmpfile(&tmp, b"hello world");
@@ -348,7 +354,7 @@ fn link_to_async(c: &mut Criterion) {
     });
 }
 
-#[cfg(all(feature = "link_to", any(feature = "async-std", feature = "tokio")))]
+#[cfg(all(feature = "link_to", any(feature = "tokio", feature = "smol")))]
 fn link_to_hash_async(c: &mut Criterion) {
     let tmp = tempfile::tempdir().unwrap();
     let target = create_tmpfile(&tmp, b"hello world");
@@ -405,7 +411,7 @@ criterion_group!(
     read_hash_sync_big_data_xxh3,
 );
 
-#[cfg(any(feature = "async-std", feature = "tokio"))]
+#[cfg(any(feature = "tokio", feature = "smol"))]
 criterion_group!(
     benches_async,
     baseline_read_async,
@@ -418,23 +424,17 @@ criterion_group!(
     read_hash_async_big_data,
 );
 
-#[cfg(all(feature = "link_to", any(feature = "async-std", feature = "tokio")))]
+#[cfg(all(feature = "link_to", any(feature = "tokio", feature = "smol")))]
 criterion_group!(link_to_benches_async, link_to_async, link_to_hash_async,);
 
 #[cfg(feature = "link_to")]
 criterion_group!(link_to_benches, link_to_sync, link_to_hash_sync);
 
-#[cfg(all(
-    feature = "link_to",
-    not(any(feature = "async-std", feature = "tokio"))
-))]
+#[cfg(all(feature = "link_to", not(any(feature = "tokio", feature = "smol"))))]
 criterion_main!(benches, link_to_benches);
-#[cfg(all(
-    not(feature = "link_to"),
-    any(feature = "async-std", feature = "tokio")
-))]
+#[cfg(all(not(feature = "link_to"), any(feature = "tokio", feature = "smol")))]
 criterion_main!(benches, benches_async);
-#[cfg(all(feature = "link_to", any(feature = "async-std", feature = "tokio")))]
+#[cfg(all(feature = "link_to", any(feature = "tokio", feature = "smol")))]
 criterion_main!(
     benches,
     benches_async,
@@ -443,6 +443,6 @@ criterion_main!(
 );
 #[cfg(all(
     not(feature = "link_to"),
-    not(any(feature = "async-std", feature = "tokio"))
+    not(any(feature = "tokio", feature = "smol"))
 ))]
 criterion_main!(benches);

justfile

@@ -2,23 +2,23 @@
 @help:
     just -l
 
-# Run tests on both runtimes with cargo nextest
+# Run tests on all runtimes with cargo nextest
 @test:
-    echo "----------\nasync-std:\n"
+    echo "----------\nsmol:\n"
     cargo nextest run
     echo "\n----------\ntokio:\n"
     cargo nextest run --no-default-features --features tokio-runtime
 
 # Run benchmarks with `cargo bench`
 @bench:
-    echo "----------\nasync-std:\n"
+    echo "----------\nsmol:\n"
     cargo bench
     echo "\n----------\ntokio:\n"
     cargo bench --no-default-features --features tokio-runtime
 
 # Run benchmarks with `cargo criterion`
 @criterion:
-    echo "----------\nasync-std:\n"
+    echo "----------\nsmol:\n"
     cargo criterion
     echo "\n----------\ntokio:\n"
     cargo criterion --no-default-features --features tokio-runtime