From 4fbf1cbb44751f0e98a2b8747cb41570e95e5fa5 Mon Sep 17 00:00:00 2001
From: Patrick Hamann <patrick@fastly.com>
Date: Thu, 24 Sep 2020 18:55:23 +0100
Subject: [PATCH] Bump supported Rust toolchain version to 1.46 (#156)

* Bump Compute@Edge supported Rust toolchain version to 1.46.

* Bump Rust toolchain in CI to 1.46

* Fix path to Rust Wasm build artifact in target directory.
---
 .github/workflows/pr_test.yml | 2 +-
 pkg/compute/rust.go           | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

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:
diff --git a/pkg/compute/rust.go b/pkg/compute/rust.go
index 12fe994a3..ab0ca1074 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"
 )
@@ -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.