diff options
author | bors-servo <lbergstrom+bors@mozilla.com> | 2016-02-07 05:59:57 +0530 |
---|---|---|
committer | bors-servo <lbergstrom+bors@mozilla.com> | 2016-02-07 05:59:57 +0530 |
commit | 28ecb0bba3fa395ed56bb2448a21e02c3ff88c8b (patch) | |
tree | 715c25be6722850273c5148a57b25c0e7bb26c33 /components/script/dom/bindings/codegen | |
parent | 2f52a168caa28fcbdcd84e31f093a866ac12955e (diff) | |
parent | 2be49404be8885d97735792c2833d4e8b1cb007f (diff) | |
download | servo-28ecb0bba3fa395ed56bb2448a21e02c3ff88c8b.tar.gz servo-28ecb0bba3fa395ed56bb2448a21e02c3ff88c8b.zip |
Auto merge of #9543 - alopatindev:enums_constructors_codingstyle_fix, r=KiChjang
Fix #9508: Beautify our union enums constructors
Solves #9508
@jdm Please review. Thanks!
<!-- Reviewable:start -->
[<img src="https://reviewable.io/review_button.svg" height="40" alt="Review on Reviewable"/>](https://reviewable.io/reviews/servo/servo/9543)
<!-- Reviewable:end -->
Diffstat (limited to 'components/script/dom/bindings/codegen')
-rw-r--r-- | components/script/dom/bindings/codegen/CodegenRust.py | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/components/script/dom/bindings/codegen/CodegenRust.py b/components/script/dom/bindings/codegen/CodegenRust.py index 8d539136802..13b65f53f29 100644 --- a/components/script/dom/bindings/codegen/CodegenRust.py +++ b/components/script/dom/bindings/codegen/CodegenRust.py @@ -3636,10 +3636,10 @@ class CGUnionStruct(CGThing): templateVars = map(lambda t: getUnionTypeTemplateVars(t, self.descriptorProvider), self.type.flatMemberTypes) enumValues = [ - " e%s(%s)," % (v["name"], v["typeName"]) for v in templateVars + " %s(%s)," % (v["name"], v["typeName"]) for v in templateVars ] enumConversions = [ - " %s::e%s(ref inner) => inner.to_jsval(cx, rval)," + " %s::%s(ref inner) => inner.to_jsval(cx, rval)," % (self.type, v["name"]) for v in templateVars ] return ("""\ @@ -3681,7 +3681,7 @@ class CGUnionConversionStruct(CGThing): return ( "match %s::TryConvertTo%s(cx, value) {\n" " Err(_) => return Err(()),\n" - " Ok(Some(value)) => return Ok(%s::e%s(value)),\n" + " Ok(Some(value)) => return Ok(%s::%s(value)),\n" " Ok(None) => (),\n" "}\n") % (self.type, name, self.type, name) @@ -3757,7 +3757,7 @@ class CGUnionConversionStruct(CGThing): match = ( "match %s::TryConvertTo%s(cx, value) {\n" " Err(_) => return Err(()),\n" - " Ok(Some(value)) => return Ok(%s::e%s(value)),\n" + " Ok(Some(value)) => return Ok(%s::%s(value)),\n" " Ok(None) => (),\n" "}\n") % (self.type, name, self.type, name) conversions.append(CGGeneric(match)) |