From 6d3c0bf763d0ed1f69c42122444ef0598ee13d5c Mon Sep 17 00:00:00 2001 From: Ms2ger Date: Tue, 4 Mar 2014 16:38:05 +0100 Subject: [PATCH] Reorder implementations in conversions.rs. --- .../script/dom/bindings/conversions.rs | 74 +++++++++---------- 1 file changed, 37 insertions(+), 37 deletions(-) diff --git a/src/components/script/dom/bindings/conversions.rs b/src/components/script/dom/bindings/conversions.rs index 116b74e8efa..c6908ac40f6 100644 --- a/src/components/script/dom/bindings/conversions.rs +++ b/src/components/script/dom/bindings/conversions.rs @@ -26,39 +26,18 @@ unsafe fn convert_from_jsval( } -impl JSValConvertible for i64 { +impl JSValConvertible for bool { fn to_jsval(&self) -> JSVal { - unsafe { - RUST_DOUBLE_TO_JSVAL(*self as f64) + if *self { + JSVAL_TRUE + } else { + JSVAL_FALSE } } - fn from_jsval(cx: *JSContext, val: JSVal) -> Option { - unsafe { convert_from_jsval(cx, val, JS_ValueToInt64) } - } -} - -impl JSValConvertible for u32 { - fn to_jsval(&self) -> JSVal { - unsafe { - RUST_UINT_TO_JSVAL(*self) - } - } - - fn from_jsval(cx: *JSContext, val: JSVal) -> Option { - unsafe { convert_from_jsval(cx, val, JS_ValueToECMAUint32) } - } -} - -impl JSValConvertible for i32 { - fn to_jsval(&self) -> JSVal { - unsafe { - RUST_UINT_TO_JSVAL(*self as u32) - } - } - - fn from_jsval(cx: *JSContext, val: JSVal) -> Option { - unsafe { convert_from_jsval(cx, val, JS_ValueToECMAInt32) } + fn from_jsval(cx: *JSContext, val: JSVal) -> Option { + let result = unsafe { convert_from_jsval(cx, val, JS_ValueToBoolean) }; + result.map(|b| b != 0) } } @@ -74,18 +53,39 @@ impl JSValConvertible for u16 { } } -impl JSValConvertible for bool { +impl JSValConvertible for i32 { fn to_jsval(&self) -> JSVal { - if *self { - JSVAL_TRUE - } else { - JSVAL_FALSE + unsafe { + RUST_UINT_TO_JSVAL(*self as u32) } } - fn from_jsval(cx: *JSContext, val: JSVal) -> Option { - let result = unsafe { convert_from_jsval(cx, val, JS_ValueToBoolean) }; - result.map(|b| b != 0) + fn from_jsval(cx: *JSContext, val: JSVal) -> Option { + unsafe { convert_from_jsval(cx, val, JS_ValueToECMAInt32) } + } +} + +impl JSValConvertible for u32 { + fn to_jsval(&self) -> JSVal { + unsafe { + RUST_UINT_TO_JSVAL(*self) + } + } + + fn from_jsval(cx: *JSContext, val: JSVal) -> Option { + unsafe { convert_from_jsval(cx, val, JS_ValueToECMAUint32) } + } +} + +impl JSValConvertible for i64 { + fn to_jsval(&self) -> JSVal { + unsafe { + RUST_DOUBLE_TO_JSVAL(*self as f64) + } + } + + fn from_jsval(cx: *JSContext, val: JSVal) -> Option { + unsafe { convert_from_jsval(cx, val, JS_ValueToInt64) } } }