From 2af5f783eb018952024e35f31cf923965494b586 Mon Sep 17 00:00:00 2001 From: Patrick Hamann Date: Thu, 24 Sep 2020 16:15:59 +0100 Subject: [PATCH 1/3] Bump Compute@Edge supported Rust toolchain version to 1.46. --- pkg/compute/rust.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkg/compute/rust.go b/pkg/compute/rust.go index 12fe994a3..72a60089b 100644 --- a/pkg/compute/rust.go +++ b/pkg/compute/rust.go @@ -26,7 +26,7 @@ import ( const ( // RustToolchainVersion is the `rustup` toolchain string for the compiler // that we support - RustToolchainVersion = "1.43.0" + RustToolchainVersion = "1.46.0" // WasmWasiTarget is the Rust compilation target for Wasi capable Wasm. WasmWasiTarget = "wasm32-wasi" ) From 0a7264f318c98afe2e7346e4df9bf2a067be0508 Mon Sep 17 00:00:00 2001 From: Patrick Hamann Date: Thu, 24 Sep 2020 16:22:50 +0100 Subject: [PATCH 2/3] Bump Rust toolchain in CI to 1.46 --- .github/workflows/pr_test.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/pr_test.yml b/.github/workflows/pr_test.yml index 2cec43fa3..7c1a33d4c 100644 --- a/.github/workflows/pr_test.yml +++ b/.github/workflows/pr_test.yml @@ -55,7 +55,7 @@ jobs: strategy: matrix: go-version: [1.14.x] - rust-toolchain: [1.43.0] + rust-toolchain: [1.46.0] platform: [ubuntu-latest, macos-latest, windows-latest] runs-on: ${{ matrix.platform }} steps: From f9fbf4e5d68db2ff7bbd9bcbcd952491197b1e0e Mon Sep 17 00:00:00 2001 From: phamann Date: Thu, 24 Sep 2020 17:43:56 +0100 Subject: [PATCH 3/3] Fix path to Rust Wasm build artifact in target directory. --- pkg/compute/rust.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkg/compute/rust.go b/pkg/compute/rust.go index 72a60089b..ab0ca1074 100644 --- a/pkg/compute/rust.go +++ b/pkg/compute/rust.go @@ -334,7 +334,7 @@ func (r Rust) Build(out io.Writer, verbose bool) error { if err != nil { return fmt.Errorf("error getting current working directory: %w", err) } - src := filepath.Join(dir, "target", WasmWasiTarget, "release", "deps", fmt.Sprintf("%s.wasm", binName)) + src := filepath.Join(dir, "target", WasmWasiTarget, "release", fmt.Sprintf("%s.wasm", binName)) dst := filepath.Join(dir, "bin", "main.wasm") // Check if bin directory exists and create if not.