diff options
| author | Jack Moffitt <jack@metajack.im> | 2014-06-01 00:21:53 -0600 |
|---|---|---|
| committer | Jack Moffitt <jack@metajack.im> | 2014-06-05 09:58:59 -0600 |
| commit | 629c4c6afe7cea86c051bb9f52adeac716e2c43f (patch) | |
| tree | ee84d9a9b37ecd37e0a9606509624e7f728f5a81 /src/components/script/dom/bindings/conversions.rs | |
| parent | 2ae671b5aa9d27812adcdb8ebc749733156df66e (diff) | |
| download | servo-629c4c6afe7cea86c051bb9f52adeac716e2c43f.tar.gz servo-629c4c6afe7cea86c051bb9f52adeac716e2c43f.zip | |
Upgrade Rust.
Diffstat (limited to 'src/components/script/dom/bindings/conversions.rs')
| -rw-r--r-- | src/components/script/dom/bindings/conversions.rs | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/components/script/dom/bindings/conversions.rs b/src/components/script/dom/bindings/conversions.rs index 867e07ade30..96dc946a3d2 100644 --- a/src/components/script/dom/bindings/conversions.rs +++ b/src/components/script/dom/bindings/conversions.rs @@ -60,7 +60,7 @@ impl ToJSValConvertible for JSVal { unsafe fn convert_from_jsval<T: Default>( cx: *mut JSContext, value: JSVal, - convert_fn: extern "C" unsafe fn(*mut JSContext, JSVal, *mut T) -> JSBool) -> Result<T, ()> { + convert_fn: unsafe extern "C" fn(*mut JSContext, JSVal, *mut T) -> JSBool) -> Result<T, ()> { let mut ret = Default::default(); if convert_fn(cx, value, &mut ret) == 0 { Err(()) @@ -243,7 +243,7 @@ impl Default for StringificationBehavior { impl FromJSValConvertible<StringificationBehavior> for DOMString { fn from_jsval(cx: *mut JSContext, value: JSVal, nullBehavior: StringificationBehavior) -> Result<DOMString, ()> { if nullBehavior == Empty && value.is_null() { - Ok("".to_owned()) + Ok("".to_string()) } else { let jsstr = unsafe { JS_ValueToString(cx, value) }; if jsstr.is_null() { |