diff options
| author | bors-servo <metajack+bors@gmail.com> | 2015-03-02 12:57:59 -0700 |
|---|---|---|
| committer | bors-servo <metajack+bors@gmail.com> | 2015-03-02 12:57:59 -0700 |
| commit | 2f3697f5f346cac7578883f452735d50b832c986 (patch) | |
| tree | e89a3da0fb7425ec0de0d04cf92b84a80ab7ef24 /components/script/dom/bindings/codegen | |
| parent | fed878710c5697b49ccf5185ebe08a58be27073f (diff) | |
| parent | 5a1e6b772c12abff65215bffe90095cb7ede1559 (diff) | |
| download | servo-2f3697f5f346cac7578883f452735d50b832c986.tar.gz servo-2f3697f5f346cac7578883f452735d50b832c986.zip | |
auto merge of #5110 : Ms2ger/servo/defaultvalue-strings, r=jdm
Diffstat (limited to 'components/script/dom/bindings/codegen')
| -rw-r--r-- | components/script/dom/bindings/codegen/CodegenRust.py | 11 |
1 files changed, 2 insertions, 9 deletions
diff --git a/components/script/dom/bindings/codegen/CodegenRust.py b/components/script/dom/bindings/codegen/CodegenRust.py index 940363b126b..203bf60f340 100644 --- a/components/script/dom/bindings/codegen/CodegenRust.py +++ b/components/script/dom/bindings/codegen/CodegenRust.py @@ -706,16 +706,9 @@ def getJSToNativeConversionInfo(type, descriptorProvider, failureCode=None, default = "None" else: assert defaultValue.type.tag() == IDLType.Tags.domstring - value = "str::from_utf8(&data).unwrap().to_owned()" + default = '"%s".to_owned()' % defaultValue.value if type.nullable(): - value = "Some(%s)" % value - - default = ( - "const data: [u8; %s] = [ %s ];\n" - "%s" % - (len(defaultValue.value) + 1, - ", ".join(["'" + char + "' as u8" for char in defaultValue.value] + ["0"]), - value)) + default = "Some(%s)" % default declType = "DOMString" if type.nullable(): |