From 037e529fbb760e86486444b9757cc4fc81427079 Mon Sep 17 00:00:00 2001 From: Stephan Fitzpatrick Date: Mon, 9 Nov 2026 10:11:53 +0000 Subject: [PATCH 1/2] isb 4.0.1: isbx tool shims pass --help and every other flag to the tool A shim ran `isb x tool T BIN "$@"`, and clap read a leading `--help`, `-h`, `--version` or a global isb flag (`-q`, `--org`, `--project`) as isb's own before the trailing arguments began, so `namecheap --help` printed isb's help. - Shims now run `isb x tool T BIN -- "$@"`. - `isb x tool` takes NAME, BIN and the arguments as one trailing positional, so flag parsing stops at NAME, as `isb x run` already does: `isb x tool T BIN --help` typed by hand reaches the tool too. The one `--` right after BIN is dropped; any later `--` is the tool's. - `isb x doctor` rewrites tool shims an older isb wrote (only isbx's own, only when they differ). `isb x update` already rewrote them. Claude-Session: https://claude.ai/code/session_01LJ21XqrE2BfyH6WEExnK3E --- Cargo.lock | 14 ++-- Cargo.toml | 14 ++-- crates/isb-core/src/x/shim.rs | 51 ++++++++++++-- docs/guides/isbx.md | 6 +- docs/reference/rpc.md | 4 +- sdk/python/pyproject.toml | 2 +- sdk/python/src/isb/__init__.py | 2 +- sdk/python/tests/test_unit.py | 6 +- sdk/python/uv.lock | 2 +- sdk/typescript/bun.lock | 4 +- sdk/typescript/npm/linux-arm64/package.json | 2 +- sdk/typescript/npm/linux-x64/package.json | 2 +- sdk/typescript/package.json | 6 +- src/bin/isb/x.rs | 76 +++++++++++++++++++-- src/bin/isb/x_tools.rs | 5 ++ 15 files changed, 156 insertions(+), 40 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 7f5be42..6110d1b 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -1329,7 +1329,7 @@ checksum = "a6cb138bb79a146c1bd460005623e142ef0181e3d0219cb493e02f7d08a35695" [[package]] name = "isb" -version = "4.0.0" +version = "4.0.1" dependencies = [ "age", "clap", @@ -1352,7 +1352,7 @@ dependencies = [ [[package]] name = "isb-apps" -version = "4.0.0" +version = "4.0.1" dependencies = [ "age", "base64 0.23.1", @@ -1376,7 +1376,7 @@ dependencies = [ [[package]] name = "isb-core" -version = "4.0.0" +version = "4.0.1" dependencies = [ "age", "base64 0.23.1", @@ -1403,7 +1403,7 @@ dependencies = [ [[package]] name = "isb-daemon" -version = "4.0.0" +version = "4.0.1" dependencies = [ "age", "httparse", @@ -1423,7 +1423,7 @@ dependencies = [ [[package]] name = "isb-egress" -version = "4.0.0" +version = "4.0.1" dependencies = [ "base64 0.23.1", "httparse", @@ -1436,7 +1436,7 @@ dependencies = [ [[package]] name = "isb-server" -version = "4.0.0" +version = "4.0.1" dependencies = [ "argon2", "base64 0.23.1", @@ -1459,7 +1459,7 @@ dependencies = [ [[package]] name = "isb-tui" -version = "4.0.0" +version = "4.0.1" dependencies = [ "isb-core", "libc", diff --git a/Cargo.toml b/Cargo.toml index 770a228..3d88c99 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -55,7 +55,7 @@ members = ["crates/*"] default-members = [".", "crates/*"] [workspace.package] -version = "4.0.0" +version = "4.0.1" edition = "2024" rust-version = "1.87" license = "LicenseRef-EXA-SL-1.0" @@ -63,12 +63,12 @@ repository = "https://github.com/execution-associates/isb" homepage = "https://github.com/execution-associates/isb" [workspace.dependencies] -isb-core = { path = "crates/isb-core", version = "=4.0.0" } -isb-server = { path = "crates/isb-server", version = "=4.0.0" } -isb-apps = { path = "crates/isb-apps", version = "=4.0.0" } -isb-daemon = { path = "crates/isb-daemon", version = "=4.0.0" } -isb-tui = { path = "crates/isb-tui", version = "=4.0.0" } -isb-egress = { path = "crates/isb-egress", version = "=4.0.0" } +isb-core = { path = "crates/isb-core", version = "=4.0.1" } +isb-server = { path = "crates/isb-server", version = "=4.0.1" } +isb-apps = { path = "crates/isb-apps", version = "=4.0.1" } +isb-daemon = { path = "crates/isb-daemon", version = "=4.0.1" } +isb-tui = { path = "crates/isb-tui", version = "=4.0.1" } +isb-egress = { path = "crates/isb-egress", version = "=4.0.1" } serde = { version = "1", features = ["derive"] } serde_json = "1" diff --git a/crates/isb-core/src/x/shim.rs b/crates/isb-core/src/x/shim.rs index 4e6d0a5..6eb9382 100644 --- a/crates/isb-core/src/x/shim.rs +++ b/crates/isb-core/src/x/shim.rs @@ -41,13 +41,29 @@ pub fn check_name(name: &str) -> Result<()> { Ok(()) } -/// A shim that runs installed tool `tool`'s program `bin`. +/// A shim that runs installed tool `tool`'s program `bin`. The `--` keeps +/// every argument the tool's, even one isb itself reads, such as `--help`. pub fn for_tool(tool: &str, bin: &str) -> String { format!( - "#!/bin/sh\n{MARK}: `{bin}` runs in the sandbox of isbx tool {tool} (`isb x rm {tool}` removes it)\nexec isb x tool {tool} {bin} \"$@\"\n" + "#!/bin/sh\n{MARK}: `{bin}` runs in the sandbox of isbx tool {tool} (`isb x rm {tool}` removes it)\nexec isb x tool {tool} {bin} -- \"$@\"\n" ) } +/// Rewrite shim `name` to `body` when it is an isbx shim that says +/// something else (one an older isb wrote); whether it was rewritten. +pub fn refresh(name: &str, body: &str) -> Result { + refresh_in(&dir(), name, body) +} + +fn refresh_in(d: &Path, name: &str, body: &str) -> Result { + let p = d.join(name); + if !is_shim(&p) || std::fs::read_to_string(&p).is_ok_and(|t| t == body) { + return Ok(false); + } + write_in(d, name, body)?; + Ok(true) +} + /// A shim that runs host command `cmd` as a one-off in the project sandbox. pub fn for_run(cmd: &str) -> String { format!( @@ -62,10 +78,13 @@ pub fn is_shim(p: &Path) -> bool { /// Write shim `name` with `body`, replacing only an isbx shim. pub fn write(name: &str, body: &str) -> Result { + write_in(&dir(), name, body) +} + +fn write_in(d: &Path, name: &str, body: &str) -> Result { use std::os::unix::fs::PermissionsExt; check_name(name)?; - let d = dir(); - std::fs::create_dir_all(&d)?; + std::fs::create_dir_all(d)?; let p = d.join(name); if p.symlink_metadata().is_ok() && !is_shim(&p) { return Err(Error::invalid(format!( @@ -141,7 +160,7 @@ mod tests { fn shims_are_marked_and_quote_nothing_from_the_caller() { let s = for_tool("sume", "sume"); assert!(s.starts_with("#!/bin/sh\n# isbx shim")); - assert!(s.ends_with("exec isb x tool sume sume \"$@\"\n")); + assert!(s.ends_with("\nexec isb x tool sume sume -- \"$@\"\n")); assert!(for_run("npm").contains("exec isb x run -- npm \"$@\"")); assert!(check_name("npm").is_ok() && check_name("g++").is_ok()); for bad in ["", "a/b", ".hidden", "isb", "isbx", "sudo", "a b"] { @@ -149,6 +168,28 @@ mod tests { } } + #[test] + fn an_old_tool_shim_is_rewritten_and_nothing_else() { + let t = tempfile::tempdir().unwrap(); + let d = t.path(); + let old = for_tool("nc", "namecheap").replace(" -- \"$@\"", " \"$@\""); + std::fs::write(d.join("namecheap"), &old).unwrap(); + let new = for_tool("nc", "namecheap"); + assert!(refresh_in(d, "namecheap", &new).unwrap()); + assert_eq!(std::fs::read_to_string(d.join("namecheap")).unwrap(), new); + // Up to date already: left alone. + assert!(!refresh_in(d, "namecheap", &new).unwrap()); + // Not isbx's, or not there: never written. + std::fs::write(d.join("node"), "#!/bin/sh\nexec node\n").unwrap(); + assert!(!refresh_in(d, "node", &for_tool("n", "node")).unwrap()); + assert_eq!( + std::fs::read_to_string(d.join("node")).unwrap(), + "#!/bin/sh\nexec node\n" + ); + assert!(!refresh_in(d, "gone", &for_tool("g", "gone")).unwrap()); + assert!(!d.join("gone").exists()); + } + #[test] fn only_isbx_shims_count() { let t = tempfile::tempdir().unwrap(); diff --git a/docs/guides/isbx.md b/docs/guides/isbx.md index 4f49dad..8bc8b32 100644 --- a/docs/guides/isbx.md +++ b/docs/guides/isbx.md @@ -160,9 +160,13 @@ to look it up on the guest's PATH) names them instead. Each becomes a shim: $ cat ~/.local/share/isb/x/bin/sume #!/bin/sh # isbx shim: `sume` runs in the sandbox of isbx tool sume (`isb x rm sume` removes it) -exec isb x tool sume sume "$@" +exec isb x tool sume sume -- "$@" ``` +The `--` hands every argument to the tool, `--help` and `--version` too. +Shims an older isb wrote lack it; `isb x doctor` (or `isb x update`) +rewrites them. + **The shim directory must come first on PATH,** before version managers' directories, or a host `npm` wins over a shim named `npm` ([Putting the shims on PATH](#putting-the-shims-on-path)). `isbx sume …` diff --git a/docs/reference/rpc.md b/docs/reference/rpc.md index dcc192d..6bda1a7 100644 --- a/docs/reference/rpc.md +++ b/docs/reference/rpc.md @@ -19,7 +19,7 @@ it; relative paths resolve against that directory. When it starts, the server writes one hello line: ```json -{"isb": "4.0.0", "protocol": 1} +{"isb": "4.0.1", "protocol": 1} ``` A client checks `protocol` and refuses versions it does not know. @@ -205,7 +205,7 @@ All take `files` (default `./isb.yaml` plus `./isb.override.yaml` if present), ## Example session ```text -<- {"isb":"4.0.0","protocol":1} +<- {"isb":"4.0.1","protocol":1} -> {"id":1,"method":"sandbox.ensure","params":{"spec":{"name":"web","image":"dev-base","cpus":2}}} <- {"id":1,"event":"progress","data":"web: creating from dev-base"} <- {"id":1,"event":"progress","data":"web: starting"} diff --git a/sdk/python/pyproject.toml b/sdk/python/pyproject.toml index 0f5e609..2186799 100644 --- a/sdk/python/pyproject.toml +++ b/sdk/python/pyproject.toml @@ -4,7 +4,7 @@ build-backend = "hatchling.build" [project] name = "isb-sdk" -version = "4.0.0" +version = "4.0.1" description = "Python SDK for isb: declarative incus sandboxes (containers and VMs)" readme = "README.md" license = "MIT AND LicenseRef-EXA-SL-1.0" diff --git a/sdk/python/src/isb/__init__.py b/sdk/python/src/isb/__init__.py index e53b999..7e7781a 100644 --- a/sdk/python/src/isb/__init__.py +++ b/sdk/python/src/isb/__init__.py @@ -62,7 +62,7 @@ async def main(): from ._util import Duration from .volumes import Volumes -__version__ = "4.0.0" +__version__ = "4.0.1" __all__ = [ "PROTOCOL", diff --git a/sdk/python/tests/test_unit.py b/sdk/python/tests/test_unit.py index 80b414f..3330946 100644 --- a/sdk/python/tests/test_unit.py +++ b/sdk/python/tests/test_unit.py @@ -222,7 +222,7 @@ async def test_death_fails_pending_requests(self) -> None: path = fake_server( self.tmp.name, """\ - echo '{"isb":"4.0.0","protocol":1}' + echo '{"isb":"4.0.1","protocol":1}' read line echo "boom" >&2 exit 3 @@ -243,7 +243,7 @@ async def test_close_fails_pending(self) -> None: path = fake_server( self.tmp.name, """\ - echo '{"isb":"4.0.0","protocol":1}' + echo '{"isb":"4.0.1","protocol":1}' cat >/dev/null """, ) @@ -261,7 +261,7 @@ async def test_events_and_out_of_order_replies(self) -> None: path = fake_server( self.tmp.name, """\ - echo '{"isb":"4.0.0","protocol":1}' + echo '{"isb":"4.0.1","protocol":1}' read a read b echo 'not json' diff --git a/sdk/python/uv.lock b/sdk/python/uv.lock index 83f2d6c..b2abc01 100644 --- a/sdk/python/uv.lock +++ b/sdk/python/uv.lock @@ -72,7 +72,7 @@ wheels = [ [[package]] name = "isb-sdk" -version = "4.0.0" +version = "4.0.1" source = { editable = "." } [package.dev-dependencies] diff --git a/sdk/typescript/bun.lock b/sdk/typescript/bun.lock index e2679e9..7d67ab4 100644 --- a/sdk/typescript/bun.lock +++ b/sdk/typescript/bun.lock @@ -12,8 +12,8 @@ "typescript": "^5.9.0", }, "optionalDependencies": { - "@execution-associates/isb-linux-arm64": "4.0.0", - "@execution-associates/isb-linux-x64": "4.0.0", + "@execution-associates/isb-linux-arm64": "4.0.1", + "@execution-associates/isb-linux-x64": "4.0.1", }, }, }, diff --git a/sdk/typescript/npm/linux-arm64/package.json b/sdk/typescript/npm/linux-arm64/package.json index d898532..f7e2e86 100644 --- a/sdk/typescript/npm/linux-arm64/package.json +++ b/sdk/typescript/npm/linux-arm64/package.json @@ -1,6 +1,6 @@ { "name": "@execution-associates/isb-linux-arm64", - "version": "4.0.0", + "version": "4.0.1", "description": "The static isb binary for Linux arm64 (aarch64-unknown-linux-musl), used by @execution-associates/isb", "license": "SEE LICENSE IN LICENSE", "repository": { diff --git a/sdk/typescript/npm/linux-x64/package.json b/sdk/typescript/npm/linux-x64/package.json index 37e552f..4185943 100644 --- a/sdk/typescript/npm/linux-x64/package.json +++ b/sdk/typescript/npm/linux-x64/package.json @@ -1,6 +1,6 @@ { "name": "@execution-associates/isb-linux-x64", - "version": "4.0.0", + "version": "4.0.1", "description": "The static isb binary for Linux x64 (x86_64-unknown-linux-musl), used by @execution-associates/isb", "license": "SEE LICENSE IN LICENSE", "repository": { diff --git a/sdk/typescript/package.json b/sdk/typescript/package.json index b17b409..a93956f 100644 --- a/sdk/typescript/package.json +++ b/sdk/typescript/package.json @@ -1,6 +1,6 @@ { "name": "@execution-associates/isb", - "version": "4.0.0", + "version": "4.0.1", "description": "TypeScript SDK for isb: declarative incus sandboxes (containers and VMs)", "license": "MIT", "type": "module", @@ -51,8 +51,8 @@ "prepack": "bun run build" }, "optionalDependencies": { - "@execution-associates/isb-linux-arm64": "4.0.0", - "@execution-associates/isb-linux-x64": "4.0.0" + "@execution-associates/isb-linux-arm64": "4.0.1", + "@execution-associates/isb-linux-x64": "4.0.1" }, "devDependencies": { "@biomejs/biome": "^2.2.0", diff --git a/src/bin/isb/x.rs b/src/bin/isb/x.rs index 3627634..c4f811f 100644 --- a/src/bin/isb/x.rs +++ b/src/bin/isb/x.rs @@ -54,10 +54,17 @@ pub(crate) enum XCmd { /// Run an installed tool's program (what its shims do), or any command /// in its sandbox: `isb x tool sume sume --help`, `isb x tool sume bash`. Tool { - name: String, - bin: String, - #[arg(trailing_var_arg = true, allow_hyphen_values = true)] - args: Vec, + /// NAME BIN [ARGS]...: everything from NAME on is the tool's, so + /// `isb x tool sume sume --help` is sume's help. A `--` right after + /// BIN (what shims write) is dropped. + #[arg( + required = true, + num_args = 2.., + trailing_var_arg = true, + allow_hyphen_values = true, + value_names = ["NAME", "BIN", "ARGS"] + )] + argv: Vec, }, /// Reinstall tools from their recipes into a new sandbox, switching only /// once that works. @@ -187,7 +194,10 @@ pub(crate) fn x(ctx: &Ctx, cmd: XCmd) -> Result { XCmd::Stop { names } => stop(ctx, names), XCmd::Gc { idle, missing, yes } => gc(ctx, idle, missing, yes), XCmd::Install(a) => super::x_tools::install(ctx, a), - XCmd::Tool { name, bin, args } => super::x_tools::tool(ctx, &name, &bin, args), + XCmd::Tool { argv } => { + let (name, bin, args) = tool_argv(argv); + super::x_tools::tool(ctx, &name, &bin, args) + } XCmd::Update { names, all, @@ -202,6 +212,20 @@ pub(crate) fn x(ctx: &Ctx, cmd: XCmd) -> Result { } } +/// `isb x tool`'s NAME, BIN and the tool's own arguments, without the +/// `--` a shim puts after BIN. Only that one is dropped: a later `--`, or a +/// second one, is the tool's. +fn tool_argv(argv: Vec) -> (String, String, Vec) { + let mut it = argv.into_iter(); + let name = it.next().unwrap_or_default(); + let bin = it.next().unwrap_or_default(); + let mut args: Vec = it.collect(); + if args.first().is_some_and(|a| a == "--") { + args.remove(0); + } + (name, bin, args) +} + pub(crate) fn home() -> Result { std::env::var_os("HOME") .map(PathBuf::from) @@ -525,6 +549,48 @@ mod tests { assert!(a.env.is_empty()); } + fn tool_args(v: &[&str]) -> (String, String, Vec) { + use clap::Parser; + match super::super::Cli::try_parse_from(os(v)).unwrap().cmd { + super::super::Cmd::X(XCmd::Tool { argv }) => tool_argv(argv), + _ => unreachable!(), + } + } + + #[test] + fn everything_after_the_tool_is_the_tools() { + let s = |v: &[&str]| v.iter().map(|x| x.to_string()).collect::>(); + // What a shim runs: `isb x tool T BIN -- "$@"`. + for flag in [ + "--help", + "-h", + "--version", + "-V", + "-q", + "--org", + "--project", + ] { + let (n, b, a) = tool_args(&["isb", "x", "tool", "nc", "namecheap", "--", flag, "x"]); + assert_eq!((n.as_str(), b.as_str()), ("nc", "namecheap")); + assert_eq!(a, s(&[flag, "x"]), "{flag}"); + // Typed by hand, without the `--`. + let (_, _, a) = tool_args(&["isb", "x", "tool", "nc", "namecheap", flag]); + assert_eq!(a, s(&[flag]), "{flag}"); + } + let (_, _, a) = tool_args(&["isb", "x", "tool", "t", "b"]); + assert!(a.is_empty()); + // Only the shim's own `--` goes; the tool's are kept. + let (_, _, a) = tool_args(&["isb", "x", "tool", "t", "b", "--", "--", "-x"]); + assert_eq!(a, s(&["--", "-x"])); + let (_, _, a) = tool_args(&["isb", "x", "tool", "t", "b", "a", "--", "c"]); + assert_eq!(a, s(&["a", "--", "c"])); + // Before NAME, flags are still isb's. + use clap::Parser; + let e = super::super::Cli::try_parse_from(os(&["isb", "x", "tool", "--help"])); + assert_eq!(e.err().unwrap().kind(), clap::error::ErrorKind::DisplayHelp); + assert!(super::super::Cli::try_parse_from(os(&["isb", "x", "tool", "t"])).is_err()); + } + #[test] fn the_network_follows_the_command_and_the_flags() { let net = |v: &[&str]| network_for(&run_args(v)); diff --git a/src/bin/isb/x_tools.rs b/src/bin/isb/x_tools.rs index b2f9342..def9432 100644 --- a/src/bin/isb/x_tools.rs +++ b/src/bin/isb/x_tools.rs @@ -401,6 +401,11 @@ pub(crate) fn doctor(ctx: &Ctx) -> Result { format!("tool {}: sandbox {}", t.name, t.instance), ); for b in t.bins.keys() { + // A shim an older isb wrote is brought up to date here, so + // nobody has to reinstall for it. + if let Ok(true) = shim::refresh(b, &shim::for_tool(&t.name, b)) { + println!(" rewrote shim {b} for this isb"); + } check( shim::is_shim(&shim::dir().join(b)), format!("tool {}: shim {b}", t.name), From 795c1e5e8f25a6375aa1103dc22b2736980ec99f Mon Sep 17 00:00:00 2001 From: Stephan Fitzpatrick Date: Mon, 9 Nov 2026 10:53:02 +0000 Subject: [PATCH 2/2] rusqlite 0.41 for RUSTSEC-2026-0459; MSRV 1.89 The bundled SQLite before 3.54.0 can return uninitialized page-cache memory for a database opened with a -wal file of a different page size. libsqlite3-sys 0.39.1 bundles 3.54.1; it comes with rusqlite 0.41, which needs Rust 1.89, so the MSRV (Cargo.toml, CI's MSRV job, the contributing guide) moves from 1.87 to 1.89. At that MSRV clippy's collapsible_if asks for let-chains in every nested `if let`; it is allowed rather than rewriting them all in a patch release. Claude-Session: https://claude.ai/code/session_01LJ21XqrE2BfyH6WEExnK3E --- .github/workflows/ci.yml | 4 ++-- Cargo.lock | 8 ++++---- Cargo.toml | 7 +++++-- docs/contributing/index.md | 6 +++--- 4 files changed, 14 insertions(+), 11 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index e47901a..da912aa 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -80,11 +80,11 @@ jobs: - run: cargo test --locked --lib --bins msrv: - name: MSRV 1.87 + name: MSRV 1.89 runs-on: ubuntu-latest steps: - uses: actions/checkout@v4 - - uses: dtolnay/rust-toolchain@1.87 + - uses: dtolnay/rust-toolchain@1.89 - uses: Swatinem/rust-cache@v2 - run: cargo check --all-targets --locked diff --git a/Cargo.lock b/Cargo.lock index 6110d1b..310358c 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -1536,9 +1536,9 @@ checksum = "b6d2cec3eae94f9f509c767b45932f1ada8350c4bdb85af2fcab4a3c14807981" [[package]] name = "libsqlite3-sys" -version = "0.38.2" +version = "0.39.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f1d20bef17f513b9b3004532233187769cd072d790971f4e4da0e346eb6401e8" +checksum = "14a5f01b87b92705d07b433c06f96cbc764637d81a0bffb5734ce17cf0f9a2b3" dependencies = [ "cc", "pkg-config", @@ -2137,9 +2137,9 @@ dependencies = [ [[package]] name = "rusqlite" -version = "0.40.2" +version = "0.41.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "23f2a97da3e3873c73cb2a2e71b35c40ff95e0b1eefa8d72d8499a6928c3b5b3" +checksum = "da9bba6f3506135e120a6586df05be18b48d18896600646a4bec8f993d91a594" dependencies = [ "bitflags", "fallible-iterator", diff --git a/Cargo.toml b/Cargo.toml index 3d88c99..471f807 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -57,7 +57,7 @@ default-members = [".", "crates/*"] [workspace.package] version = "4.0.1" edition = "2024" -rust-version = "1.87" +rust-version = "1.89" license = "LicenseRef-EXA-SL-1.0" repository = "https://github.com/execution-associates/isb" homepage = "https://github.com/execution-associates/isb" @@ -100,7 +100,7 @@ toml = { version = "1", default-features = false, features = ["parse", "serde", # isb serve's identity store (isb-server auth): SQLite compiled from source, # so the static musl build needs no system library; argon2id for passwords, # salted from ring's OS randomness, so no getrandom/password-hash features. -rusqlite = { version = "0.40", features = ["bundled"] } +rusqlite = { version = "0.41", features = ["bundled"] } argon2 = { version = "0.6", default-features = false, features = ["alloc"] } # The local registry's TLS: an isb CA and the registry's certificate, on ring. @@ -126,6 +126,9 @@ too_many_lines = "warn" excessive_nesting = "warn" too_many_arguments = "warn" type_complexity = "warn" +# Off since the MSRV reached let-chains (1.88): the nested `if let`s that +# predate them are left as they are rather than rewritten all at once. +collapsible_if = "allow" # Debug builds keep line tables (backtraces with file:line) but no variable # or type info, which halves the debuginfo rustc emits and the linker reads; diff --git a/docs/contributing/index.md b/docs/contributing/index.md index ea3e2b6..399e30f 100644 --- a/docs/contributing/index.md +++ b/docs/contributing/index.md @@ -53,8 +53,8 @@ Inside the sandbox, as `dev` (except `apt`, which is root's): ```sh mise use -g rust@stable bun@latest # cargo, rustc, rustup, bun -rustup toolchain install 1.87 --profile minimal \ - -c clippy -c rustfmt # the minimum supported version: cargo +1.87 build +rustup toolchain install 1.89 --profile minimal \ + -c clippy -c rustfmt # the minimum supported version: cargo +1.89 build rustup target add x86_64-unknown-linux-musl # the release target (aarch64-... on arm64) apt-get install -y musl-tools # root: provides musl-gcc ``` @@ -149,7 +149,7 @@ Plain `cargo test`, `cargo clippy`, `cargo doc` and `cargo build` cover the whole workspace (`default-members`). CI runs the same steps (`.github/workflows/ci.yml` and `build-health.yml`), plus `cargo doc` with warnings denied, a `cargo package` dry run, a macOS build and test on arm64 -and x86_64, the minimum supported Rust version (1.87), and the web UI's lint, +and x86_64, the minimum supported Rust version (1.89), and the web UI's lint, tests and build. ## The legibility ratchet