fluencelabs/wasm-bindgen
1
0
Fork 0
mirror of https://github.com/fluencelabs/wasm-bindgen synced 2025-04-27 14:42:17 +00:00
Code Issues Projects Releases Wiki Activity

webidl: replace From trait with from_js_value method for enums

Browse Source 
* Remove From<JSValue> for ENUM
* Add `from_js_value` method which returns an Option<ENUM>
This commit is contained in:
Stephan Wolski 2018-07-10 20:19:06 -04:00
parent a981dfd507
commit c56b1b0189
No known key found for this signature in database
GPG Key ID: FD42CDE01CBEA1D7
1 changed files with 11 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
crates/backend/src/codegen.rs
View File

@ -591,7 +591,7 @@ impl ToTokens for ast::ImportEnum {
fn to_tokens(&self, tokens: &mut TokenStream) { fn to_tokens(&self, tokens: &mut TokenStream) {
let vis = &self.vis; let vis = &self.vis;
let name = &self.name; let name = &self.name;
let name_string = &self.name.to_string(); let expect_string = format!("attempted to convert invalid JSValue into {}", name);
let variants = &self.variants; let variants = &self.variants;
let variant_strings = &self.variant_values; let variant_strings = &self.variant_values;
@ -625,6 +625,15 @@ impl ToTokens for ast::ImportEnum {
#(#variants = #variant_indexes_ref,)* #(#variants = #variant_indexes_ref,)*
} }
impl #name {
fn from_js_value(obj: ::wasm_bindgen::JsValue) -> Option<#name> {
obj.as_string().and_then(|obj_str| match obj_str.as_str() {
#(#variant_strings => Some(#variant_paths_ref),)*
_ => None,
})
}
}
impl ::wasm_bindgen::describe::WasmDescribe for #name { impl ::wasm_bindgen::describe::WasmDescribe for #name {
fn describe() { fn describe() {
::wasm_bindgen::JsValue::describe() ::wasm_bindgen::JsValue::describe()
@ -650,21 +659,7 @@ impl ToTokens for ast::ImportEnum {
js: Self::Abi, js: Self::Abi,
extra: &mut ::wasm_bindgen::convert::Stack, extra: &mut ::wasm_bindgen::convert::Stack,
) -> Self { ) -> Self {
#name::from(::wasm_bindgen::JsValue::from_abi(js, extra)) #name::from_js_value(::wasm_bindgen::JsValue::from_abi(js, extra)).expect(#expect_string)
}
}
impl From<::wasm_bindgen::JsValue> for #name {
fn from(obj: ::wasm_bindgen::JsValue) -> #name {
let obj_str = match obj.as_string() {
Some(string_value) => string_value,
None => panic!("Can't convert a non-string into {}", #name_string),
};
match obj_str.as_str() {
#(#variant_strings => #variant_paths_ref,)*
unknown_value => panic!("Can't convert \"{}\" into {}", unknown_value, #name_string),
}
} }
} }