From 5b3f96dad7009831c432c7889be32553d03b613a Mon Sep 17 00:00:00 2001 From: Noa Date: Fri, 13 Nov 2026 14:28:20 -0500 Subject: [PATCH 1/2] Bump rust-toolchain to 1.98.1 --- .github/workflows/benchmarks.yml | 2 +- Cargo.toml | 2 +- crates/bench/Dockerfile | 2 +- crates/standalone/Dockerfile | 2 +- rust-toolchain.toml | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/.github/workflows/benchmarks.yml b/.github/workflows/benchmarks.yml index 9f6b5f9e689..f9300002b31 100644 --- a/.github/workflows/benchmarks.yml +++ b/.github/workflows/benchmarks.yml @@ -193,7 +193,7 @@ jobs: timeout-minutes: 20 # on a successful run, runs in 8 minutes container: # !rust-toolchain-sync - image: rust:1.97.1 + image: rust:1.98.1 options: --privileged # disable until we fix the benchmarks if: false diff --git a/Cargo.toml b/Cargo.toml index 2f2922d194c..95d4146fca3 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -158,7 +158,7 @@ debug = true version = "2.16.0" edition = "2024" # update rust-toolchain.toml too! -rust-version = "1.97" +rust-version = "1.98" [workspace.dependencies] spacetimedb = { path = "crates/bindings", version = "=2.16.0" } diff --git a/crates/bench/Dockerfile b/crates/bench/Dockerfile index c6dbb53f44c..91aec6c4b86 100644 --- a/crates/bench/Dockerfile +++ b/crates/bench/Dockerfile @@ -3,7 +3,7 @@ # See the README for commands to run. # !rust-toolchain-sync -FROM rust:1.97.1 +FROM rust:1.98.1 # Refresh OS certificate roots to distrust the compromised eMudhra CAs. RUN apt-get update && apt-get install -y --no-install-recommends ca-certificates && rm -rf /var/lib/apt/lists/* # rustup has its own CA bundle; 1.29.2+ distrusts the compromised eMudhra CAs. diff --git a/crates/standalone/Dockerfile b/crates/standalone/Dockerfile index bf8fa8ff195..ccb31b5707e 100644 --- a/crates/standalone/Dockerfile +++ b/crates/standalone/Dockerfile @@ -2,7 +2,7 @@ ARG CARGO_PROFILE=release # !rust-toolchain-sync -FROM rust:1.97.1 AS chef +FROM rust:1.98.1 AS chef # Refresh OS certificate roots to distrust the compromised eMudhra CAs. RUN apt-get update && apt-get install -y --no-install-recommends ca-certificates && rm -rf /var/lib/apt/lists/* # rustup has its own CA bundle; 1.29.2+ distrusts the compromised eMudhra CAs. diff --git a/rust-toolchain.toml b/rust-toolchain.toml index f44236a5576..7676abe47ec 100644 --- a/rust-toolchain.toml +++ b/rust-toolchain.toml @@ -1,7 +1,7 @@ [toolchain] # run ./tools/rust-toolchain-sync.sh when you change the channel! # also consider changing the rust-version in Cargo.toml -channel = "1.97.1" +channel = "1.98.1" profile = "default" targets = ["wasm32-unknown-unknown"] components = ["rust-src"] From 96af307bc02254750ce33efb5ac430df422cf462 Mon Sep 17 00:00:00 2001 From: Noa Date: Fri, 13 Nov 2026 14:37:17 -0500 Subject: [PATCH 2/2] Remove itoa dep --- Cargo.lock | 1 - Cargo.toml | 1 - crates/paths/Cargo.toml | 1 - crates/paths/src/utils.rs | 4 ++-- 4 files changed, 2 insertions(+), 5 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 51032a1d05a..105a00a8f9a 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -8690,7 +8690,6 @@ dependencies = [ "chrono", "dirs", "fs2", - "itoa", "junction", "serde", "tempfile", diff --git a/Cargo.toml b/Cargo.toml index 95d4146fca3..8939e666923 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -268,7 +268,6 @@ indicatif = "0.17" insta = { version = "1.21.0", features = ["toml", "filters"] } is-terminal = "0.4" itertools = "0.12" -itoa = "1" json5 = "0.4" jsonwebtoken = { version = "11.0.0", features = ["rust_crypto"] } junction = "1" diff --git a/crates/paths/Cargo.toml b/crates/paths/Cargo.toml index 49dd1bbdece..dfed3218723 100644 --- a/crates/paths/Cargo.toml +++ b/crates/paths/Cargo.toml @@ -10,7 +10,6 @@ description = "The spacetimedb directory structure, represented as a type hierar anyhow.workspace = true chrono = { workspace = true, features = ["now"] } fs2.workspace = true -itoa.workspace = true serde.workspace = true tempfile.workspace = true thiserror.workspace = true diff --git a/crates/paths/src/utils.rs b/crates/paths/src/utils.rs index e62702765cc..e54ef134a33 100644 --- a/crates/paths/src/utils.rs +++ b/crates/paths/src/utils.rs @@ -10,8 +10,8 @@ pub(crate) trait PathBufExt: BorrowMut + Sized { self.borrow_mut().set_extension(std::env::consts::EXE_EXTENSION); self } - fn joined_int(self, path_seg: I) -> Self { - self.joined(itoa::Buffer::new().format(path_seg)) + fn joined_int(self, path_seg: u64) -> Self { + self.joined(path_seg.format_into(&mut core::fmt::NumBuffer::new())) } }