auto merge of #1163 : metajack/servo/kmc-rust-upgrade, r=kmcallister

Most work courtesy of @kmcallister.

I already reviewed Keegan's work, so just the last two commits need attention.

1 files changed, 2 insertions, 2 deletions

diff --git a/src/components/style/errors.rs b/src/components/style/errors.rs
index 2a60f66dca8..fdbf1c5167b 100644
--- a/src/components/style/errors.rs
+++ b/src/components/style/errors.rs
@@ -12,7 +12,7 @@ impl<T, I: Iterator<Result<T, SyntaxError>>> Iterator<T> for ErrorLoggerIterator
         for result in **self {
             match result {
                 Ok(v) => return Some(v),
-                Err(error) => log_css_error(error.location, fmt!("%?", error.reason))
+                Err(error) => log_css_error(error.location, format!("{:?}", error.reason))
             }
         }
         None
@@ -22,5 +22,5 @@ impl<T, I: Iterator<Result<T, SyntaxError>>> Iterator<T> for ErrorLoggerIterator
 
 pub fn log_css_error(location: SourceLocation, message: &str) {
     // TODO eventually this will got into a "web console" or something.
-    info!("%u:%u %s", location.line, location.column, message)
+    info!("{:u}:{:u} {:s}", location.line, location.column, message)
 }