Rust upgrade to rustc hash b03a2755193cd756583bcf5831cf4545d75ecb8a

This commit is contained in:
Jack Moffitt 2014-11-05 12:33:11 -07:00 committed by Glenn Watson
parent 26045d7fcb
commit d1b433a3b3
160 changed files with 1427 additions and 1162 deletions

View file

@ -357,13 +357,13 @@ impl Page {
}
Ok(_) => {}
Err(Disconnected) => {
fail!("Layout task failed while script was waiting for a result.");
panic!("Layout task failed while script was waiting for a result.");
}
}
debug!("script: layout joined")
}
None => fail!("reader forked but no join port?"),
None => panic!("reader forked but no join port?"),
}
}
}
@ -393,7 +393,7 @@ impl Page {
debug!("avoided {:d} reflows", self.avoided_reflows.get());
self.avoided_reflows.set(0);
debug!("script: performing reflow for goal {:?}", goal);
debug!("script: performing reflow for goal {}", goal);
// Now, join the layout so that they will see the latest changes we have made.
self.join_layout();