diff options
| author | bors-servo <release+servo@mozilla.com> | 2014-03-10 11:01:52 -0400 |
|---|---|---|
| committer | bors-servo <release+servo@mozilla.com> | 2014-03-10 11:01:52 -0400 |
| commit | 52ab85c45d57dbee88f5080b2d8ee19c6ea9aebd (patch) | |
| tree | e4a331dfa684b0cf609c31e945b5485fb78c6a75 /src/components/script/dom/bindings/codegen | |
| parent | 654f3db29511d3b7b7a49a875b86a8538d111bcf (diff) | |
| parent | b18c5e518b9e8bb57cb7cf1bbd595bb4db1adafb (diff) | |
| download | servo-52ab85c45d57dbee88f5080b2d8ee19c6ea9aebd.tar.gz servo-52ab85c45d57dbee88f5080b2d8ee19c6ea9aebd.zip | |
auto merge of #1861 : Ms2ger/servo/split-JSValConvertible, r=jdm
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.py | 6 |
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 e11a67fae8a..e3c44c707c0 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)) @@ -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}', |