auto merge of #4535 : servo/servo/pre-rustup_20141221, r=jdm

This prepares for the rust upgrade currently being conducted.
This commit is contained in:
bors-servo 2015-01-03 14:39:46 -07:00
commit e8fac3681b
35 changed files with 63 additions and 66 deletions

View file

@ -780,7 +780,7 @@ impl<Window: WindowMethods> IOCompositor<Window> {
}
fn on_load_url_window_event(&mut self, url_string: String) {
debug!("osmain: loading URL `{:s}`", url_string);
debug!("osmain: loading URL `{}`", url_string);
self.got_load_complete_message = false;
let root_pipeline_id = match self.scene.root {
Some(ref layer) => layer.extra_data.borrow().pipeline.id.clone(),