Merge pull request #26901 from alexcrichton/beta-backport

Backporting accepted PRs to beta

Author: brson

RELEASES.md

@@ -1,3 +1,18 @@
+Version 1.2.0 (August 2015)
+===========================
+
+Highlights
+----------
+
+* [Parallel codegen][parcodegen] is now working again, which can substantially
+  speed up large builds in debug mode; It also gets another ~33% speedup when
+  bootstrapping on a 4 core machine (using 8 jobs). It's not enabled by default,
+  but will be "in the near future"
+
+
+[parcodegen]: https://github.com/rust-lang/rust/pull/26018
+
+
 Version 1.1.0 (June 2015)
 =========================
 

src/libcore/fmt/mod.rs

@@ -980,7 +980,14 @@ impl Debug for char {
 #[stable(feature = "rust1", since = "1.0.0")]
 impl Display for char {
     fn fmt(&self, f: &mut Formatter) -> Result {
-        f.write_char(*self)
+        if f.width.is_none() && f.precision.is_none() {
+            f.write_char(*self)
+        } else {
+            let mut utf8 = [0; 4];
+            let amt = self.encode_utf8(&mut utf8).unwrap_or(0);
+            let s: &str = unsafe { mem::transmute(&utf8[..amt]) };
+            f.pad(s)
+        }
     }
 }
 

src/libcoretest/fmt/mod.rs

@@ -16,4 +16,6 @@ fn test_format_flags() {
     // No residual flags left by pointer formatting
     let p = "".as_ptr();
     assert_eq!(format!("{:p} {:x}", p, 16), format!("{:p} 10", p));
+
+    assert_eq!(format!("{: >3}", 'a'), "  a");
 }