Merge branch 'master' into nlewycky/std-atomic

wasmerio · Aug 17, 2019 · 8b22d40 · 8b22d40
2 parents 3040ec9 + 0a3182e
commit 8b22d40
Showing 1 changed file with 6 additions and 5 deletions.
diff --git a/lib/emscripten/src/lib.rs b/lib/emscripten/src/lib.rs
@@ -16,7 +16,7 @@ use std::collections::HashMap;
 use std::path::PathBuf;
 use std::{f64, ffi::c_void};
 use wasmer_runtime_core::{
-    error::CallResult,
+    error::{CallError, CallResult, ResolveError},
     export::Export,
     func,
     global::Global,
@@ -373,10 +373,11 @@ pub fn run_emscripten_instance(
             0 => {
                 instance.call(func_name, &[])?;
             }
-            _ => panic!(
-                "The emscripten main function has received an incorrect number of params {}",
-                num_params
-            ),
+            _ => {
+                return Err(CallError::Resolve(ResolveError::ExportWrongType {
+                    name: "main".to_string(),
+                }))
+            }
         };
     }