aboutsummaryrefslogtreecommitdiffstats
path: root/src/components/script/dom/bindings
diff options
context:
space:
mode:
authorbors-servo <release+servo@mozilla.com>2014-03-21 06:49:34 -0400
committerbors-servo <release+servo@mozilla.com>2014-03-21 06:49:34 -0400
commit54da52fa774ce2ee59fcf811af595bf292169ad8 (patch)
treee0ee965e9d7acd375dc59e2d46b37329c04b98aa /src/components/script/dom/bindings
parent5dbde0c5c5e60f41263246e79369748fb2493d65 (diff)
parentacffed2dcd93f26fc3dc5c81b03129ba40d27433 (diff)
downloadservo-54da52fa774ce2ee59fcf811af595bf292169ad8.tar.gz
servo-54da52fa774ce2ee59fcf811af595bf292169ad8.zip
auto merge of #1950 : Ms2ger/servo/nullable-string-with-null-default, r=jdm
Diffstat (limited to 'src/components/script/dom/bindings')
-rw-r--r--src/components/script/dom/bindings/codegen/CodegenRust.py3
1 files changed, 1 insertions, 2 deletions
diff --git a/src/components/script/dom/bindings/codegen/CodegenRust.py b/src/components/script/dom/bindings/codegen/CodegenRust.py
index f186e3f8024..63bd00f3e90 100644
--- a/src/components/script/dom/bindings/codegen/CodegenRust.py
+++ b/src/components/script/dom/bindings/codegen/CodegenRust.py
@@ -688,8 +688,7 @@ def getJSToNativeConversionTemplate(type, descriptorProvider, failureCode=None,
if isinstance(defaultValue, IDLNullValue):
assert(type.nullable())
- return handleDefault(conversionCode,
- "${declName}.SetNull();")
+ return handleDefault(conversionCode, "${declName} = None;")
value = "str::from_utf8(data).unwrap().to_owned()"
if type.nullable():