eliott/servo
1
0
Fork 0
mirror of https://github.com/servo/servo synced 2026-04-28 18:37:39 +02:00
Code Issues Packages Projects Releases Wiki Activity

Use the try macro to initialize dictionaries.

Browse Source
This commit is contained in:
Ms2ger
2015-02-20 10:39:40 +01:00
parent 49ff6b2ccc
commit 81eab460b1
1 changed files with 6 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
components/script/dom/bindings/codegen/CodegenRust.py
View File

@@ -4365,11 +4365,9 @@ class CGDictionary(CGThing):
def impl(self):
d = self.dictionary
if d.parent:
initParent = ("parent: match %s::%s::new(cx, val) {\n"
" Ok(parent) => parent,\n"
" Err(_) => return Err(()),\n"
"},\n") % (self.makeModuleName(d.parent),
self.makeClassName(d.parent))
initParent = "parent: try!(%s::%s::new(cx, val)),\n" % (
self.makeModuleName(d.parent),
self.makeClassName(d.parent))
else:
initParent = ""
@@ -4441,12 +4439,11 @@ class CGDictionary(CGThing):
conversion = "Some(%s)" % conversion
conversion = (
"match get_dictionary_property(cx, object, \"%s\") {\n"
" Err(()) => return Err(()),\n"
" Ok(Some(value)) => {\n"
"match try!(get_dictionary_property(cx, object, \"%s\")) {\n"
" Some(value) => {\n"
"%s\n"
" },\n"
" Ok(None) => {\n"
" None => {\n"
"%s\n"
" },\n"
"}") % (member.identifier.name, indent(conversion), indent(default))