optimize attribute setting a bit

3 files changed, 20 insertions, 28 deletions

diff --git a/tests/escape.rs b/tests/escape.rs
index 1800ce8..cf28c0f 100644
--- a/tests/escape.rs
+++ b/tests/escape.rs
@@ -65,7 +65,8 @@ fn ris() {
     assert_eq!(parser.screen().contents(), "foo");
     assert_eq!(
         parser.screen().contents_formatted(),
-        &b"\x1b[?25l\x1b[m\x1b[H\x1b[Jf\x1b[31;47;1;3;4moo\x1b[21;21H"[..]
+        &b"\x1b[?25l\x1b[m\x1b[H\x1b[Jf\x1b[31;47;1;3;4moo\x1b[21;21H\x1b[7m"
+            [..]
     );
 
     assert_eq!(parser.screen().title(), "window title");
@@ -160,7 +161,7 @@ fn decsc() {
     assert_eq!(parser.screen().cursor_position(), (0, 3));
     assert_eq!(
         parser.screen().contents_formatted(),
-        &b"\x1b[?25h\x1b[m\x1b[H\x1b[J\x1b[32mbar\x1b[5;1H\x1b[31mfoo\x1b[1;4H"[..]
+        &b"\x1b[?25h\x1b[m\x1b[H\x1b[J\x1b[32mbar\x1b[5;1H\x1b[31mfoo\x1b[1;4H\x1b[32m"[..]
     );
 
     parser.process(b"\x1b8\x1b[Hz");
diff --git a/tests/text.rs b/tests/text.rs
index 8578567..49cde5b 100644
--- a/tests/text.rs
+++ b/tests/text.rs
@@ -62,10 +62,7 @@ fn wide() {
         parser.screen().contents_formatted(),
         "\x1b[?25h\x1b[m\x1b[H\x1b[Jaデbネ".as_bytes()
     );
-    assert_eq!(
-        parser.screen().contents_diff(&screen),
-        "\x1b[maデbネ".as_bytes()
-    );
+    assert_eq!(parser.screen().contents_diff(&screen), "aデbネ".as_bytes());
 
     let screen = parser.screen().clone();
     parser.process(b"\x1b[1;1H\x1b[3Cc");
@@ -77,7 +74,7 @@ fn wide() {
     );
     assert_eq!(
         parser.screen().contents_diff(&screen),
-        "\x1b[m\x1b[1;4Hc".as_bytes()
+        "\x1b[1;4Hc".as_bytes()
     );
 
     let screen = parser.screen().clone();
@@ -90,7 +87,7 @@ fn wide() {
     );
     assert_eq!(
         parser.screen().contents_diff(&screen),
-        "\x1b[m\x1b[2Cfoobar".as_bytes()
+        "\x1b[2Cfoobar".as_bytes()
     );
 
     let screen = parser.screen().clone();
@@ -103,7 +100,7 @@ fn wide() {
     );
     assert_eq!(
         parser.screen().contents_diff(&screen),
-        "\x1b[m\x1b[Hデcネfo\x1b[Cbar\x1b[X".as_bytes()
+        "\x1b[Hデcネfo\x1b[Cbar\x1b[X".as_bytes()
     );
 
     let screen = parser.screen().clone();
@@ -116,7 +113,7 @@ fn wide() {
     );
     assert_eq!(
         parser.screen().contents_diff(&screen),
-        "\x1b[m\x1b[Haデcネf\x1b[Cobar".as_bytes()
+        "\x1b[Haデcネf\x1b[Cobar".as_bytes()
     );
 
     let screen = parser.screen().clone();
@@ -129,7 +126,7 @@ fn wide() {
     );
     assert_eq!(
         parser.screen().contents_diff(&screen),
-        "\x1b[m\x1b[Hデcネfo\x1b[Cbar\x1b[X".as_bytes()
+        "\x1b[Hデcネfo\x1b[Cbar\x1b[X".as_bytes()
     );
 }
 
@@ -156,7 +153,7 @@ fn combining() {
     assert_eq!(parser.screen().contents(), "abcdefg");
     let screen = parser.screen().clone();
     parser.process(b"\x1bcabcdefg");
-    assert_eq!(parser.screen().contents_diff(&screen), b"\x1b[m");
+    assert_eq!(parser.screen().contents_diff(&screen), b"");
 }
 
 #[test]
diff --git a/tests/window_contents.rs b/tests/window_contents.rs
index 0df62ef..a1607bd 100644
--- a/tests/window_contents.rs
+++ b/tests/window_contents.rs
@@ -28,7 +28,7 @@ fn formatted() {
     assert!(!parser.screen().cell(0, 5).unwrap().bold());
     assert_eq!(
         parser.screen().contents_formatted(),
-        &b"\x1b[?25h\x1b[m\x1b[H\x1b[Jfoo\x1b[33;1;7mb\x1b[mar\x1b[1;5H"[..]
+        &b"\x1b[?25h\x1b[m\x1b[H\x1b[Jfoo\x1b[33;1;7mb\x1b[mar\x1b[1;5H\x1b[33;1;7m"[..]
     );
 
     parser.process(b"\x1b[1;5H\x1b[22;42ma");
@@ -39,7 +39,7 @@ fn formatted() {
     assert!(!parser.screen().cell(0, 5).unwrap().bold());
     assert_eq!(
         parser.screen().contents_formatted(),
-        &b"\x1b[?25h\x1b[m\x1b[H\x1b[Jfoo\x1b[33;1;7mb\x1b[42;22ma\x1b[mr\x1b[1;6H"
+        &b"\x1b[?25h\x1b[m\x1b[H\x1b[Jfoo\x1b[33;1;7mb\x1b[42;22ma\x1b[mr\x1b[1;6H\x1b[33;42;7m"
             [..]
     );
 
@@ -71,7 +71,7 @@ fn empty_cells() {
     assert_eq!(parser.screen().contents(), "foo   bar");
     assert_eq!(
         parser.screen().contents_formatted(),
-        &b"\x1b[?25h\x1b[m\x1b[H\x1b[J\x1b[31mfoo\x1b[2C\x1b[32m bar\x1b[1;4H"[..]
+        &b"\x1b[?25h\x1b[m\x1b[H\x1b[J\x1b[31mfoo\x1b[2C\x1b[32m bar\x1b[1;4H\x1b[31m"[..]
     );
 }
 
@@ -87,7 +87,7 @@ fn cursor_positioning() {
         parser.screen().contents_formatted(),
         b"\x1b[?25h\x1b[m\x1b[H\x1b[J:"
     );
-    assert_eq!(parser.screen().contents_diff(&screen1), b"\x1b[m:");
+    assert_eq!(parser.screen().contents_diff(&screen1), b":");
 
     parser.process(b"a");
     let screen3 = parser.screen().clone();
@@ -96,7 +96,7 @@ fn cursor_positioning() {
         parser.screen().contents_formatted(),
         b"\x1b[?25h\x1b[m\x1b[H\x1b[J:a"
     );
-    assert_eq!(parser.screen().contents_diff(&screen2), b"\x1b[ma");
+    assert_eq!(parser.screen().contents_diff(&screen2), b"a");
 
     parser.process(b"\x1b[1;2H\x1b[K");
     assert_eq!(parser.screen().cursor_position(), (0, 1));
@@ -104,10 +104,7 @@ fn cursor_positioning() {
         parser.screen().contents_formatted(),
         b"\x1b[?25h\x1b[m\x1b[H\x1b[J:"
     );
-    assert_eq!(
-        parser.screen().contents_diff(&screen3),
-        b"\x1b[m\x1b[1;2H\x1b[X"
-    );
+    assert_eq!(parser.screen().contents_diff(&screen3), b"\x1b[1;2H\x1b[X");
 }
 
 #[test]
@@ -420,25 +417,22 @@ fn diff() {
     let screen1 = parser.screen().clone();
     parser.process(b"\x1b[5C\x1b[32m bar");
     let screen2 = parser.screen().clone();
-    assert_eq!(
-        screen2.contents_diff(&screen1),
-        b"\x1b[m\x1b[5C\x1b[32m bar"
-    );
+    assert_eq!(screen2.contents_diff(&screen1), b"\x1b[5C\x1b[32m bar");
     compare_diff(&screen1, &screen2, b"");
 
     parser.process(b"\x1b[H\x1b[31mfoo");
     let screen3 = parser.screen().clone();
-    assert_eq!(screen3.contents_diff(&screen2), b"\x1b[m\x1b[H\x1b[31mfoo");
+    assert_eq!(screen3.contents_diff(&screen2), b"\x1b[H\x1b[31mfoo");
     compare_diff(&screen2, &screen3, b"\x1b[5C\x1b[32m bar");
 
     parser.process(b"\x1b[1;7H\x1b[32mbaz");
     let screen4 = parser.screen().clone();
-    assert_eq!(screen4.contents_diff(&screen3), b"\x1b[m\x1b[5C\x1b[32mz");
+    assert_eq!(screen4.contents_diff(&screen3), b"\x1b[5C\x1b[32mz");
     compare_diff(&screen3, &screen4, b"\x1b[5C\x1b[32m bar\x1b[H\x1b[31mfoo");
 
     parser.process(b"\x1b[1;8H\x1b[X");
     let screen5 = parser.screen().clone();
-    assert_eq!(screen5.contents_diff(&screen4), b"\x1b[m\x1b[1;8H\x1b[X");
+    assert_eq!(screen5.contents_diff(&screen4), b"\x1b[1;8H\x1b[X");
     compare_diff(
         &screen4,
         &screen5,