fluencelabs/wasm-bindgen
1
0
Fork 0
mirror of https://github.com/fluencelabs/wasm-bindgen synced 2025-04-03 19:01:06 +00:00
Code Issues Projects Releases Wiki Activity

Fix nullable union types

Browse Source
This commit is contained in:
Anton Danilkin 2018-09-02 20:37:12 +03:00
parent ff516d0211
commit 75ac7ca64e
1 changed files with 9 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
crates/webidl/src/idl_type.rs
View File

@ -549,7 +549,12 @@ impl<'a> IdlType<'a> {
}, },
IdlType::Enum(name) => Some(ident_ty(rust_ident(camel_case_ident(name).as_str()))), IdlType::Enum(name) => Some(ident_ty(rust_ident(camel_case_ident(name).as_str()))),
IdlType::Nullable(idl_type) => Some(option_ty(idl_type.to_syn_type(pos)?)), IdlType::Nullable(idl_type) => {
match **idl_type {
IdlType::Union(..) => idl_type.to_syn_type(pos),
_ => Some(option_ty(idl_type.to_syn_type(pos)?))
}
},
IdlType::FrozenArray(_idl_type) => None, IdlType::FrozenArray(_idl_type) => None,
IdlType::Sequence(_idl_type) => None, IdlType::Sequence(_idl_type) => None,
IdlType::Promise(_idl_type) => { IdlType::Promise(_idl_type) => {
@ -563,10 +568,10 @@ impl<'a> IdlType<'a> {
} }
IdlType::Record(_idl_type_from, _idl_type_to) => None, IdlType::Record(_idl_type_from, _idl_type_to) => None,
IdlType::Union(_idl_types) => { IdlType::Union(_idl_types) => {
// Handles union types in all places except operation argument types // Handles union types in all places except operation argument types.
// Currently treats them as any type.
// TODO: add better support for union types here? // TODO: add better support for union types here?
let path = vec![rust_ident("wasm_bindgen"), rust_ident("JsValue")]; IdlType::Any.to_syn_type(pos)
Some(leading_colon_path_ty(path))
}, },
IdlType::Any => { IdlType::Any => {