Yehowshua/ZIm
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

chore: Bump Rust to 1.81 (#17440)

Browse source 
Blocked on https://github.com/rust-lang/docker-rust/pull/210

Release Notes:

- N/A

---------

Co-authored-by: Finn Evers <75036051+MrSubidubi@users.noreply.github.com>
This commit is contained in:
Piotr Osiewicz 2024-09-06 00:40:44 +02:00 • committed by GitHub
parent b8d3af35fd
commit b623958b7a
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
5 changed files with 7 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

2
Dockerfile
View file

@ -1,6 +1,6 @@
# syntax = docker/dockerfile:1.2 # syntax = docker/dockerfile:1.2
FROM rust:1.80-bookworm as builder FROM rust:1.81-bookworm as builder
WORKDIR app WORKDIR app
COPY . . COPY . .

4
crates/extension/src/extension_builder.rs
View file

@ -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 /// Once Rust 1.78 is released, there will be a `wasm32-wasip2` target available, so we will
/// not need the adapter anymore. /// not need the adapter anymore.
const RUST_TARGET: &str = "wasm32-wasi"; const RUST_TARGET: &str = "wasm32-wasip1";
const WASI_ADAPTER_URL: &str = const WASI_ADAPTER_URL: &str =
"https://github.com/bytecodealliance/wasmtime/releases/download/v18.0.2/wasi_snapshot_preview1.reactor.wasm"; "https://github.com/bytecodealliance/wasmtime/releases/download/v18.0.2/wasi_snapshot_preview1.reactor.wasm";
@ -158,7 +158,7 @@ impl ExtensionBuilder {
&cargo_toml &cargo_toml
.package .package
.name .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('-', "_"), .replace('-', "_"),
]); ]);
wasm_path.set_extension("wasm"); wasm_path.set_extension("wasm");

2
docs/src/development/macos.md
View file

@ -26,7 +26,7 @@ Clone down the [Zed repository](https://github.com/zed-industries/zed).
- Install the Rust wasm toolchain: - Install the Rust wasm toolchain:
```sh ```sh
rustup target add wasm32-wasi rustup target add wasm32-wasip1
``` ```
## Backend Dependencies ## Backend Dependencies

2
docs/src/development/windows.md
View file

@ -17,7 +17,7 @@ Clone down the [Zed repository](https://github.com/zed-industries/zed).
- Install the Rust wasm toolchain: - Install the Rust wasm toolchain:
```sh ```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) - 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)

4
rust-toolchain.toml
View file

@ -1,5 +1,5 @@
[toolchain] [toolchain]
channel = "1.80" channel = "1.81"
profile = "minimal" profile = "minimal"
components = [ "rustfmt", "clippy" ] 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" ]