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

@ -717,7 +717,7 @@ impl LayoutTask {
mem::transmute(&mut node)
};
debug!("layout: received layout request for: {:s}", data.url.serialize());
debug!("layout: received layout request for: {}", data.url.serialize());
debug!("layout: parsed Node tree");
if log_enabled!(log::DEBUG) {
node.dump();