fix(ci): standardize publish rust toolchain

NathanFlurry · NathanFlurry · commit 9be18453260f · 2026-05-04T02:03:17.000-07:00
diff --git a/.github/workflows/rust.yml b/.github/workflows/rust.yml
@@ -90,10 +90,10 @@ jobs:
         run: rivetkit-rust/packages/rivetkit-core/scripts/check-event-driven-drains.sh
 
       - name: Check
-        run: cargo check --all-targets --all-features
+        run: cargo check --workspace --exclude rivetkit-wasm
         env:
           # Deny warnings
-          RUSTFLAGS: --cfg tokio_unstable -D warnings
+          RUSTFLAGS: --cfg tokio_unstable -D warnings -A unsafe-op-in-unsafe-fn
 
   # test:
   #   name: Test
diff --git a/docker/build/darwin-arm64.Dockerfile b/docker/build/darwin-arm64.Dockerfile
@@ -10,6 +10,7 @@ ARG BUILD_MODE=release
 ARG BUILD_FRONTEND=false
 ARG VITE_APP_API_URL=__SAME__
 ARG VITE_FEATURE_FLAGS=
+ARG RUST_TOOLCHAIN=1.91.1
 
 ENV BINDGEN_EXTRA_CLANG_ARGS_aarch64_apple_darwin="--sysroot=/root/osxcross/target/SDK/MacOSX11.3.sdk -isystem /root/osxcross/target/SDK/MacOSX11.3.sdk/usr/include" \
     CFLAGS_aarch64_apple_darwin="-B/root/osxcross/target/bin" \
@@ -32,6 +33,10 @@ ENV RUSTC_WRAPPER=sccache \
 WORKDIR /build
 COPY . .
 
+RUN rustup toolchain install "${RUST_TOOLCHAIN}" --profile minimal && \
+    rustup default "${RUST_TOOLCHAIN}" && \
+    rustup target add aarch64-apple-darwin
+
 RUN if [ "$BUILD_TARGET" = "engine" ] && [ "$BUILD_FRONTEND" = "true" ]; then \
         export NODE_OPTIONS="--max-old-space-size=8192" && \
         export SKIP_NAPI_BUILD=1 && \
diff --git a/docker/build/darwin-x64.Dockerfile b/docker/build/darwin-x64.Dockerfile
@@ -10,6 +10,7 @@ ARG BUILD_MODE=release
 ARG BUILD_FRONTEND=false
 ARG VITE_APP_API_URL=__SAME__
 ARG VITE_FEATURE_FLAGS=
+ARG RUST_TOOLCHAIN=1.91.1
 
 ENV BINDGEN_EXTRA_CLANG_ARGS_x86_64_apple_darwin="--sysroot=/root/osxcross/target/SDK/MacOSX11.3.sdk -isystem /root/osxcross/target/SDK/MacOSX11.3.sdk/usr/include" \
     CFLAGS_x86_64_apple_darwin="-B/root/osxcross/target/bin" \
@@ -32,6 +33,10 @@ ENV RUSTC_WRAPPER=sccache \
 WORKDIR /build
 COPY . .
 
+RUN rustup toolchain install "${RUST_TOOLCHAIN}" --profile minimal && \
+    rustup default "${RUST_TOOLCHAIN}" && \
+    rustup target add x86_64-apple-darwin
+
 RUN if [ "$BUILD_TARGET" = "engine" ] && [ "$BUILD_FRONTEND" = "true" ]; then \
         export NODE_OPTIONS="--max-old-space-size=8192" && \
         export SKIP_NAPI_BUILD=1 && \
diff --git a/docker/build/linux-arm64-gnu.Dockerfile b/docker/build/linux-arm64-gnu.Dockerfile
@@ -10,6 +10,7 @@ ARG BUILD_MODE=release
 ARG BUILD_FRONTEND=false
 ARG VITE_APP_API_URL=__SAME__
 ARG VITE_FEATURE_FLAGS=
+ARG RUST_TOOLCHAIN=1.91.1
 
 ENV RUSTFLAGS="--cfg tokio_unstable"
 ENV RUSTC_WRAPPER=sccache \
@@ -19,6 +20,10 @@ ENV RUSTC_WRAPPER=sccache \
 WORKDIR /build
 COPY . .
 
+RUN rustup toolchain install "${RUST_TOOLCHAIN}" --profile minimal && \
+    rustup default "${RUST_TOOLCHAIN}" && \
+    rustup target add aarch64-unknown-linux-gnu
+
 RUN if [ "$BUILD_TARGET" = "engine" ] && [ "$BUILD_FRONTEND" = "true" ]; then \
         export NODE_OPTIONS="--max-old-space-size=8192" && \
         export SKIP_NAPI_BUILD=1 && \
diff --git a/docker/build/linux-arm64-musl.Dockerfile b/docker/build/linux-arm64-musl.Dockerfile
@@ -10,6 +10,7 @@ ARG BUILD_MODE=release
 ARG BUILD_FRONTEND=false
 ARG VITE_APP_API_URL=__SAME__
 ARG VITE_FEATURE_FLAGS=
+ARG RUST_TOOLCHAIN=1.91.1
 
 ENV OPENSSL_DIR=/musl-aarch64 \
     OPENSSL_INCLUDE_DIR=/musl-aarch64/include \
@@ -25,6 +26,10 @@ ENV RUSTC_WRAPPER=sccache \
 WORKDIR /build
 COPY . .
 
+RUN rustup toolchain install "${RUST_TOOLCHAIN}" --profile minimal && \
+    rustup default "${RUST_TOOLCHAIN}" && \
+    rustup target add aarch64-unknown-linux-musl
+
 RUN if [ "$BUILD_TARGET" = "engine" ] && [ "$BUILD_FRONTEND" = "true" ]; then \
         export NODE_OPTIONS="--max-old-space-size=8192" && \
         export SKIP_NAPI_BUILD=1 && \
diff --git a/docker/build/linux-x64-gnu.Dockerfile b/docker/build/linux-x64-gnu.Dockerfile
@@ -17,6 +17,7 @@ ARG BUILD_MODE=release
 ARG BUILD_FRONTEND=false
 ARG VITE_APP_API_URL=__SAME__
 ARG VITE_FEATURE_FLAGS=
+ARG RUST_TOOLCHAIN=1.91.1
 
 ENV RUSTFLAGS="--cfg tokio_unstable"
 
@@ -27,6 +28,10 @@ ENV RUSTC_WRAPPER=sccache \
 WORKDIR /build
 COPY . .
 
+RUN rustup toolchain install "${RUST_TOOLCHAIN}" --profile minimal && \
+    rustup default "${RUST_TOOLCHAIN}" && \
+    rustup target add x86_64-unknown-linux-gnu
+
 # Build frontend if building engine with frontend enabled.
 RUN if [ "$BUILD_TARGET" = "engine" ] && [ "$BUILD_FRONTEND" = "true" ]; then \
         export NODE_OPTIONS="--max-old-space-size=8192" && \
diff --git a/docker/build/linux-x64-musl.Dockerfile b/docker/build/linux-x64-musl.Dockerfile
@@ -10,6 +10,7 @@ ARG BUILD_MODE=release
 ARG BUILD_FRONTEND=false
 ARG VITE_APP_API_URL=__SAME__
 ARG VITE_FEATURE_FLAGS=
+ARG RUST_TOOLCHAIN=1.91.1
 
 ENV OPENSSL_DIR=/musl-x86_64 \
     OPENSSL_INCLUDE_DIR=/musl-x86_64/include \
@@ -24,6 +25,10 @@ ENV RUSTC_WRAPPER=sccache \
 WORKDIR /build
 COPY . .
 
+RUN rustup toolchain install "${RUST_TOOLCHAIN}" --profile minimal && \
+    rustup default "${RUST_TOOLCHAIN}" && \
+    rustup target add x86_64-unknown-linux-musl
+
 RUN if [ "$BUILD_TARGET" = "engine" ] && [ "$BUILD_FRONTEND" = "true" ]; then \
         export NODE_OPTIONS="--max-old-space-size=8192" && \
         export SKIP_NAPI_BUILD=1 && \
diff --git a/docker/build/windows-x64.Dockerfile b/docker/build/windows-x64.Dockerfile
@@ -16,6 +16,7 @@ ARG BUILD_MODE=release
 ARG BUILD_FRONTEND=false
 ARG VITE_APP_API_URL=__SAME__
 ARG VITE_FEATURE_FLAGS=
+ARG RUST_TOOLCHAIN=1.91.1
 
 # Windows-specific build flags:
 # - lld linker is ~5x faster than MinGW's default ld for big Rust binaries.
@@ -32,6 +33,10 @@ ENV RUSTC_WRAPPER=sccache \
 WORKDIR /build
 COPY . .
 
+RUN rustup toolchain install "${RUST_TOOLCHAIN}" --profile minimal && \
+    rustup default "${RUST_TOOLCHAIN}" && \
+    rustup target add x86_64-pc-windows-gnu
+
 RUN if [ "$BUILD_TARGET" = "engine" ] && [ "$BUILD_FRONTEND" = "true" ]; then \
         export NODE_OPTIONS="--max-old-space-size=8192" && \
         export SKIP_NAPI_BUILD=1 && \
diff --git a/docker/builder-base/engine-builder.Dockerfile b/docker/builder-base/engine-builder.Dockerfile
@@ -24,8 +24,8 @@ RUN apt-get update -y && \
     openssl \
     pkg-config \
     wget && \
-    rustup toolchain install 1.91.0 && \
-    rustup default 1.91.0 && \
+    rustup toolchain install 1.91.1 && \
+    rustup default 1.91.1 && \
     curl -fsSL https://deb.nodesource.com/setup_22.x | bash - && \
     apt-get install -y --no-install-recommends nodejs && \
     corepack enable && \
diff --git a/docker/builder-base/linux-gnu.Dockerfile b/docker/builder-base/linux-gnu.Dockerfile
@@ -7,7 +7,7 @@
 # and the aarch64 cross-compiler.
 #
 # Build & push: scripts/docker-builder-base/build-push.sh linux-gnu
-FROM rust:1.89.0-bullseye
+FROM rust:1.91.1-bullseye
 
 # Install base packages. Bullseye ships clang 11; we pull clang 14 from the
 # official LLVM apt repo (https://apt.llvm.org) for modern bindgen support
diff --git a/docker/builder-base/linux-musl.Dockerfile b/docker/builder-base/linux-musl.Dockerfile
@@ -8,7 +8,7 @@
 # Pre-bakes Rust, Node.js 22, napi-rs CLI.
 #
 # Build & push: scripts/docker-builder-base/build-push.sh linux-musl
-FROM rust:1.89.0-bookworm
+FROM rust:1.91.1-bookworm
 
 RUN apt-get update && apt-get install -y --no-install-recommends \
     musl-tools \
diff --git a/docker/builder-base/osxcross.Dockerfile b/docker/builder-base/osxcross.Dockerfile
@@ -3,7 +3,7 @@
 #
 # Build & push: scripts/docker-builder-base/build-push.sh osxcross
 # syntax=docker/dockerfile:1.10.0
-FROM rust:1.89.0-bookworm
+FROM rust:1.91.1-bookworm
 
 RUN apt-get update && apt-get install -y \
     git-lfs \
diff --git a/docker/builder-base/windows-mingw.Dockerfile b/docker/builder-base/windows-mingw.Dockerfile
@@ -4,7 +4,7 @@
 # Pre-bakes MinGW-w64, Rust target, Node.js 22, napi-rs CLI.
 #
 # Build & push: scripts/docker-builder-base/build-push.sh windows-mingw
-FROM rust:1.89.0-bookworm
+FROM rust:1.91.1-bookworm
 
 RUN apt-get update && apt-get install -y --no-install-recommends \
     llvm-14-dev \
diff --git a/docker/engine/Dockerfile b/docker/engine/Dockerfile
@@ -13,11 +13,15 @@ ARG CARGO_BUILD_MODE=debug
 ARG VITE_APP_API_URL=__SAME__
 ARG VITE_APP_TURNSTILE_SITE_KEY=
 ARG OVERRIDE_GIT_SHA
+ARG RUST_TOOLCHAIN=1.91.1
 
 WORKDIR /app
 
 COPY . .
 
+RUN rustup toolchain install "${RUST_TOOLCHAIN}" --profile minimal && \
+    rustup default "${RUST_TOOLCHAIN}"
+
 # Build frontend. Use --ignore-scripts because the root postinstall runs
 # `lefthook install`, which needs a .git directory (excluded by
 # .dockerignore). lefthook is a dev-only git hook manager and has no
diff --git a/engine/packages/depot-client/src/vfs.rs b/engine/packages/depot-client/src/vfs.rs
@@ -256,6 +256,7 @@ pub struct SqliteVfsMetricsSnapshot {
 	pub total_ns: u64,
 	pub commit_count: u64,
 	pub page_cache_entries: u64,
+	pub page_cache_weighted_size: u64,
 	pub page_cache_capacity_pages: u64,
 	pub write_buffer_dirty_pages: u64,
 	pub db_size_pages: u64,
@@ -859,7 +860,13 @@ impl VfsState {
 		}
 	}
 
-	fn seed_page(&mut self, config: &VfsConfig, kind: PageCacheInsertKind, pgno: u32, page: Vec<u8>) {
+	fn seed_page(
+		&mut self,
+		config: &VfsConfig,
+		kind: PageCacheInsertKind,
+		pgno: u32,
+		page: Vec<u8>,
+	) {
 		if pgno == 1 {
 			self.seed_main_page(config, kind, page);
 		} else {
@@ -1028,6 +1035,10 @@ impl VfsContext {
 				.entry_count()
 				.saturating_add(state.committed_page_cache.entry_count())
 				.saturating_add(state.protected_page_cache.len() as u64),
+			page_cache_weighted_size: state
+				.page_cache
+				.weighted_size()
+				.saturating_add(state.protected_page_cache.len() as u64),
 			page_cache_capacity_pages: self.config.cache_capacity_pages,
 			write_buffer_dirty_pages: state.write_buffer.dirty.len() as u64,
 			db_size_pages: state.db_size_pages as u64,
@@ -1120,10 +1131,7 @@ impl VfsContext {
 				.startup_preload_first_page_count
 				.min(state.db_size_pages);
 			for pgno in 1..=early_page_count {
-				if !snapshot
-					.ranges
-					.iter()
-					.any(|range| range.contains(pgno))
+				if !snapshot.ranges.iter().any(|range| range.contains(pgno))
 					&& existing_pgnos.insert(pgno)
 				{
 					snapshot.pgnos.push(pgno);
@@ -1741,7 +1749,12 @@ async fn fetch_initial_main_page(
 ) -> std::result::Result<Option<Vec<u8>>, String> {
 	fetch_initial_pages(transport, actor_id, 1)
 		.await
-		.map(|pages| pages.into_iter().find(|(pgno, _)| *pgno == 1).map(|(_, bytes)| bytes))
+		.map(|pages| {
+			pages
+				.into_iter()
+				.find(|(pgno, _)| *pgno == 1)
+				.map(|(_, bytes)| bytes)
+		})
 }
 
 async fn fetch_initial_pages(
diff --git a/engine/packages/depot-client/tests/inline/fault/verify.rs b/engine/packages/depot-client/tests/inline/fault/verify.rs
@@ -151,7 +151,10 @@ impl<'a> InvariantScan<'a> {
 		}
 
 		let Some(current) = resolved else {
-			self.violate(format!("database pointer for {} is missing", self.database_id));
+			self.violate(format!(
+				"database pointer for {} is missing",
+				self.database_id
+			));
 			return Ok(None);
 		};
 		if let Some(scanned_current) = scanned_current
diff --git a/engine/packages/depot-client/tests/inline/vfs.rs b/engine/packages/depot-client/tests/inline/vfs.rs
@@ -21,8 +21,8 @@ use tokio::sync::OnceCell;
 
 use crate::optimization_flags::{
 	DEFAULT_STARTUP_PRELOAD_MAX_BYTES, DEFAULT_VFS_PAGE_CACHE_CAPACITY_PAGES,
-	DEFAULT_VFS_PROTECTED_CACHE_PAGES, DEFAULT_VFS_STAGING_CACHE_TTL_MS,
-	SqliteOptimizationFlags, SqliteReadAheadMode, SqliteVfsPageCacheMode,
+	DEFAULT_VFS_PROTECTED_CACHE_PAGES, DEFAULT_VFS_STAGING_CACHE_TTL_MS, SqliteOptimizationFlags,
+	SqliteReadAheadMode, SqliteVfsPageCacheMode,
 };
 use crate::query::{BindParam, ColumnValue};
 use crate::vfs::SqliteVfsMetrics;
@@ -178,14 +178,34 @@ fn vfs_staging_cache_retains_only_speculative_pages() {
 	};
 	let mut state = VfsState::new(&config);
 
-	state.cache_page(&config, PageCacheInsertKind::Target, 2, vec![2; DEFAULT_PAGE_SIZE]);
+	state.cache_page(
+		&config,
+		PageCacheInsertKind::Target,
+		2,
+		vec![2; DEFAULT_PAGE_SIZE],
+	);
 	assert!(state.cached_page(&config, 2).is_none());
 
-	state.cache_page(&config, PageCacheInsertKind::Prefetch, 3, vec![3; DEFAULT_PAGE_SIZE]);
-	state.cache_page(&config, PageCacheInsertKind::Startup, 4, vec![4; DEFAULT_PAGE_SIZE]);
+	state.cache_page(
+		&config,
+		PageCacheInsertKind::Prefetch,
+		3,
+		vec![3; DEFAULT_PAGE_SIZE],
+	);
+	state.cache_page(
+		&config,
+		PageCacheInsertKind::Startup,
+		4,
+		vec![4; DEFAULT_PAGE_SIZE],
+	);
 	assert!(state.cached_page(&config, 3).is_some());
 	assert!(state.cached_page(&config, 4).is_some());
-	assert!(state.protected_page_cache.read_sync(&3, |_, _| ()).is_none());
+	assert!(
+		state
+			.protected_page_cache
+			.read_sync(&3, |_, _| ())
+			.is_none()
+	);
 
 	state.evict_target_read_pages(&[1, 3, 4]);
 	assert!(state.cached_page(&config, 1).is_none());
@@ -202,8 +222,18 @@ fn vfs_staging_cache_ttl_zero_disables_speculative_retention() {
 	};
 	let mut state = VfsState::new(&config);
 
-	state.cache_page(&config, PageCacheInsertKind::Prefetch, 2, vec![2; DEFAULT_PAGE_SIZE]);
-	state.cache_page(&config, PageCacheInsertKind::Startup, 3, vec![3; DEFAULT_PAGE_SIZE]);
+	state.cache_page(
+		&config,
+		PageCacheInsertKind::Prefetch,
+		2,
+		vec![2; DEFAULT_PAGE_SIZE],
+	);
+	state.cache_page(
+		&config,
+		PageCacheInsertKind::Startup,
+		3,
+		vec![3; DEFAULT_PAGE_SIZE],
+	);
 	assert!(state.cached_page(&config, 1).is_some());
 	assert!(state.cached_page(&config, 2).is_none());
 	assert!(state.cached_page(&config, 3).is_none());
diff --git a/engine/packages/epoxy/src/workflows/replica/setup.rs b/engine/packages/epoxy/src/workflows/replica/setup.rs
diff --git a/engine/packages/universaldb/tests/rocksdb.rs b/engine/packages/universaldb/tests/rocksdb.rs
diff --git a/engine/sdks/rust/envoy-client/tests/command_dedup.rs b/engine/sdks/rust/envoy-client/tests/command_dedup.rs
diff --git a/rivetkit-rust/packages/rivetkit-core/scripts/check-event-driven-drains.sh b/rivetkit-rust/packages/rivetkit-core/scripts/check-event-driven-drains.sh
diff --git a/rivetkit-rust/packages/rivetkit-core/src/registry/http.rs b/rivetkit-rust/packages/rivetkit-core/src/registry/http.rs
diff --git a/rivetkit-rust/packages/rivetkit-core/src/serverless.rs b/rivetkit-rust/packages/rivetkit-core/src/serverless.rs

Original file line number	Diff line number	Diff line change
`@@ -7,7 +7,7 @@`
`7`	`7`	`# and the aarch64 cross-compiler.`
`8`	`8`	`#`
`9`	`9`	`# Build & push: scripts/docker-builder-base/build-push.sh linux-gnu`
`10`		`-FROM rust:1.89.0-bullseye`
	`10`	`+FROM rust:1.91.1-bullseye`
`11`	`11`
`12`	`12`	`# Install base packages. Bullseye ships clang 11; we pull clang 14 from the`
`13`	`13`	`# official LLVM apt repo (https://apt.llvm.org) for modern bindgen support`