Return String instead of Result<String, JsValue>

rustwasm · Sep 24, 2022 · 74bec76 · 74bec76
1 parent fc615e6
commit 74bec76
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 6 deletions.
diff --git a/crates/backend/src/codegen.rs b/crates/backend/src/codegen.rs
@@ -144,10 +144,7 @@ impl TryToTokens for ast::LinkToModule {
                 #extern_fn
 
                 unsafe {
-                    let _ret = #name();
-                    wasm_bindgen::__rt::take_last_exception().map(|()| {
-                        <String as wasm_bindgen::convert::FromWasmAbi>::from_abi(_ret)
-                    })
+                    <String as wasm_bindgen::convert::FromWasmAbi>::from_abi(#name())
                 }
             }
         })

diff --git a/crates/futures/src/task/wait_async_polyfill.rs b/crates/futures/src/task/wait_async_polyfill.rs
@@ -53,7 +53,7 @@ fn alloc_helper() -> Worker {
             return helper;
         }
 
-        let worker_url = wasm_bindgen::link_to!(module = "/src/task/worker.js").unwrap();
+        let worker_url = wasm_bindgen::link_to!(module = "/src/task/worker.js");
         Worker::new(&worker_url).unwrap_or_else(|js| wasm_bindgen::throw_val(js))
     })
 }

diff --git a/crates/macro/src/lib.rs b/crates/macro/src/lib.rs
@@ -27,7 +27,7 @@ pub fn link_to(input: TokenStream) -> TokenStream {
             }
             tokens.into()
         }
-        Err(diagnostic) => (quote! { Result::<String, JsValue>::Ok(#diagnostic) }).into(),
+        Err(diagnostic) => (quote! { String::clone(#diagnostic) }).into(),
     }
 }