Merge branch 'master' into bold-flag

Author: ccmetz

src/ascii_art.rs

@@ -264,36 +264,36 @@ mod test {
     #[test]
     fn truncate() {
         let colors_shim = Vec::new();
-        assert_eq!(Tokens("").render(&colors_shim, 0, 0), "\u{1b}[37m\u{1b}[0m");
+        assert_eq!(Tokens("").render(&colors_shim, 0, 0), "\u{1b}[1;37m\u{1b}[0m");
 
         assert_eq!(
             Tokens("     ").render(&colors_shim, 0, 0),
-            "\u{1b}[37m\u{1b}[0m"
+            "\u{1b}[1;37m\u{1b}[0m"
         );
         assert_eq!(
             Tokens("     ").render(&colors_shim, 0, 5),
-            "\u{1b}[37m     \u{1b}[0m"
+            "\u{1b}[1;37m     \u{1b}[0m"
         );
         assert_eq!(
             Tokens("     ").render(&colors_shim, 1, 5),
-            "\u{1b}[37m    \u{1b}[0m"
+            "\u{1b}[1;37m    \u{1b}[0m"
         );
         assert_eq!(
             Tokens("     ").render(&colors_shim, 3, 5),
-            "\u{1b}[37m  \u{1b}[0m"
+            "\u{1b}[1;37m  \u{1b}[0m"
         );
         assert_eq!(
             Tokens("     ").render(&colors_shim, 0, 4),
-            "\u{1b}[37m    \u{1b}[0m"
+            "\u{1b}[1;37m    \u{1b}[0m"
         );
         assert_eq!(
             Tokens("     ").render(&colors_shim, 0, 3),
-            "\u{1b}[37m   \u{1b}[0m"
+            "\u{1b}[1;37m   \u{1b}[0m"
         );
 
         assert_eq!(
             Tokens("  {1} {5}  {9} a").render(&colors_shim, 4, 10),
-            "\u{1b}[37m\u{1b}[0m\u{1b}[37m\u{1b}[0m\u{1b}[37m \u{1b}[0m\u{1b}[37m a\u{1b}[0m   "
+            "\u{1b}[1;37m\u{1b}[0m\u{1b}[1;37m\u{1b}[0m\u{1b}[1;37m \u{1b}[0m\u{1b}[1;37m a\u{1b}[0m   "
         );
     }
 }