From af260658ab414ad0c4c04c6f16b75711825206c4 Mon Sep 17 00:00:00 2001
From: Michael Mueller <mich@elmueller.net>
Date: Tue, 27 Apr 2021 04:49:43 +0200
Subject: [PATCH 1/2] Upgrade `cargo_metadata` to 0.13.1

---
 Cargo.lock                             | 14 ++++++++++++--
 utils/wasm-builder/Cargo.toml          |  2 +-
 utils/wasm-builder/src/wasm_project.rs |  2 +-
 3 files changed, 14 insertions(+), 4 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index a438e7273ae4f..f9902c2802fa6 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -700,6 +700,15 @@ version = "1.1.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "631ae5198c9be5e753e5cc215e1bd73c2b466a3565173db433f52bb9d3e66dba"
 
+[[package]]
+name = "camino"
+version = "1.0.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d4648c6d00a709aa069a236adcaae4f605a6241c72bf5bee79331a4b625921a9"
+dependencies = [
+ "serde",
+]
+
 [[package]]
 name = "cargo-platform"
 version = "0.1.1"
@@ -711,10 +720,11 @@ dependencies = [
 
 [[package]]
 name = "cargo_metadata"
-version = "0.12.3"
+version = "0.13.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7714a157da7991e23d90686b9524b9e12e0407a108647f52e9328f4b3d51ac7f"
+checksum = "081e3f0755c1f380c2d010481b6fa2e02973586d5f2b24eebb7a2a1d98b143d8"
 dependencies = [
+ "camino",
  "cargo-platform",
  "semver 0.11.0",
  "semver-parser 0.10.2",
diff --git a/utils/wasm-builder/Cargo.toml b/utils/wasm-builder/Cargo.toml
index 4ada31ee33355..09c86ca76cc18 100644
--- a/utils/wasm-builder/Cargo.toml
+++ b/utils/wasm-builder/Cargo.toml
@@ -14,7 +14,7 @@ targets = ["x86_64-unknown-linux-gnu"]
 
 [dependencies]
 build-helper = "0.1.1"
-cargo_metadata = "0.12.0"
+cargo_metadata = "0.13.1"
 tempfile = "3.1.0"
 toml = "0.5.4"
 walkdir = "2.3.1"
diff --git a/utils/wasm-builder/src/wasm_project.rs b/utils/wasm-builder/src/wasm_project.rs
index 61988a9229fdb..a5afe38711532 100644
--- a/utils/wasm-builder/src/wasm_project.rs
+++ b/utils/wasm-builder/src/wasm_project.rs
@@ -109,7 +109,7 @@ pub(crate) fn create_and_compile(
 		project_cargo_toml,
 		&wasm_workspace,
 		&crate_metadata,
-		&crate_metadata.workspace_root,
+		&crate_metadata.workspace_root.canonicalize().expect("workspace root must exist"),
 		features_to_enable,
 	);
 

From b4500f3b4e74c85eb15d75531c36d692af8bd776 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bastian=20K=C3=B6cher?= <bkchr@users.noreply.github.com>
Date: Tue, 27 Apr 2021 08:49:02 +0200
Subject: [PATCH 2/2] Update utils/wasm-builder/src/wasm_project.rs

---
 utils/wasm-builder/src/wasm_project.rs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/utils/wasm-builder/src/wasm_project.rs b/utils/wasm-builder/src/wasm_project.rs
index a5afe38711532..58161f53113fe 100644
--- a/utils/wasm-builder/src/wasm_project.rs
+++ b/utils/wasm-builder/src/wasm_project.rs
@@ -109,7 +109,7 @@ pub(crate) fn create_and_compile(
 		project_cargo_toml,
 		&wasm_workspace,
 		&crate_metadata,
-		&crate_metadata.workspace_root.canonicalize().expect("workspace root must exist"),
+		crate_metadata.workspace_root.as_ref(),
 		features_to_enable,
 	);