Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
22 changes: 11 additions & 11 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ env:
# version like 1.70. Note that we only specify MAJOR.MINOR and not PATCH so that bugfixes still
# come automatically. If the version specified here is no longer the latest stable version,
# then please feel free to submit a PR that adjusts it along with the potential clippy fixes.
RUST_STABLE_VER: "1.93" # In quotes because otherwise (e.g.) 1.70 would be interpreted as 1.7
RUST_STABLE_VER: "1.95" # In quotes because otherwise (e.g.) 1.70 would be interpreted as 1.7
# The purpose of checking with the minimum supported Rust toolchain is to detect its staleness.
# If the compilation fails, then the version specified here needs to be bumped up to reality.
# Be sure to also update the rust-version property in the workspace Cargo.toml file,
Expand Down Expand Up @@ -85,7 +85,7 @@ jobs:
name: formatting
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v4
- uses: actions/checkout@v6

- name: install stable toolchain
uses: dtolnay/rust-toolchain@master
Expand Down Expand Up @@ -119,7 +119,7 @@ jobs:
matrix:
os: [windows-latest, macos-latest, ubuntu-latest]
steps:
- uses: actions/checkout@v4
- uses: actions/checkout@v6

- name: install stable toolchain
uses: dtolnay/rust-toolchain@master
Expand Down Expand Up @@ -151,7 +151,7 @@ jobs:
name: cargo clippy (wasm32)
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v4
- uses: actions/checkout@v6

- name: install stable toolchain
uses: dtolnay/rust-toolchain@master
Expand Down Expand Up @@ -183,7 +183,7 @@ jobs:
matrix:
os: [windows-latest, macos-latest, ubuntu-latest]
steps:
- uses: actions/checkout@v4
- uses: actions/checkout@v6

- name: install stable toolchain
uses: dtolnay/rust-toolchain@master
Expand All @@ -210,7 +210,7 @@ jobs:
name: cargo test (wasm32)
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v4
- uses: actions/checkout@v6

- name: install stable toolchain
uses: dtolnay/rust-toolchain@master
Expand Down Expand Up @@ -241,7 +241,7 @@ jobs:
matrix:
os: [windows-latest, macos-latest, ubuntu-latest]
steps:
- uses: actions/checkout@v4
- uses: actions/checkout@v6

- name: install msrv toolchain
uses: dtolnay/rust-toolchain@master
Expand Down Expand Up @@ -269,7 +269,7 @@ jobs:
name: cargo check (msrv) (wasm32)
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v4
- uses: actions/checkout@v6

- name: install msrv toolchain
uses: dtolnay/rust-toolchain@master
Expand All @@ -296,7 +296,7 @@ jobs:
# If we get per-platform docs (win/macos/linux/wasm32/..) then doc jobs should match that.
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v4
- uses: actions/checkout@v6

- name: install nightly toolchain
uses: dtolnay/rust-toolchain@nightly
Expand All @@ -316,7 +316,7 @@ jobs:
typos:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v4
- uses: actions/checkout@v6

- name: check typos
uses: crate-ci/typos@v1.39.0
uses: crate-ci/typos@v1.45.2
12 changes: 5 additions & 7 deletions crates/message-format-runtime/src/catalog.rs
Original file line number Diff line number Diff line change
Expand Up @@ -727,13 +727,11 @@ fn advance_control_state(
opcode: decoded.opcode,
})?;
}
vm::OP_CASE_STR | vm::OP_CASE_DEFAULT => {
if state.select_depth == 0 {
return Err(CatalogError::InvalidSelectSequence {
pc: decoded.pc,
opcode: decoded.opcode,
});
}
vm::OP_CASE_STR | vm::OP_CASE_DEFAULT if state.select_depth == 0 => {
return Err(CatalogError::InvalidSelectSequence {
pc: decoded.pc,
opcode: decoded.opcode,
});
}
vm::OP_SELECT_END => {
if state.select_depth == 0 {
Expand Down