Auto merge of #6254 - servo:rustup_20150601, r=SimonSapin

<!-- Reviewable:start -->
[<img src="https://reviewable.io/review_button.png" height=40 alt="Review on Reviewable"/>](https://reviewable.io/reviews/servo/servo/6254)
<!-- Reviewable:end -->
This commit is contained in:
bors-servo 2015-06-02 12:53:37 -05:00
commit 20f63459ef
15 changed files with 178 additions and 237 deletions

View file

@ -89,7 +89,7 @@ impl RestyleDamage {
}
}
impl fmt::Debug for RestyleDamage {
impl fmt::Display for RestyleDamage {
fn fmt(&self, f: &mut fmt::Formatter) -> Result<(), fmt::Error> {
let mut first_elem = true;