From f5eeeb7fd955056ea56557787ee284e0dfb0edce Mon Sep 17 00:00:00 2001 From: Charles Eckman Date: Fri, 8 Aug 2025 15:55:28 -0400 Subject: [PATCH 1/3] Upgrade to the 1.85 Rust toolchain, for compatibility with 2024 edition The 0.10.9 version of the `spdx` crate (a transitive dependency via `wasm-metadata`) requires the 2024 edition, and with it, Rust 1.85. Go ahead and make the upgrade. --- cli/Cargo.toml | 4 ++-- rust-toolchain | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/cli/Cargo.toml b/cli/Cargo.toml index ad2b766d..0a1f0ed1 100644 --- a/cli/Cargo.toml +++ b/cli/Cargo.toml @@ -24,8 +24,8 @@ include = [ "../doc/logo.png", "src/**/*" ] -# MSRV: 1.78 for wasm32-wasip1 -rust-version = "1.78" +# MSRV: 1.85 for 2024 edition +rust-version = "1.85" [[bin]] name = "viceroy" diff --git a/rust-toolchain b/rust-toolchain index 74c280fb..c4f7465a 100644 --- a/rust-toolchain +++ b/rust-toolchain @@ -1 +1 @@ -1.83 +1.85 From a49513798c5b46661df756f5b405a321887e5f91 Mon Sep 17 00:00:00 2001 From: Charles Eckman Date: Mon, 11 Aug 2025 15:28:37 -0400 Subject: [PATCH 2/3] Upgrade resolver version --- Cargo.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Cargo.toml b/Cargo.toml index 731744d7..08fca238 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -5,7 +5,7 @@ members = [ "crates/adapter", "crates/adapter/byte-array-literals", ] -resolver = "2" +resolver = "3" # Exclude our integration test fixtures, which need to be compiled to wasm # (managed by the Makefile) From a59f1e0d566605d5592a5887034db90bc6e4b480 Mon Sep 17 00:00:00 2001 From: Charles Eckman Date: Mon, 11 Aug 2025 15:30:03 -0400 Subject: [PATCH 3/3] Upgrade Rust version in CI as well --- .github/workflows/release.yml | 2 +- .github/workflows/test.yml | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 69eb7a4c..65156c9c 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -9,7 +9,7 @@ jobs: build: strategy: matrix: - rust-toolchain: ["1.83"] + rust-toolchain: ["1.85"] os: [ubuntu-24.04, macos-14, windows-2022] arch: [amd64, arm64] exclude: diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 066659bf..df87f58d 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -20,7 +20,7 @@ jobs: with: submodules: true - name: Install Rust - run: rustup update --no-self-update 1.83 && rustup default 1.83 + run: rustup update --no-self-update 1.85 && rustup default 1.85 shell: bash - name: Add wasm32-wasip1 Rust target run: rustup target add wasm32-wasip1 @@ -63,7 +63,7 @@ jobs: with: submodules: true - name: Install Rust - run: rustup update --no-self-update 1.83 && rustup default 1.83 + run: rustup update --no-self-update 1.85 && rustup default 1.85 shell: bash - name: Add wasm32-wasip1 Rust target run: rustup target add wasm32-wasip1 @@ -89,7 +89,7 @@ jobs: with: submodules: true - name: Install Rust - run: rustup update 1.83 && rustup default 1.83 + run: rustup update 1.85 && rustup default 1.85 shell: bash - name: Check crates can be published run: make package-check