act-cli 0.8.0__tar.gz → 0.8.2__tar.gz

{act_cli-0.8.0 → act_cli-0.8.2}/Cargo.lock

@@ -4,7 +4,7 @@ version = 4
 
 [[package]]
 name = "act-build"
-version = "0.8.0"
+version = "0.8.2"
 dependencies = [
  "act-types",
  "anyhow",
@@ -14,11 +14,13 @@ dependencies = [
  "dirs",
  "flate2",
  "globset",
+ "http",
  "include_dir",
  "json-patch",
  "minijinja",
  "oci-client",
- "reqwest 0.13.3",
+ "olpc-cjson",
+ "reqwest 0.13.4",
  "serde",
  "serde_json",
  "sha2 0.11.0",
@@ -35,7 +37,7 @@ dependencies = [
 
 [[package]]
 name = "act-cli"
-version = "0.8.0"
+version = "0.8.2"
 dependencies = [
  "act-store",
  "act-types",
@@ -43,6 +45,7 @@ dependencies = [
  "axum",
  "base64",
  "bytes",
+ "bytesize",
  "ciborium",
  "cidr",
  "clap",
@@ -58,7 +61,7 @@ dependencies = [
  "owo-colors",
  "path-clean",
  "regex",
- "reqwest 0.13.3",
+ "reqwest 0.13.4",
  "rmcp",
  "serde",
  "serde_json",
@@ -81,11 +84,11 @@ dependencies = [
 
 [[package]]
 name = "act-store"
-version = "0.1.0"
+version = "0.1.1"
 dependencies = [
  "chrono",
  "dirs",
- "fs2",
+ "fs4",
  "oci-client",
  "oci-spec",
  "regex",
@@ -326,9 +329,9 @@ checksum = "72b3254f16251a8381aa12e40e3c4d2f0199f8c6508fbecb9d91f575e0fbb8c6"
 
 [[package]]
 name = "bitflags"
-version = "2.11.1"
+version = "2.12.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c4512299f36f043ab09a583e57bceb5a5aab7a73db1805848e8fef3c9e8c78b3"
+checksum = "84d7ced0ae9557296835c32bf1b1e02b44c746701f898460fb000d7eaa84f00a"
 
 [[package]]
 name = "block-buffer"
@@ -382,6 +385,12 @@ version = "1.11.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "1e748733b7cbc798e1434b6ac524f0c1ff2ab456fe201501e6497c8417a4fc33"
 
+[[package]]
+name = "bytesize"
+version = "2.3.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "6bd91ee7b2422bcb158d90ef4d14f75ef67f340943fc4149891dcce8f8b972a3"
+
 [[package]]
 name = "cap-fs-ext"
 version = "3.4.5"
@@ -452,9 +461,9 @@ dependencies = [
 
 [[package]]
 name = "cc"
-version = "1.2.62"
+version = "1.2.63"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a1dce859f0832a7d088c4f1119888ab94ef4b5d6795d1ce05afb7fe159d79f98"
+checksum = "556e016178bb5662a08681bbe0f00f8e17631781a4dfc8c45e466e4b185ec27f"
 dependencies = [
  "find-msvc-tools",
  "jobserver",
@@ -1073,9 +1082,9 @@ dependencies = [
 
 [[package]]
 name = "displaydoc"
-version = "0.2.5"
+version = "0.2.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "97369cbbc041bc366949bc74d34658d6cda5621039731c6310521892a3a20ae0"
+checksum = "1ac70aa55017e108007fbaf5aa0f54b021c98f92ff8af59d42eda9da96e3dd4f"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -1226,13 +1235,13 @@ dependencies = [
 ]
 
 [[package]]
-name = "fs2"
-version = "0.4.3"
+name = "fs4"
+version = "1.1.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9564fc758e15025b46aa6643b1b77d047d1a56a1aea6e01002ac0c7026876213"
+checksum = "7e72ed92b67c146290f88e9c89d60ca163ea417a446f61ffd7b72df3e7f1dfd5"
 dependencies = [
- "libc",
- "winapi",
+ "rustix",
+ "windows-sys 0.61.2",
 ]
 
 [[package]]
@@ -1513,9 +1522,9 @@ checksum = "7f24254aa9a54b5c858eaee2f5bccdb46aaf0e486a595ed5fd8f86ba55232a70"
 
 [[package]]
 name = "http"
-version = "1.4.0"
+version = "1.4.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e3ba2a386d7f85a81f119ad7498ebe444d2e22c2af0b86b069416ace48b3311a"
+checksum = "8be7462df143984c4598a256ef469b251d7d7f9e271135073e78fc535414f3d0"
 dependencies = [
  "bytes",
  "itoa",
@@ -1576,9 +1585,9 @@ dependencies = [
 
 [[package]]
 name = "hyper"
-version = "1.9.0"
+version = "1.10.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6299f016b246a94207e63da54dbe807655bf9e00044f73ded42c3ac5305fbcca"
+checksum = "55281c53a1894c864990125767da440a4e630446785086f52523b20033b74498"
 dependencies = [
  "atomic-waker",
  "bytes",
@@ -2059,9 +2068,9 @@ checksum = "b6d2cec3eae94f9f509c767b45932f1ada8350c4bdb85af2fcab4a3c14807981"
 
 [[package]]
 name = "libredox"
-version = "0.1.16"
+version = "0.1.17"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e02f3bb43d335493c96bf3fd3a321600bf6bd07ed34bc64118e9293bdffea46c"
+checksum = "f02ab6bace2054fb888a3c16f990117b579d14a3088e472d63c6011fa185c9d3"
 dependencies = [
  "libc",
 ]
@@ -2089,9 +2098,9 @@ dependencies = [
 
 [[package]]
 name = "log"
-version = "0.4.29"
+version = "0.4.31"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5e5032e24019045c762d3c0f28f5b6b8bbf38563a65908389bf7978758920897"
+checksum = "113b30b4cd05f7c06868fdb2854f66a7b9fece9a48425351cd532e810d74024f"
 
 [[package]]
 name = "lru-slab"
@@ -2131,9 +2140,9 @@ checksum = "4facc753ae494aeb6e3c22f839b158aebd4f9270f55cd3c79906c45476c47ab4"
 
 [[package]]
 name = "memchr"
-version = "2.8.0"
+version = "2.8.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f8ca58f447f06ed17d5fc4043ce1b10dd205e060fb3ce5b979b8ed8e59ff3f79"
+checksum = "6b947ae49db0d222b1dbc6b113ce7248a3fc3a6ca21b696717bfc000ba4484d8"
 
 [[package]]
 name = "memfd"
@@ -2178,9 +2187,9 @@ dependencies = [
 
 [[package]]
 name = "mio"
-version = "1.2.0"
+version = "1.2.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "50b7e5b27aa02a74bac8c3f23f448f8d87ff11f92d3aac1a6ed369ee08cc56c1"
+checksum = "02bd0af71c67b473010cbbc60715ee815645a4dc942899111f494b4b737d6fda"
 dependencies = [
  "libc",
  "wasi",
@@ -2252,7 +2261,7 @@ dependencies = [
  "oci-spec",
  "olpc-cjson",
  "regex",
- "reqwest 0.13.3",
+ "reqwest 0.13.4",
  "serde",
  "serde_json",
  "sha2 0.11.0",
@@ -2793,9 +2802,9 @@ dependencies = [
 
 [[package]]
 name = "reqwest"
-version = "0.13.3"
+version = "0.13.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "62e0021ea2c22aed41653bc7e1419abb2c97e038ff2c33d0e1309e49a97deec0"
+checksum = "219c5811de6525e5416c7d5d53bb656d3afdbc6c5af816e0802bcfa42dbdc1c3"
 dependencies = [
  "base64",
  "bytes",
@@ -2953,9 +2962,9 @@ dependencies = [
 
 [[package]]
 name = "rustls-native-certs"
-version = "0.8.3"
+version = "0.8.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "612460d5f7bea540c490b2b6395d8e34a953e52b491accd6c86c8164c5932a63"
+checksum = "dab5152771c58876a2146916e53e35057e1a4dfa2b9df0f0305b07f611fdea4d"
 dependencies = [
  "openssl-probe",
  "rustls-pki-types",
@@ -3279,9 +3288,9 @@ dependencies = [
 
 [[package]]
 name = "shlex"
-version = "1.3.0"
+version = "2.0.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0fda2ff0d084019ba4d7c6f371c95d8fd75ce3524c3cb8fb653a3023f6323e64"
+checksum = "f8fadd59c855ef2080decdef8ff161eb6661b86933c9d82e5ba29dc602a55aba"
 
 [[package]]
 name = "signal-hook-registry"
@@ -3341,9 +3350,9 @@ dependencies = [
 
 [[package]]
 name = "socket2"
-version = "0.6.3"
+version = "0.6.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3a766e1110788c36f4fa1c2b71b387a7815aa65f88ce0229841826633d93723e"
+checksum = "52d1cfed4120b4d927bf7c0f86d2087a4a7d6027c906d9f9d525a80573b9be51"
 dependencies = [
  "libc",
  "windows-sys 0.61.2",
@@ -3833,9 +3842,9 @@ checksum = "e421abadd41a4225275504ea4d6566923418b7f05506fbc9c0fe86ba7396114b"
 
 [[package]]
 name = "typenum"
-version = "1.20.0"
+version = "1.20.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "40ce102ab67701b8526c123c1bab5cbe42d7040ccfd0f64af1a385808d2f43de"
+checksum = "b6f5e870be6c3b371b77fe0ee0bafb859fa4964b4404c27de1d380043c4dda20"
 
 [[package]]
 name = "unicase"
@@ -3914,9 +3923,9 @@ checksum = "06abde3611657adf66d383f00b093d7faecc7fa57071cce2578660c9f1010821"
 
 [[package]]
 name = "uuid"
-version = "1.23.1"
+version = "1.23.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ddd74a9687298c6858e9b88ec8935ec45d22e8fd5e6394fa1bd4e99a87789c76"
+checksum = "d258b83ceec21034727ecee8c382cfa6c3e133699b0742c64571814fb420c9f7"
 dependencies = [
  "getrandom 0.4.2",
  "js-sys",
@@ -4080,6 +4089,16 @@ dependencies = [
  "wasmparser 0.250.0",
 ]
 
+[[package]]
+name = "wasm-encoder"
+version = "0.251.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5a879a421bd17c528b74721b2abf4c62e8f1d1889c2ba8c3c50d02deaf2ce395"
+dependencies = [
+ "leb128fmt",
+ "wasmparser 0.251.0",
+]
+
 [[package]]
 name = "wasm-metadata"
 version = "0.244.0"
@@ -4143,6 +4162,17 @@ dependencies = [
  "serde",
 ]
 
+[[package]]
+name = "wasmparser"
+version = "0.251.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "437970b35b1a85cfde9c74b2398352d8d653f3bd8e3a3db0c063ea8f5b4b36ff"
+dependencies = [
+ "bitflags",
+ "indexmap 2.14.0",
+ "semver",
+]
+
 [[package]]
 name = "wasmprinter"
 version = "0.248.0"
@@ -4477,22 +4507,22 @@ dependencies = [
 
 [[package]]
 name = "wast"
-version = "250.0.0"
+version = "251.0.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "69e9294a1f0204aeb5c47e95165517f43ef3cc895918c4f3e939380d4c290f4a"
+checksum = "5cc7467dda0a96142eb2c980329dfb62480b1e1d3622fdeb1a44e2bca6ceed74"
 dependencies = [
  "bumpalo",
  "leb128fmt",
  "memchr",
  "unicode-width",
- "wasm-encoder 0.250.0",
+ "wasm-encoder 0.251.0",
 ]
 
 [[package]]
 name = "wat"
-version = "1.250.0"
+version = "1.251.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0a549ed329a70e444e0f7796391ab2a87d0aef30ddde9f60e16e429224fafd02"
+checksum = "81b1086c9e85b95bd6a229a928bc6c6d0662e42af0250c88d067b418831ea4d4"
 dependencies = [
  "wast",
 ]
@@ -5036,18 +5066,18 @@ dependencies = [
 
 [[package]]
 name = "zerocopy"
-version = "0.8.48"
+version = "0.8.50"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "eed437bf9d6692032087e337407a86f04cd8d6a16a37199ed57949d415bd68e9"
+checksum = "3b065d4f0e55f82fae73202e189638116a87c55ab6b8e6c2721e13dd9d854ad1"
 dependencies = [
  "zerocopy-derive",
 ]
 
 [[package]]
 name = "zerocopy-derive"
-version = "0.8.48"
+version = "0.8.50"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "70e3cd084b1788766f53af483dd21f93881ff30d7320490ec3ef7526d203bad4"
+checksum = "0b631b19d36a892ab55420c92dbc83ccd79274f25be714855d3074aa71cab639"
 dependencies = [
  "proc-macro2",
  "quote",

{act_cli-0.8.0 → act_cli-0.8.2}/Cargo.toml

@@ -3,7 +3,7 @@ members = ["act-cli", "crates/act-store"]
 resolver = "3"
 
 [workspace.package]
-version = "0.8.0"
+version = "0.8.2"
 edition = "2024"
 license = "MIT OR Apache-2.0"
 repository = "https://github.com/actcore/act-cli"

{act_cli-0.8.0 → act_cli-0.8.2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: act-cli
-Version: 0.8.0
+Version: 0.8.2
 Classifier: Development Status :: 4 - Beta
 Classifier: Environment :: Console
 Classifier: Intended Audience :: Developers

{act_cli-0.8.0 → act_cli-0.8.2}/act-cli/Cargo.toml

@@ -57,6 +57,7 @@ globset = "0.4"
 path-clean = "1"
 owo-colors = { version = "4.3.0", features = ["supports-colors"] }
 act-store = { version = "0.1.0", path = "../crates/act-store" }
+bytesize = "2.3.1"
 
 [dev-dependencies]
 tempfile = "3"

{act_cli-0.8.0 → act_cli-0.8.2}/act-cli/src/main.rs

@@ -55,6 +55,12 @@ struct CommonOpts {
     #[arg(long = "deny-socket")]
     sockets_deny: Vec<String>,
 
+    /// Cap the component's wasm linear memory. Accepts a byte count or a size
+    /// with a unit — binary (`512MiB`) or decimal (`512MB`). Growth past the cap
+    /// fails inside the guest instead of ballooning the host process.
+    #[arg(long = "max-memory", value_parser = parse_max_memory)]
+    max_memory: Option<usize>,
+
     /// Use a named profile from the config file
     #[arg(long)]
     profile: Option<String>,
@@ -318,6 +324,22 @@ fn parse_cli_metadata(
     }
 }
 
+/// Parse a `--max-memory` value via the `bytesize` crate: a byte count or a
+/// size with a unit, decimal (`512MB` = 512·10⁶) or binary (`512MiB` = 512·2²⁰).
+fn parse_max_memory(s: &str) -> Result<usize, String> {
+    let bytes = s
+        .trim()
+        .parse::<bytesize::ByteSize>()
+        .map_err(|e| format!("invalid --max-memory value '{s}': {e}"))?
+        .as_u64();
+    let bytes =
+        usize::try_from(bytes).map_err(|_| format!("--max-memory value too large: '{s}'"))?;
+    if bytes == 0 {
+        return Err(format!("--max-memory must be greater than 0: '{s}'"));
+    }
+    Ok(bytes)
+}
+
 struct ResolvedOpts {
     #[allow(dead_code)]
     config_file: config::ConfigFile,
@@ -325,6 +347,7 @@ struct ResolvedOpts {
     http: config::HttpConfig,
     sockets: config::SocketsConfig,
     metadata: Option<serde_json::Value>,
+    max_memory: Option<usize>,
 }
 
 fn resolve_opts(opts: &CommonOpts) -> Result<ResolvedOpts> {
@@ -360,6 +383,7 @@ fn resolve_opts(opts: &CommonOpts) -> Result<ResolvedOpts> {
         http,
         sockets,
         metadata,
+        max_memory: opts.max_memory,
     })
 }
 
@@ -388,6 +412,7 @@ async fn prepare_component(
     let fs = resolved.fs;
     let http = resolved.http;
     let sockets = resolved.sockets;
+    let max_memory = resolved.max_memory;
 
     let mut preopens = runtime::fs_policy::derive_preopens(&fs);
     let mount_root = info.std.capabilities.fs_mount_root().unwrap_or("/");
@@ -410,7 +435,7 @@ async fn prepare_component(
     let wasm = runtime::load_component(&engine, &component_path)?;
     let linker = runtime::create_linker(&engine)?;
     let (instance, session_provider, store) = runtime::instantiate_component(
-        &engine, &wasm, &linker, &preopens, &http, &fs, &sockets, &info,
+        &engine, &wasm, &linker, &preopens, &http, &fs, &sockets, &info, max_memory,
     )
     .await?;
     let has_sessions = session_provider.is_some();
@@ -969,6 +994,22 @@ mod tests {
         assert_eq!(result, Some(serde_json::json!({"key": "value"})));
     }
 
+    #[test]
+    fn parse_max_memory_units_and_bytes() {
+        assert_eq!(parse_max_memory("268435456").unwrap(), 256 << 20); // bare = bytes
+        assert_eq!(parse_max_memory("256MiB").unwrap(), 256 << 20); // binary
+        assert_eq!(parse_max_memory("1GiB").unwrap(), 1 << 30);
+        assert_eq!(parse_max_memory("512KiB").unwrap(), 512 << 10);
+        assert_eq!(parse_max_memory("256MB").unwrap(), 256_000_000); // decimal
+    }
+
+    #[test]
+    fn parse_max_memory_rejects_garbage_and_zero() {
+        assert!(parse_max_memory("12xyz").is_err());
+        assert!(parse_max_memory("").is_err());
+        assert!(parse_max_memory("0").is_err());
+    }
+
     #[test]
     fn parse_cli_metadata_from_file() {
         let mut file = NamedTempFile::new().unwrap();

{act_cli-0.8.0 → act_cli-0.8.2}/act-cli/src/runtime/mod.rs

@@ -5,7 +5,9 @@ use std::pin::Pin;
 use std::task::{Context, Poll};
 use tokio::sync::{mpsc, oneshot};
 use wasmtime::component::{Component, Linker, ResourceTable, Source, StreamConsumer, StreamResult};
-use wasmtime::{AsContextMut, Config, Engine, Store, StoreContextMut};
+use wasmtime::{
+    AsContextMut, Config, Engine, Store, StoreContextMut, StoreLimits, StoreLimitsBuilder,
+};
 use wasmtime_wasi::{WasiCtx, WasiCtxBuilder, WasiCtxView, WasiView};
 use wasmtime_wasi_http::WasiHttpCtx;
 use wasmtime_wasi_http::p3::WasiHttpCtxView;
@@ -36,6 +38,9 @@ pub struct HostState {
     fs_matcher: crate::runtime::fs_matcher::FsMatcher,
     fs_mode: crate::config::PolicyMode,
     fd_paths: crate::runtime::fs_policy::FdPathMap,
+    /// Caps the component's wasm linear memory growth (via `store.limiter`).
+    /// Default `StoreLimits` is unlimited.
+    limits: StoreLimits,
 }
 
 impl HostState {
@@ -153,6 +158,7 @@ pub async fn create_store(
     fs: &crate::config::FsConfig,
     sockets: &crate::config::SocketsConfig,
     info: &ComponentInfo,
+    max_memory: Option<usize>,
 ) -> Result<Store<HostState>> {
     // Intersect user policy with the component's declared capabilities.
     let effective_fs = crate::runtime::effective::effective_fs(fs, &info.std.capabilities).config;
@@ -208,8 +214,17 @@ pub async fn create_store(
             preopens: preopen_pairs,
             by_rep: Default::default(),
         },
+        limits: match max_memory {
+            Some(bytes) => StoreLimitsBuilder::new().memory_size(bytes).build(),
+            None => StoreLimits::default(),
+        },
     };
-    Ok(Store::new(engine, state))
+    let mut store = Store::new(engine, state);
+    // Enforce the linear-memory cap: when the guest grows memory past the limit,
+    // `memory.grow` fails (the guest typically traps OOM) instead of letting the
+    // host process balloon. No-op when `max_memory` is None (default limits).
+    store.limiter(|state| &mut state.limits);
+    Ok(store)
 }
 
 // ── Component info from custom section ──
@@ -346,12 +361,13 @@ pub async fn instantiate_component(
     fs: &crate::config::FsConfig,
     sockets: &crate::config::SocketsConfig,
     info: &ComponentInfo,
+    max_memory: Option<usize>,
 ) -> Result<(
     ActWorld,
     Option<sessions::SessionProvider>,
     Store<HostState>,
 )> {
-    let mut store = create_store(engine, preopens, http, fs, sockets, info).await?;
+    let mut store = create_store(engine, preopens, http, fs, sockets, info, max_memory).await?;
 
     // Manual instantiation flow (replicates ActWorld::instantiate_async)
     // so we keep access to the raw `Instance` for session-provider lookup.

{act_cli-0.8.0 → act_cli-0.8.2}/crates/act-store/Cargo.toml

@@ -1,7 +1,7 @@
 [package]
 name = "act-store"
 description = "Local OCI-layout component store for ACT (act-cli, act-toolserver)"
-version = "0.1.0"
+version = "0.1.1"
 edition.workspace = true
 license.workspace = true
 repository.workspace = true
@@ -14,7 +14,7 @@ serde = { version = "1", features = ["derive"] }
 serde_json = "1"
 sha2 = "0.11"
 thiserror = "2"
-fs2 = "0.4"
+fs4 = { version = "1", features = ["sync"] }
 oci-spec = "0.9.0"
 dirs = "6.0.0"
 tokio = { version = "1.52.3", features = ["rt", "macros", "fs", "io-util"] }

{act_cli-0.8.0 → act_cli-0.8.2}/crates/act-store/src/lock.rs

@@ -4,7 +4,7 @@ use std::fs::{File, OpenOptions};
 use std::io;
 use std::path::Path;
 
-use fs2::FileExt;
+use fs4::FileExt;
 
 /// RAII advisory lock. The lock is released when dropped.
 #[derive(Debug)]
@@ -26,28 +26,29 @@ impl StoreLock {
     /// Block until an exclusive (writer) lock is held.
     pub fn exclusive(root: &Path) -> io::Result<Self> {
         let file = open_lockfile(root)?;
-        FileExt::lock_exclusive(&file)?;
+        <File as FileExt>::lock(&file)?;
         Ok(Self { file })
     }
 
     /// Block until a shared (reader) lock is held.
     pub fn shared(root: &Path) -> io::Result<Self> {
         let file = open_lockfile(root)?;
-        FileExt::lock_shared(&file)?;
+        <File as FileExt>::lock_shared(&file)?;
         Ok(Self { file })
     }
 
     /// Non-blocking exclusive lock; errors if it cannot be acquired now.
     pub fn try_exclusive(root: &Path) -> io::Result<Self> {
         let file = open_lockfile(root)?;
-        FileExt::try_lock_exclusive(&file)?;
+        <File as FileExt>::try_lock(&file)
+            .map_err(|e| io::Error::other(format!("lock not acquired: {e}")))?;
         Ok(Self { file })
     }
 }
 
 impl Drop for StoreLock {
     fn drop(&mut self) {
-        let _ = FileExt::unlock(&self.file);
+        let _ = <File as FileExt>::unlock(&self.file);
     }
 }