Add score display

[rs2048.git] / src / display.rs

diff --git a/src/display.rs b/src/display.rs
index fba426af462e4c403e52fa6c14e8717dde8d4ba1..16e6fb9e6868c1eaea7111d4f94e02c0666adf8a 100644 (file)
--- a/src/display.rs
+++ b/src/display.rs
@@ -53,26 +53,15 @@ fn write_line(stdout: &mut std::io::Stdout, vec: &[u32], mode: Mode) -> crosster
             _ => {}
         };
 
-        if let Mode::Data_ = mode {
-            if n == 0 {
-                queue!(stdout, Print(" ".repeat(FIELD_WIDTH - 2)))?;
-            } else {
-                queue!(
-                    stdout,
-                    Print(format!("{:^w$}", 1 << n, w = FIELD_WIDTH - 2))
-                )?;
-            }
-        } else {
-            queue!(
-                stdout,
-                Print(match mode {
-                    Mode::Roof_ | Mode::Base_ => "━".repeat(FIELD_WIDTH),
-                    Mode::Floor => "─".repeat(FIELD_WIDTH),
-                    Mode::Empty => " ".repeat(FIELD_WIDTH - 2),
-                    Mode::Data_ => panic!("unreachable"),
-                })
-            )?;
-        }
+        queue!(
+            stdout,
+            Print(match mode {
+                Mode::Roof_ | Mode::Base_ => "━".repeat(FIELD_WIDTH),
+                Mode::Floor => "─".repeat(FIELD_WIDTH),
+                Mode::Data_ if n != 0 => format!("{:^w$}", 1 << n, w = FIELD_WIDTH - 2),
+                Mode::Empty | Mode::Data_ => " ".repeat(FIELD_WIDTH - 2),
+            })
+        )?;
 
         match mode {
             Mode::Data_ | Mode::Empty => {