Mirrors/servo
1
0
Fork 0
mirror of https://github.com/servo/servo.git synced 2025-06-12 02:14:41 +00:00
Code Issues Projects Releases Packages Wiki Activity

auto merge of #2343 : Ms2ger/servo/String-union, r=jdm

Browse source
This commit is contained in:
bors-servo 2014-05-06 10:25:23 -04:00
commit 8d1b9db5aa
3 changed files with 20 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

5
src/components/script/dom/bindings/codegen/CodegenRust.py
View file

@ -2699,6 +2699,9 @@ def getUnionTypeTemplateVars(type, descriptorProvider):
name = str(type)
#XXXjdm dunno about typeName here
typeName = "/*" + type.name + "*/"
elif type.isDOMString():
name = type.name
typeName = "DOMString"
elif type.isPrimitive():
name = type.name
typeName = builtinNames[type.tag()]
@ -5312,6 +5315,7 @@ class GlobalGenRoots():
'dom::bindings::utils::unwrap_jsmanaged',
'dom::bindings::codegen::PrototypeList',
'dom::bindings::conversions::{FromJSValConvertible, ToJSValConvertible}',
'dom::bindings::conversions::{Default, Empty}',
'dom::bindings::error::throw_not_in_union',
'dom::bindings::js::JS',
'dom::types::*',
@ -5337,6 +5341,7 @@ class GlobalGenRoots():
'js::glue::{GetProxyPrivate, NewProxyObject, ProxyTraps}',
'js::glue::{RUST_FUNCTION_VALUE_TO_JITINFO}',
'js::glue::{RUST_JS_NumberValue, RUST_JSID_IS_STRING}',
'servo_util::str::DOMString',
])
# Add the auto-generated comment.