diff options
| author | Ms2ger <ms2ger@gmail.com> | 2014-04-26 17:15:28 +0200 |
|---|---|---|
| committer | Ms2ger <ms2ger@gmail.com> | 2014-04-26 17:15:28 +0200 |
| commit | 1e2be02eb85cb96c02fd9f8ab371dcd4f6621cbe (patch) | |
| tree | 6bee09752a56118c6e301b2b7ec2274974e3f9d1 /src/components/script/dom/bindings/codegen | |
| parent | b264c65f2e1ee692a50ed57d9d1fa7ae71cc6594 (diff) | |
| download | servo-1e2be02eb85cb96c02fd9f8ab371dcd4f6621cbe.tar.gz servo-1e2be02eb85cb96c02fd9f8ab371dcd4f6621cbe.zip | |
Use handleOptional for the 'any' conversion.
Diffstat (limited to 'src/components/script/dom/bindings/codegen')
| -rw-r--r-- | src/components/script/dom/bindings/codegen/CodegenRust.py | 9 |
1 files changed, 2 insertions, 7 deletions
diff --git a/src/components/script/dom/bindings/codegen/CodegenRust.py b/src/components/script/dom/bindings/codegen/CodegenRust.py index 21c432a2e72..2fcb72383b6 100644 --- a/src/components/script/dom/bindings/codegen/CodegenRust.py +++ b/src/components/script/dom/bindings/codegen/CodegenRust.py @@ -757,13 +757,8 @@ def getJSToNativeConversionTemplate(type, descriptorProvider, failureCode=None, assert not isEnforceRange and not isClamp declType = CGGeneric("JSVal") - value = CGGeneric("${val}") - if isOptional: - declType = CGWrapper(declType, pre="Option<", post=">") - value = CGWrapper(value, pre="Some(", post=")") - - templateBody = handleDefaultNull(value.define(), "NullValue()") - return (templateBody, declType, isOptional, "None" if isOptional else None) + templateBody = handleDefaultNull("${val}", "NullValue()") + return handleOptional(templateBody, declType, isOptional) if type.isObject(): raise TypeError("Can't handle object arguments yet") |