diff options
author | bors-servo <metajack+bors@gmail.com> | 2015-01-20 07:54:46 -0700 |
---|---|---|
committer | bors-servo <metajack+bors@gmail.com> | 2015-01-20 07:54:46 -0700 |
commit | 94ebc7c32d5ce58ada3f9d8ffdb60cc025eb5997 (patch) | |
tree | d4982abff1dae6119889edb12e7cc7623105396b /components/script/dom/keyboardevent.rs | |
parent | 89645391bf42edd9977ed1b6f9b430ad786f209e (diff) | |
parent | 01ed338746ae71493984259335197e6b66daec45 (diff) | |
download | servo-94ebc7c32d5ce58ada3f9d8ffdb60cc025eb5997.tar.gz servo-94ebc7c32d5ce58ada3f9d8ffdb60cc025eb5997.zip |
auto merge of #4682 : servo/servo/to_owned, r=jdm
into_string has been removed from Rust.
Diffstat (limited to 'components/script/dom/keyboardevent.rs')
-rw-r--r-- | components/script/dom/keyboardevent.rs | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/components/script/dom/keyboardevent.rs b/components/script/dom/keyboardevent.rs index e28f1c90c6c..cf4cadca3a1 100644 --- a/components/script/dom/keyboardevent.rs +++ b/components/script/dom/keyboardevent.rs @@ -15,6 +15,8 @@ use dom::uievent::UIEvent; use dom::window::Window; use servo_msg::constellation_msg; use servo_util::str::DOMString; + +use std::borrow::ToOwned; use std::cell::{RefCell, Cell}; #[jstraceable] @@ -44,8 +46,8 @@ impl KeyboardEvent { fn new_inherited() -> KeyboardEvent { KeyboardEvent { uievent: UIEvent::new_inherited(EventTypeId::KeyboardEvent), - key: RefCell::new("".into_string()), - code: RefCell::new("".into_string()), + key: RefCell::new("".to_owned()), + code: RefCell::new("".to_owned()), location: Cell::new(0), ctrl: Cell::new(false), alt: Cell::new(false), @@ -83,7 +85,7 @@ impl KeyboardEvent { key_code: u32) -> Temporary<KeyboardEvent> { let ev = KeyboardEvent::new_uninitialized(window).root(); ev.r().InitKeyboardEvent(type_, canBubble, cancelable, view, key, location, - "".into_string(), repeat, "".into_string()); + "".to_owned(), repeat, "".to_owned()); *ev.r().code.borrow_mut() = code; ev.r().ctrl.set(ctrlKey); ev.r().alt.set(altKey); |