Mirrors/servo
1
0
Fork 0
mirror of https://github.com/servo/servo.git synced 2025-08-02 04:00:32 +01:00
Code Issues Projects Releases Packages 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

13
components/script/dom/bindings/codegen/CodegenRust.py
View file

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