diff options
author | bors-servo <metajack+bors@gmail.com> | 2015-04-08 06:09:56 -0500 |
---|---|---|
committer | bors-servo <metajack+bors@gmail.com> | 2015-04-08 06:09:56 -0500 |
commit | 71e07013ded2dd168bfc3be4db79bebe230786ef (patch) | |
tree | e43d5b0cdecc55768c625db6500f1fd9e76ef8d9 /components/script/dom/bindings/codegen/CodegenRust.py | |
parent | 267badae69d476bbac63a687bb8fb63bf336aec2 (diff) | |
parent | 6b79d57920a6f91e2fa4f9464e2c46b93ae3486d (diff) | |
download | servo-71e07013ded2dd168bfc3be4db79bebe230786ef.tar.gz servo-71e07013ded2dd168bfc3be4db79bebe230786ef.zip |
Auto merge of #5564 - Ms2ger:FromJSValConvertible, r=saneyuki
Diffstat (limited to 'components/script/dom/bindings/codegen/CodegenRust.py')
-rw-r--r-- | components/script/dom/bindings/codegen/CodegenRust.py | 23 |
1 files changed, 6 insertions, 17 deletions
diff --git a/components/script/dom/bindings/codegen/CodegenRust.py b/components/script/dom/bindings/codegen/CodegenRust.py index faa1d5698fc..650d1507b77 100644 --- a/components/script/dom/bindings/codegen/CodegenRust.py +++ b/components/script/dom/bindings/codegen/CodegenRust.py @@ -897,23 +897,12 @@ def getJSToNativeConversionInfo(type, descriptorProvider, failureCode=None, if type.nullable(): declType = CGWrapper(declType, pre="Option<", post=">") - template = "" - if type.isFloat() and not type.isUnrestricted(): - template = ( - "match FromJSValConvertible::from_jsval(cx, ${val}, ()) {\n" - " Ok(v) => v,\n" - " Err(_) => {\n" - " throw_type_error(cx, \"this argument is not a finite floating-point value\");\n" - " %s\n" - " }\n" - "}" % exceptionCode) - else: - #XXXjdm support conversionBehavior here - template = ( - "match FromJSValConvertible::from_jsval(cx, ${val}, ()) {\n" - " Ok(v) => v,\n" - " Err(_) => { %s }\n" - "}" % exceptionCode) + #XXXjdm support conversionBehavior here + template = ( + "match FromJSValConvertible::from_jsval(cx, ${val}, ()) {\n" + " Ok(v) => v,\n" + " Err(_) => { %s }\n" + "}" % exceptionCode) if defaultValue is not None: if isinstance(defaultValue, IDLNullValue): |