Add plugins for compositing and net crates #7699

Changed to_string calls to to_owned calls
where was a need.
This commit is contained in:
Maciej Skrzypkowski 2015-09-22 13:47:05 +02:00
parent 44de9173cc
commit 88815d21ba
18 changed files with 43 additions and 31 deletions

View file

@ -43,6 +43,9 @@ path = "../canvas_traits"
[dependencies.canvas]
path = "../canvas"
[dependencies.plugins]
path = "../plugins"
[dependencies.azure]
git = "https://github.com/servo/rust-azure"

View file

@ -248,7 +248,7 @@ fn initialize_png(width: usize, height: usize) -> (Vec<gl::GLuint>, Vec<gl::GLui
}
pub fn reporter_name() -> String {
"compositor-reporter".to_string()
"compositor-reporter".to_owned()
}
impl<Window: WindowMethods> IOCompositor<Window> {

View file

@ -486,10 +486,10 @@ impl<LTF: LayoutTaskFactory, STF: ScriptTaskFactory> Constellation<LTF, STF> {
}
ConstellationMsg::GetClipboardContents(sender) => {
let result = self.clipboard_ctx.as_ref().map_or(
"".to_string(),
"".to_owned(),
|ctx| ctx.get_contents().unwrap_or_else(|e| {
debug!("Error getting clipboard contents ({}), defaulting to empty string", e);
"".to_string()
"".to_owned()
})
);
sender.send(result).unwrap();

View file

@ -6,6 +6,8 @@
#![feature(iter_cmp)]
#![feature(slice_bytes)]
#![feature(vec_push_all)]
#![feature(plugin)]
#![plugin(plugins)]
#![deny(unsafe_code)]