Skip to content

Commit

Permalink
chore: Bump Rust to 1.81 (#17440)
Browse files Browse the repository at this point in the history
Blocked on rust-lang/docker-rust#210

Release Notes:

- N/A

---------

Co-authored-by: Finn Evers <[email protected]>
  • Loading branch information
osiewicz and MrSubidubi authored Sep 5, 2024
1 parent b8d3af3 commit b623958
Show file tree
Hide file tree
Showing 5 changed files with 7 additions and 7 deletions.
2 changes: 1 addition & 1 deletion Dockerfile
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# syntax = docker/dockerfile:1.2

FROM rust:1.80-bookworm as builder
FROM rust:1.81-bookworm as builder
WORKDIR app
COPY . .

Expand Down
4 changes: 2 additions & 2 deletions crates/extension/src/extension_builder.rs
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ use wit_component::ComponentEncoder;
///
/// Once Rust 1.78 is released, there will be a `wasm32-wasip2` target available, so we will
/// not need the adapter anymore.
const RUST_TARGET: &str = "wasm32-wasi";
const RUST_TARGET: &str = "wasm32-wasip1";
const WASI_ADAPTER_URL: &str =
"https://github.com/bytecodealliance/wasmtime/releases/download/v18.0.2/wasi_snapshot_preview1.reactor.wasm";

Expand Down Expand Up @@ -158,7 +158,7 @@ impl ExtensionBuilder {
&cargo_toml
.package
.name
// The wasm32-wasi target normalizes `-` in package names to `_` in the resulting `.wasm` file.
// The wasm32-wasip1 target normalizes `-` in package names to `_` in the resulting `.wasm` file.
.replace('-', "_"),
]);
wasm_path.set_extension("wasm");
Expand Down
2 changes: 1 addition & 1 deletion docs/src/development/macos.md
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ Clone down the [Zed repository](https://github.com/zed-industries/zed).
- Install the Rust wasm toolchain:

```sh
rustup target add wasm32-wasi
rustup target add wasm32-wasip1
```

## Backend Dependencies
Expand Down
2 changes: 1 addition & 1 deletion docs/src/development/windows.md
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ Clone down the [Zed repository](https://github.com/zed-industries/zed).
- Install the Rust wasm toolchain:

```sh
rustup target add wasm32-wasi
rustup target add wasm32-wasip1
```

- Install [Visual Studio](https://visualstudio.microsoft.com/downloads/) with the optional component `MSVC v*** - VS YYYY C++ x64/x86 build tools` (`v***` is your VS version and `YYYY` is year when your VS was released)
Expand Down
4 changes: 2 additions & 2 deletions rust-toolchain.toml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
[toolchain]
channel = "1.80"
channel = "1.81"
profile = "minimal"
components = [ "rustfmt", "clippy" ]
targets = [ "x86_64-apple-darwin", "aarch64-apple-darwin", "x86_64-unknown-linux-gnu", "wasm32-wasi", "x86_64-pc-windows-msvc" ]
targets = [ "x86_64-apple-darwin", "aarch64-apple-darwin", "x86_64-unknown-linux-gnu", "wasm32-wasip1", "x86_64-pc-windows-msvc" ]

0 comments on commit b623958

Please sign in to comment.