Mirrors/servo
1
0
Fork 0
mirror of https://github.com/servo/servo.git synced 2025-06-23 16:44:33 +01:00
Code Issues Projects Releases Packages Wiki Activity

auto merge of #1861 : Ms2ger/servo/split-JSValConvertible, r=jdm

Browse source 
Later, we'll want to implement variations of the conversion *from* JS, but
not the conversion *to* JS.
This commit is contained in:
bors-servo 2014-03-10 11:01:52 -04:00
commit 52ab85c45d
2 changed files with 44 additions and 17 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -1232,7 +1232,7 @@ for (uint32_t i = 0; i < length; ++i) {
successVal = preSuccess + successVal + postSuccess
#XXXjdm support conversionBehavior here
template = (
"match JSValConvertible::from_jsval(cx, ${val}) {\n"
"match FromJSValConvertible::from_jsval(cx, ${val}) {\n"
" Ok(v) => ${declName} = %s,\n"
" Err(_) => %s\n"
"}" % (successVal, failureCode))
@ -5274,7 +5274,7 @@ class CGBindingRoot(CGThing):
'dom::bindings::callback::{CallbackContainer,CallbackInterface}',
'dom::bindings::callback::{CallSetup,ExceptionHandling}',
'dom::bindings::callback::{WrapCallThisObject}',
'dom::bindings::conversions::JSValConvertible',
'dom::bindings::conversions::{FromJSValConvertible, ToJSValConvertible}',
'dom::bindings::codegen::*',
'dom::bindings::codegen::UnionTypes::*',
'dom::bindings::codegen::UnionConversions::*',
@ -6424,7 +6424,7 @@ class GlobalGenRoots():
'dom::bindings::utils::unwrap_jsmanaged',
'dom::bindings::codegen::UnionTypes::*',
'dom::bindings::codegen::PrototypeList',
'dom::bindings::conversions::JSValConvertible',
'dom::bindings::conversions::{FromJSValConvertible, ToJSValConvertible}',
'js::{crust, JS_ARGV, JS_CALLEE, JS_THIS_OBJECT}',
'js::{JSCLASS_GLOBAL_SLOT_COUNT, JSCLASS_IS_DOMJSCLASS}',
'js::{JSCLASS_IS_GLOBAL, JSCLASS_RESERVED_SLOTS_SHIFT}',