Skip to content

Commit ad944ea

Browse files
authored
Merge branch 'main' into release-0.14.4
2 parents 3905ac6 + 1812d24 commit ad944ea

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

91 files changed

+10359
-6449
lines changed

Cargo.lock

Lines changed: 138 additions & 164 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Cargo.toml

Lines changed: 8 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -23,8 +23,7 @@ include = [
2323
"wasm_abi/compute-at-edge-abi/**/*.witx",
2424
"wasm_abi/data/*.wasm",
2525
]
26-
# MSRV: 1.82 for is_none_or
27-
rust-version = "1.82"
26+
rust-version = "1.86"
2827

2928
[dependencies]
3029
anyhow = { workspace = true }
@@ -33,7 +32,7 @@ bytes = "^1.2.1"
3332
bytesize = "^1.1.0"
3433
cfg-if = "^1.0"
3534
clap = { workspace = true }
36-
cranelift-entity = "^0.122.0"
35+
cranelift-entity = "^0.123.0"
3736
fastly-shared = "^0.11.5"
3837
flate2 = "^1.0.24"
3938
futures = { workspace = true }
@@ -63,6 +62,7 @@ wasm-encoder = { workspace = true }
6362
wit-component = { workspace = true }
6463
wasmtime = { workspace = true }
6564
wasmtime-wasi = { workspace = true }
65+
wasmtime-wasi-io = { workspace = true }
6666
wasmtime-wasi-nn = { workspace = true }
6767
wat = { workspace = true }
6868
wiggle = { workspace = true }
@@ -118,10 +118,11 @@ futures = "0.3.24"
118118
url = "2.3.1"
119119

120120
# Wasmtime dependencies
121-
wasmtime = { version = "35.0.0", features = ["call-hook"] }
122-
wasmtime-wasi = "35.0.0"
123-
wasmtime-wasi-nn = "35.0.0"
124-
wiggle = "35.0.0"
121+
wasmtime = { version = "36.0.2", features = ["call-hook"] }
122+
wasmtime-wasi = "36.0.2"
123+
wasmtime-wasi-io = "36.0.2"
124+
wasmtime-wasi-nn = "36.0.2"
125+
wiggle = "36.0.2"
125126
wat = "1.212.0"
126127
wasmparser = "0.236.0"
127128
wasm-encoder = { version = "0.236.0", features = ["wasmparser"] }

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ version 0.34 or above supports local testing, and the workflow is documented
2727

2828
To install Viceroy as a standalone tool, you'll need to first
2929
[install Rust](https://www.rust-lang.org/tools/install) if you haven't already.
30-
Then run `cargo install viceroy`, which will download and build the latest
30+
Then run `cargo install --locked viceroy`, which will download and build the latest
3131
Viceroy release.
3232

3333
## Usage as a library

cli/Cargo.toml

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,8 +24,7 @@ include = [
2424
"../doc/logo.png",
2525
"src/**/*"
2626
]
27-
# MSRV: 1.78 for wasm32-wasip1
28-
rust-version = "1.78"
27+
rust-version = "1.86"
2928

3029
[[bin]]
3130
name = "viceroy"

0 commit comments

Comments
 (0)