From 812ada4d56930b868a3ee8a9f9c4ca7c56ae7d91 Mon Sep 17 00:00:00 2001 From: Andrew Jones Date: Tue, 30 Mar 2021 11:14:52 +0100 Subject: [PATCH 1/4] Check wasm optimized output file exists --- src/cmd/build.rs | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/cmd/build.rs b/src/cmd/build.rs index 60efcd5b..f07b4cff 100644 --- a/src/cmd/build.rs +++ b/src/cmd/build.rs @@ -282,6 +282,10 @@ fn optimize_wasm( optimization_passes, )?; + if !dest_optimized.exists() { + return Err(anyhow::anyhow!("Optimization failed, optimized wasm output file not found.")) + } + let original_size = metadata(&crate_metadata.dest_wasm)?.len() as f64 / 1000.0; let optimized_size = metadata(&dest_optimized)?.len() as f64 / 1000.0; -- GitLab From da449f880e6e1f5cf9e4d4b0b7c643cb644c4d17 Mon Sep 17 00:00:00 2001 From: Andrew Jones Date: Tue, 30 Mar 2021 11:24:23 +0100 Subject: [PATCH 2/4] Fmt --- src/cmd/build.rs | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/cmd/build.rs b/src/cmd/build.rs index f07b4cff..f0c6afb4 100644 --- a/src/cmd/build.rs +++ b/src/cmd/build.rs @@ -283,7 +283,9 @@ fn optimize_wasm( )?; if !dest_optimized.exists() { - return Err(anyhow::anyhow!("Optimization failed, optimized wasm output file not found.")) + return Err(anyhow::anyhow!( + "Optimization failed, optimized wasm output file not found." + )); } let original_size = metadata(&crate_metadata.dest_wasm)?.len() as f64 / 1000.0; -- GitLab From 45a41afe1369a4dc8fc5b7f65146ebf02e7f2aee Mon Sep 17 00:00:00 2001 From: Andrew Jones Date: Tue, 30 Mar 2021 11:51:28 +0100 Subject: [PATCH 3/4] Add expected optimized file to error --- src/cmd/build.rs | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/cmd/build.rs b/src/cmd/build.rs index f0c6afb4..b83b60f3 100644 --- a/src/cmd/build.rs +++ b/src/cmd/build.rs @@ -284,7 +284,8 @@ fn optimize_wasm( if !dest_optimized.exists() { return Err(anyhow::anyhow!( - "Optimization failed, optimized wasm output file not found." + "Optimization failed, optimized wasm output file `{}` not found.", + dest_optimized )); } -- GitLab From a3a28b8ecd317e3addf92843a3aaf1c08731aeeb Mon Sep 17 00:00:00 2001 From: Andrew Jones Date: Tue, 30 Mar 2021 12:07:22 +0100 Subject: [PATCH 4/4] Use display for path --- src/cmd/build.rs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/cmd/build.rs b/src/cmd/build.rs index b83b60f3..eacbe258 100644 --- a/src/cmd/build.rs +++ b/src/cmd/build.rs @@ -285,7 +285,7 @@ fn optimize_wasm( if !dest_optimized.exists() { return Err(anyhow::anyhow!( "Optimization failed, optimized wasm output file `{}` not found.", - dest_optimized + dest_optimized.display() )); } -- GitLab