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

@ -1143,7 +1143,7 @@ impl ScriptTask {
match maybe_node {
Some(el) => {
let node = NodeCast::from_ref(el);
debug!("clicked on {:s}", node.debug_str());
debug!("clicked on {}", node.debug_str());
// Prevent click event if form control element is disabled.
if node.click_event_filter_by_disabled_state() { return; }
match *page.frame() {