diff options
| author | bors-servo <release+servo@mozilla.com> | 2014-05-04 01:01:21 -0400 |
|---|---|---|
| committer | bors-servo <release+servo@mozilla.com> | 2014-05-04 01:01:21 -0400 |
| commit | 660f7a016ee75a418afda9e92d45b79eff6ba540 (patch) | |
| tree | 64dcd6f6eace86d63688100c37de00ea238262de /src/components/script/dom/bindings | |
| parent | 731e66ff132e41cdc49bc5324c0e15be19c46ec2 (diff) | |
| parent | 243814022e06c35c9bcdd99ccd281cb6ed180db0 (diff) | |
| download | servo-660f7a016ee75a418afda9e92d45b79eff6ba540.tar.gz servo-660f7a016ee75a418afda9e92d45b79eff6ba540.zip | |
auto merge of #2311 : Ms2ger/servo/empty-owned, r=jdm
Diffstat (limited to 'src/components/script/dom/bindings')
| -rw-r--r-- | src/components/script/dom/bindings/conversions.rs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/components/script/dom/bindings/conversions.rs b/src/components/script/dom/bindings/conversions.rs index 02d6983cf3b..bcbf088ef41 100644 --- a/src/components/script/dom/bindings/conversions.rs +++ b/src/components/script/dom/bindings/conversions.rs @@ -243,7 +243,7 @@ impl Default for StringificationBehavior { impl FromJSValConvertible<StringificationBehavior> for DOMString { fn from_jsval(cx: *JSContext, value: JSVal, nullBehavior: StringificationBehavior) -> Result<DOMString, ()> { if nullBehavior == Empty && value.is_null() { - Ok(~"") + Ok("".to_owned()) } else { let jsstr = unsafe { JS_ValueToString(cx, value) }; if jsstr.is_null() { |