diff options
Diffstat (limited to 'src/components/script/dom/bindings/utils.rs')
| -rw-r--r-- | src/components/script/dom/bindings/utils.rs | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/components/script/dom/bindings/utils.rs b/src/components/script/dom/bindings/utils.rs index 2c0d4943e6c..8cb42c86b4a 100644 --- a/src/components/script/dom/bindings/utils.rs +++ b/src/components/script/dom/bindings/utils.rs @@ -109,8 +109,8 @@ extern fn InterfaceObjectToString(cx: *JSContext, _argc: c_uint, vp: *mut JSVal) let v = *GetFunctionNativeReserved(callee, TOSTRING_NAME_RESERVED_SLOT); assert!(jsval::is_string(v)); let name = jsstring_to_str(cx, jsval::to_string(v)); - let retval = Some(~"function " + name + "() {\n [native code]\n}"); - *vp = domstring_to_jsval(cx, retval); + let retval = ~"function " + name + "() {\n [native code]\n}"; + *vp = str_to_jsval(cx, retval); return 1; } } @@ -186,7 +186,7 @@ pub unsafe fn squirrel_away<T>(x: @mut T) -> *Box<T> { y } -pub fn jsstring_to_str(cx: *JSContext, s: *JSString) -> ~str { +pub fn jsstring_to_str(cx: *JSContext, s: *JSString) -> DOMString { unsafe { let length = 0; let chars = JS_GetStringCharsAndLength(cx, s, &length); @@ -196,7 +196,7 @@ pub fn jsstring_to_str(cx: *JSContext, s: *JSString) -> ~str { } } -pub fn jsid_to_str(cx: *JSContext, id: jsid) -> ~str { +pub fn jsid_to_str(cx: *JSContext, id: jsid) -> DOMString { unsafe { assert!(RUST_JSID_IS_STRING(id) != 0); jsstring_to_str(cx, RUST_JSID_TO_STRING(id)) @@ -210,7 +210,7 @@ pub enum StringificationBehavior { } pub fn jsval_to_str(cx: *JSContext, v: JSVal, - nullBehavior: StringificationBehavior) -> Result<~str, ()> { + nullBehavior: StringificationBehavior) -> Result<DOMString, ()> { if jsval::is_null(v) && nullBehavior == Empty { Ok(~"") } else { |