Merge pull request #31 from DarthGandalf/fixcrash

Don't fail when cargo build has errors. And show those errors.

Author: dflemstr

src/cargo.js

@@ -54,6 +54,7 @@ export const handleCargo = async function (self, result) {
     const data = JSON.parse(line);
     switch (data.reason) {
       case 'compiler-message':
+      case 'message':
         switch (data.message.level) {
           case 'warning':
             self.emitWarning(new Error(data.message.rendered));
@@ -78,16 +79,22 @@ export const handleCargo = async function (self, result) {
     }
   }
 
+  if (result.code) {
+    throw new BuildError(result);
+  }
+
   if (hasError) {
     throw new BuildError('Cargo build failed');
   }
 
-  const depFile = wasmFile.slice(0, -'.wasm'.length) + '.d';
-  const depContents = await fse.readFile(depFile, 'utf-8');
-  const deps = parseDependencies(depContents, wasmFile);
+  if (wasmFile) {
+    const depFile = wasmFile.slice(0, -'.wasm'.length) + '.d';
+    const depContents = await fse.readFile(depFile, 'utf-8');
+    const deps = parseDependencies(depContents, wasmFile);
 
-  for (let dep of deps) {
-    self.addDependency(dep);
+    for (let dep of deps) {
+      self.addDependency(dep);
+    }
   }
 
   return {wasmFile, jsFile};

test/__snapshots__/index.test.js.snap

@@ -24,7 +24,13 @@ Set {
 
 exports[`rust-native-wasm-loader loads a simple cargo project with errors: errors 1`] = `
 Array [
-  "Module build failed: BuildError: Cargo build failed",
+  "Module build failed: BuildError: Error: Command failed: cargo build --message-format=json --target=wasm32-unknown-unknown --release
+   Compiling myerrorlib v0.1.0 (file://test/fixtures/myerrorlib)
+error: Could not compile \`myerrorlib\`.
+
+Caused by:
+  process didn't exit successfully: \`rustc --crate-name myerrorlib src/lib.rs --error-format json --crate-type cdylib --emit=dep-info,link -C opt-level=3 -C metadata=204ae3df9e4f5f06 --out-dir test/fixtures/myerrorlib/target/wasm32-unknown-unknown/release/deps --target wasm32-unknown-unknown -C linker=lld -L dependency=test/fixtures/myerrorlib/target/wasm32-unknown-unknown/release/deps -L dependency=test/fixtures/myerrorlib/target/release/deps\` (exit code: 101)
+",
   "error: aborting due to previous error
 
 ",
@@ -40,7 +46,7 @@ Array [
 ]
 `;
 
-exports[`rust-native-wasm-loader loads a simple cargo project with errors: failure 1`] = `"Module build failed: BuildError: Cargo build failed"`;
+exports[`rust-native-wasm-loader loads a simple cargo project with errors: failure 1`] = `"Module build failed: BuildError: Error: Command failed: cargo build --message-format=json --target=wasm32-unknown-unknown --release"`;
 
 exports[`rust-native-wasm-loader loads a simple cargo project with errors: warnings 1`] = `Array []`;