aboutsummaryrefslogtreecommitdiffstats
path: root/src/components/script/dom/bindings/codegen
diff options
context:
space:
mode:
authorMs2ger <ms2ger@gmail.com>2014-03-08 11:13:08 +0100
committerMs2ger <ms2ger@gmail.com>2014-03-08 11:13:08 +0100
commitb18c5e518b9e8bb57cb7cf1bbd595bb4db1adafb (patch)
treef8118046caeca1bd7774ca3e832a1323364925b5 /src/components/script/dom/bindings/codegen
parentd79c8a10cfd07be712826d831394814cdfec71af (diff)
downloadservo-b18c5e518b9e8bb57cb7cf1bbd595bb4db1adafb.tar.gz
servo-b18c5e518b9e8bb57cb7cf1bbd595bb4db1adafb.zip
Split JSValConvertible into two traits.
Later, we'll want to implement variations of the conversion *from* JS, but not the conversion *to* JS.
Diffstat (limited to 'src/components/script/dom/bindings/codegen')
-rw-r--r--src/components/script/dom/bindings/codegen/CodegenRust.py6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/components/script/dom/bindings/codegen/CodegenRust.py b/src/components/script/dom/bindings/codegen/CodegenRust.py
index 47c91614d52..6246b3b4b37 100644
--- a/src/components/script/dom/bindings/codegen/CodegenRust.py
+++ b/src/components/script/dom/bindings/codegen/CodegenRust.py
@@ -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))
@@ -5276,7 +5276,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::*',
@@ -6426,7 +6426,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}',