Fix importing static values of non-JS types

This hasn't ever actually worked in `wasm-bindgen` but there's been
enough refactorings since the initial implementation that it's actually
quite trivial to implement now!

Closes #1777
This commit is contained in:
Alex Crichton 2019-09-23 08:23:21 -07:00
parent e809a45c61
commit 0afb6aafd3
4 changed files with 24 additions and 1 deletions

View File

@ -1162,6 +1162,14 @@ impl ToTokens for ast::ImportStatic {
}; };
}) })
.to_tokens(into); .to_tokens(into);
Descriptor(
&shim_name,
quote! {
<#ty as WasmDescribe>::describe();
},
)
.to_tokens(into);
} }
} }

View File

@ -1049,6 +1049,11 @@ impl<'a> Context<'a> {
None => return Ok(()), None => return Ok(()),
}; };
let descriptor = match self.descriptors.remove(static_.shim) {
None => return Ok(()),
Some(d) => d,
};
// Register the signature of this imported shim // Register the signature of this imported shim
bindings::register_import( bindings::register_import(
self.module, self.module,
@ -1057,7 +1062,7 @@ impl<'a> Context<'a> {
Function { Function {
arguments: Vec::new(), arguments: Vec::new(),
shim_idx: 0, shim_idx: 0,
ret: Descriptor::Anyref, ret: descriptor,
}, },
ast::WebidlFunctionKind::Static, ast::WebidlFunctionKind::Static,
)?; )?;

View File

@ -105,3 +105,5 @@ exports.assert_dead_import_not_generated = function() {
exports.import_inside_function_works = function() {}; exports.import_inside_function_works = function() {};
exports.import_inside_private_module = function() {}; exports.import_inside_private_module = function() {};
exports.should_call_undefined_functions = () => false; exports.should_call_undefined_functions = () => false;
exports.STATIC_STRING = 'x';

View File

@ -51,6 +51,9 @@ extern "C" {
fn unused_import(); fn unused_import();
fn assert_dead_import_not_generated(); fn assert_dead_import_not_generated();
fn should_call_undefined_functions() -> bool; fn should_call_undefined_functions() -> bool;
static STATIC_STRING: String;
} }
#[wasm_bindgen] #[wasm_bindgen]
@ -232,3 +235,8 @@ fn undefined_function_is_ok() {
x.method(); x.method();
x.set_property(x.property()); x.set_property(x.property());
} }
#[wasm_bindgen_test]
fn static_string_ok() {
assert_eq!(*STATIC_STRING, "x");
}