diff options
| author | Alexander Lopatin <alopatindev@gmail.com> | 2016-02-07 02:55:21 +0300 |
|---|---|---|
| committer | Alexander Lopatin <alopatindev@gmail.com> | 2016-02-07 02:55:21 +0300 |
| commit | 2be49404be8885d97735792c2833d4e8b1cb007f (patch) | |
| tree | cb2f9e5bbf954ed8fffde7abfa01dbed329048e6 /components/script/dom/bindings/codegen/CodegenRust.py | |
| parent | 7c249b1d539c37ab54e9fabfaf0442a5ac0243a9 (diff) | |
| download | servo-2be49404be8885d97735792c2833d4e8b1cb007f.tar.gz servo-2be49404be8885d97735792c2833d4e8b1cb007f.zip | |
Fix #9508: Beautify our union enums constructors
Diffstat (limited to 'components/script/dom/bindings/codegen/CodegenRust.py')
| -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)) |