Skip to content

Upgrade to or past Rust 1.85 #508

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
cceckman-at-fastly wants to merge 3 commits into from
Closed

Upgrade to or past Rust 1.85 #508

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
f5eeeb7
Upgrade to the 1.85 Rust toolchain, for compatibility with 2024 edition
cceckman-at-fastly Aug 8, 2025
a495137
Upgrade resolver version
cceckman-at-fastly Aug 11, 2025
a59f1e0
Upgrade Rust version in CI as well
cceckman-at-fastly Aug 11, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/release.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/test.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand All @@ -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
Expand Down
2 changes: 1 addition & 1 deletion Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
4 changes: 2 additions & 2 deletions cli/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
2 changes: 1 addition & 1 deletion rust-toolchain
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
1.83
1.85
Loading