contents_formatted should return a Vec<u8>

the overall terminal escape sequence byte stream is not necessarily
utf8-safe, even if individual cell contents are

4 files changed, 16 insertions, 16 deletions

diff --git a/tests/escape.rs b/tests/escape.rs
index d2dd5b1..2c7d745 100644
--- a/tests/escape.rs
+++ b/tests/escape.rs
@@ -26,7 +26,7 @@ fn ris() {
     assert_eq!(cell.contents(), "");
 
     assert_eq!(parser.screen().contents(0, 0, 23, 79), "");
-    assert_eq!(parser.screen().contents_formatted(0, 0, 23, 79), "");
+    assert_eq!(parser.screen().contents_formatted(0, 0, 23, 79), b"");
 
     assert_eq!(parser.screen().title(), "");
     assert_eq!(parser.screen().icon_name(), "");
@@ -64,7 +64,7 @@ fn ris() {
     assert_eq!(parser.screen().contents(0, 0, 23, 79), "foo");
     assert_eq!(
         parser.screen().contents_formatted(0, 0, 23, 79),
-        "f\x1b[31;47;1;3;4moo"
+        b"f\x1b[31;47;1;3;4moo"
     );
 
     assert_eq!(parser.screen().title(), "window title");
@@ -100,7 +100,7 @@ fn ris() {
     assert_eq!(cell.contents(), "");
 
     assert_eq!(parser.screen().contents(0, 0, 23, 79), "");
-    assert_eq!(parser.screen().contents_formatted(0, 0, 23, 79), "");
+    assert_eq!(parser.screen().contents_formatted(0, 0, 23, 79), b"");
 
     // title and icon name don't change with reset
     assert_eq!(parser.screen().title(), "window title");
@@ -168,20 +168,20 @@ fn decsc() {
     assert_eq!(parser.screen().cursor_position(), (4, 3));
     assert_eq!(
         parser.screen().contents_formatted(0, 0, 23, 79),
-        "\r\n\r\n\r\n\r\n\x1b[31mfoo"
+        b"\r\n\r\n\r\n\r\n\x1b[31mfoo"
     );
 
     parser.process(b"\x1b[32m\x1b[?6lbar");
     assert_eq!(parser.screen().cursor_position(), (0, 3));
     assert_eq!(
         parser.screen().contents_formatted(0, 0, 23, 79),
-        "\x1b[32mbar\r\n\r\n\r\n\r\n\x1b[31mfoo"
+        b"\x1b[32mbar\r\n\r\n\r\n\r\n\x1b[31mfoo"
     );
 
     parser.process(b"\x1b8\x1b[Hz");
     assert_eq!(parser.screen().cursor_position(), (4, 1));
     assert_eq!(
         parser.screen().contents_formatted(0, 0, 23, 79),
-        "\x1b[32mbar\r\n\r\n\r\n\r\n\x1b[31mzoo"
+        b"\x1b[32mbar\r\n\r\n\r\n\r\n\x1b[31mzoo"
     );
 }
diff --git a/tests/init.rs b/tests/init.rs
index cf9d146..61395e4 100644
--- a/tests/init.rs
+++ b/tests/init.rs
@@ -16,7 +16,7 @@ fn init() {
     assert!(cell.is_none());
 
     assert_eq!(parser.screen().contents(0, 0, 23, 79), "");
-    assert_eq!(parser.screen().contents_formatted(0, 0, 23, 79), "");
+    assert_eq!(parser.screen().contents_formatted(0, 0, 23, 79), b"");
 
     assert_eq!(parser.screen().title(), "");
     assert_eq!(parser.screen().icon_name(), "");
diff --git a/tests/split-escapes.rs b/tests/split-escapes.rs
index 36a9eaa..157ff29 100644
--- a/tests/split-escapes.rs
+++ b/tests/split-escapes.rs
@@ -7,7 +7,7 @@ fn get_file_contents(name: &str) -> Vec<u8> {
     buf
 }
 
-fn write_to_parser(chunks: &mut Vec<Vec<u8>>) -> (String, String) {
+fn write_to_parser(chunks: &mut Vec<Vec<u8>>) -> (String, Vec<u8>) {
     let mut parser = vt100::Parser::new(37, 193);
     for chunk in chunks.iter_mut() {
         parser.process(&chunk);
diff --git a/tests/window_contents.rs b/tests/window_contents.rs
index 898351e..5fe0cda 100644
--- a/tests/window_contents.rs
+++ b/tests/window_contents.rs
@@ -2,7 +2,7 @@
 fn formatted() {
     let mut parser = vt100::Parser::new(24, 80);
     compare_formatted(&parser);
-    assert_eq!(parser.screen().contents_formatted(0, 0, 23, 79), "");
+    assert_eq!(parser.screen().contents_formatted(0, 0, 23, 79), b"");
 
     parser.process(b"foobar");
     compare_formatted(&parser);
@@ -10,7 +10,7 @@ fn formatted() {
     assert!(!parser.screen().cell(0, 3).unwrap().bold());
     assert!(!parser.screen().cell(0, 4).unwrap().bold());
     assert!(!parser.screen().cell(0, 5).unwrap().bold());
-    assert_eq!(parser.screen().contents_formatted(0, 0, 23, 79), "foobar");
+    assert_eq!(parser.screen().contents_formatted(0, 0, 23, 79), b"foobar");
 
     parser.process(b"\x1b[1;4H\x1b[1;7m\x1b[33mb");
     compare_formatted(&parser);
@@ -20,7 +20,7 @@ fn formatted() {
     assert!(!parser.screen().cell(0, 5).unwrap().bold());
     assert_eq!(
         parser.screen().contents_formatted(0, 0, 23, 79),
-        "foo\x1b[33;1;7mb\x1b[mar"
+        b"foo\x1b[33;1;7mb\x1b[mar"
     );
 
     parser.process(b"\x1b[1;5H\x1b[22;42ma");
@@ -31,27 +31,27 @@ fn formatted() {
     assert!(!parser.screen().cell(0, 5).unwrap().bold());
     assert_eq!(
         parser.screen().contents_formatted(0, 0, 23, 79),
-        "foo\x1b[33;1;7mb\x1b[42;22ma\x1b[mr"
+        b"foo\x1b[33;1;7mb\x1b[42;22ma\x1b[mr"
     );
 
     parser.process(b"\x1b[1;6H\x1b[35mr\r\nquux");
     compare_formatted(&parser);
     assert_eq!(
         parser.screen().contents_formatted(0, 0, 23, 79),
-        "foo\x1b[33;1;7mb\x1b[42;22ma\x1b[35mr\r\nquux"
+        &b"foo\x1b[33;1;7mb\x1b[42;22ma\x1b[35mr\r\nquux"[..]
     );
 
     parser.process(b"\x1b[2;1H\x1b[45mquux");
     compare_formatted(&parser);
     assert_eq!(
         parser.screen().contents_formatted(0, 0, 23, 79),
-        "foo\x1b[33;1;7mb\x1b[42;22ma\x1b[35mr\r\n\x1b[45mquux"
+        &b"foo\x1b[33;1;7mb\x1b[42;22ma\x1b[35mr\r\n\x1b[45mquux"[..]
     );
 
     parser
         .process(b"\x1b[2;2H\x1b[38;2;123;213;231mu\x1b[38;5;254mu\x1b[39mx");
     compare_formatted(&parser);
-    assert_eq!(parser.screen().contents_formatted(0, 0 ,23, 79), "foo\x1b[33;1;7mb\x1b[42;22ma\x1b[35mr\r\n\x1b[45mq\x1b[38;2;123;213;231mu\x1b[38;5;254mu\x1b[39mx");
+    assert_eq!(parser.screen().contents_formatted(0, 0 ,23, 79), &b"foo\x1b[33;1;7mb\x1b[42;22ma\x1b[35mr\r\n\x1b[45mq\x1b[38;2;123;213;231mu\x1b[38;5;254mu\x1b[39mx"[..]);
 }
 
 fn compare_formatted(parser: &vt100::Parser) {
@@ -59,7 +59,7 @@ fn compare_formatted(parser: &vt100::Parser) {
     let contents =
         parser.screen().contents_formatted(0, 0, rows - 1, cols - 1);
     let mut parser2 = vt100::Parser::new(rows, cols);
-    parser2.process(contents.as_bytes());
+    parser2.process(&contents);
     compare_cells(parser, &parser2);
 }