From 476699a1142d90cf0ada164e17af880be32902d5 Mon Sep 17 00:00:00 2001 From: Ms2ger Date: Mon, 10 Mar 2014 11:19:48 +0100 Subject: Allow passing options to FromJSValConvertible::from_jsval. --- .../script/dom/bindings/codegen/CodegenRust.py | 2 +- src/components/script/dom/bindings/conversions.rs | 57 +++++++++++----------- 2 files changed, 30 insertions(+), 29 deletions(-) (limited to 'src/components/script/dom') diff --git a/src/components/script/dom/bindings/codegen/CodegenRust.py b/src/components/script/dom/bindings/codegen/CodegenRust.py index 43057039c43..28ef759a70f 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 FromJSValConvertible::from_jsval(cx, ${val}) {\n" + "match FromJSValConvertible::from_jsval(cx, ${val}, ()) {\n" " Ok(v) => ${declName} = %s,\n" " Err(_) => %s\n" "}" % (successVal, failureCode)) diff --git a/src/components/script/dom/bindings/conversions.rs b/src/components/script/dom/bindings/conversions.rs index 4f6faa62912..acceed4c6bb 100644 --- a/src/components/script/dom/bindings/conversions.rs +++ b/src/components/script/dom/bindings/conversions.rs @@ -14,8 +14,8 @@ pub trait ToJSValConvertible { fn to_jsval(&self, cx: *JSContext) -> JSVal; } -pub trait FromJSValConvertible { - fn from_jsval(cx: *JSContext, val: JSVal) -> Result; +pub trait FromJSValConvertible { + fn from_jsval(cx: *JSContext, val: JSVal, option: T) -> Result; } @@ -37,8 +37,8 @@ impl ToJSValConvertible for bool { } } -impl FromJSValConvertible for bool { - fn from_jsval(cx: *JSContext, val: JSVal) -> Result { +impl FromJSValConvertible<()> for bool { + fn from_jsval(cx: *JSContext, val: JSVal, _option: ()) -> Result { let result = unsafe { convert_from_jsval(cx, val, JS_ValueToBoolean) }; result.map(|b| b != 0) } @@ -50,8 +50,8 @@ impl ToJSValConvertible for i8 { } } -impl FromJSValConvertible for i8 { - fn from_jsval(cx: *JSContext, val: JSVal) -> Result { +impl FromJSValConvertible<()> for i8 { + fn from_jsval(cx: *JSContext, val: JSVal, _option: ()) -> Result { let result = unsafe { convert_from_jsval(cx, val, JS_ValueToECMAInt32) }; result.map(|v| v as i8) } @@ -63,8 +63,8 @@ impl ToJSValConvertible for u8 { } } -impl FromJSValConvertible for u8 { - fn from_jsval(cx: *JSContext, val: JSVal) -> Result { +impl FromJSValConvertible<()> for u8 { + fn from_jsval(cx: *JSContext, val: JSVal, _option: ()) -> Result { let result = unsafe { convert_from_jsval(cx, val, JS_ValueToECMAInt32) }; result.map(|v| v as u8) } @@ -76,8 +76,8 @@ impl ToJSValConvertible for i16 { } } -impl FromJSValConvertible for i16 { - fn from_jsval(cx: *JSContext, val: JSVal) -> Result { +impl FromJSValConvertible<()> for i16 { + fn from_jsval(cx: *JSContext, val: JSVal, _option: ()) -> Result { let result = unsafe { convert_from_jsval(cx, val, JS_ValueToECMAInt32) }; result.map(|v| v as i16) } @@ -89,8 +89,8 @@ impl ToJSValConvertible for u16 { } } -impl FromJSValConvertible for u16 { - fn from_jsval(cx: *JSContext, val: JSVal) -> Result { +impl FromJSValConvertible<()> for u16 { + fn from_jsval(cx: *JSContext, val: JSVal, _option: ()) -> Result { unsafe { convert_from_jsval(cx, val, JS_ValueToUint16) } } } @@ -101,8 +101,8 @@ impl ToJSValConvertible for i32 { } } -impl FromJSValConvertible for i32 { - fn from_jsval(cx: *JSContext, val: JSVal) -> Result { +impl FromJSValConvertible<()> for i32 { + fn from_jsval(cx: *JSContext, val: JSVal, _option: ()) -> Result { unsafe { convert_from_jsval(cx, val, JS_ValueToECMAInt32) } } } @@ -113,8 +113,8 @@ impl ToJSValConvertible for u32 { } } -impl FromJSValConvertible for u32 { - fn from_jsval(cx: *JSContext, val: JSVal) -> Result { +impl FromJSValConvertible<()> for u32 { + fn from_jsval(cx: *JSContext, val: JSVal, _option: ()) -> Result { unsafe { convert_from_jsval(cx, val, JS_ValueToECMAUint32) } } } @@ -127,8 +127,8 @@ impl ToJSValConvertible for i64 { } } -impl FromJSValConvertible for i64 { - fn from_jsval(cx: *JSContext, val: JSVal) -> Result { +impl FromJSValConvertible<()> for i64 { + fn from_jsval(cx: *JSContext, val: JSVal, _option: ()) -> Result { unsafe { convert_from_jsval(cx, val, JS_ValueToInt64) } } } @@ -141,8 +141,8 @@ impl ToJSValConvertible for u64 { } } -impl FromJSValConvertible for u64 { - fn from_jsval(cx: *JSContext, val: JSVal) -> Result { +impl FromJSValConvertible<()> for u64 { + fn from_jsval(cx: *JSContext, val: JSVal, _option: ()) -> Result { unsafe { convert_from_jsval(cx, val, JS_ValueToUint64) } } } @@ -155,8 +155,8 @@ impl ToJSValConvertible for f32 { } } -impl FromJSValConvertible for f32 { - fn from_jsval(cx: *JSContext, val: JSVal) -> Result { +impl FromJSValConvertible<()> for f32 { + fn from_jsval(cx: *JSContext, val: JSVal, _option: ()) -> Result { let result = unsafe { convert_from_jsval(cx, val, JS_ValueToNumber) }; result.map(|f| f as f32) } @@ -170,8 +170,8 @@ impl ToJSValConvertible for f64 { } } -impl FromJSValConvertible for f64 { - fn from_jsval(cx: *JSContext, val: JSVal) -> Result { +impl FromJSValConvertible<()> for f64 { + fn from_jsval(cx: *JSContext, val: JSVal, _option: ()) -> Result { unsafe { convert_from_jsval(cx, val, JS_ValueToNumber) } } } @@ -185,13 +185,14 @@ impl ToJSValConvertible for Option { } } -impl FromJSValConvertible for Option { - fn from_jsval(cx: *JSContext, value: JSVal) -> Result, ()> { +impl> FromJSValConvertible<()> for Option { + fn from_jsval(cx: *JSContext, value: JSVal, _: ()) -> Result, ()> { if value.is_null_or_undefined() { Ok(None) } else { - let result: Result = FromJSValConvertible::from_jsval(cx, value); - result.map(|v| Some(v)) + let option: X = Default::default(); + let result: Result = FromJSValConvertible::from_jsval(cx, value, option); + result.map(Some) } } } -- cgit v1.2.3