code cleanup

src/lol.rs

@@ -2,7 +2,6 @@ use colored::Color;
 use regex::{Regex, RegexBuilder};
 use std::f64::consts;
 use std::io::{stdout, Write};
-use std::process::exit;
 
 fn rainbow(freq: f64, i: f64) -> (u8, u8, u8) {
     let red = ((freq * i).sin() * 127.0) as i16 + 128;
@@ -11,7 +10,13 @@ fn rainbow(freq: f64, i: f64) -> (u8, u8, u8) {
     (red as u8, green as u8, blue as u8)
 }
 
-pub fn print_rainbow(line: &str, freq: f64, seed: f64, spread: f64, invert: bool) {
+pub fn print_rainbow(
+    line: &str,
+    freq: f64,
+    seed: f64,
+    spread: f64,
+    invert: bool,
+) -> std::io::Result<()> {
     lazy_static! {
         static ref ANSI_ESCAPE: Regex =
             RegexBuilder::new("((?:\x1B(?:[ -/]+.|[]PX^_][^\x07\x1B]*|\\[[0-?]*.|.))*)(.?)")
@@ -25,23 +30,17 @@ pub fn print_rainbow(line: &str, freq: f64, seed: f64, spread: f64, invert: bool
         let color = Color::TrueColor { r, g, b };
 
         if invert {
-            if stdout()
-                .write_all(
-                    format!("{}\x1B[{}m{}\x1B[49m", &c[1], color.to_bg_str(), &c[2]).as_bytes(),
-                )
-                .is_err()
-            {
-                exit(0);
-            }
-        } else if stdout()
-            .write_all(format!("{}\x1B[{}m{}\x1B[39m", &c[1], color.to_fg_str(), &c[2]).as_bytes())
-            .is_err()
-        {
-            exit(0);
+            stdout().write_all(
+                format!("{}\x1B[{}m{}\x1B[49m", &c[1], color.to_bg_str(), &c[2]).as_bytes(),
+            )?;
+        } else {
+            stdout().write_all(
+                format!("{}\x1B[{}m{}\x1B[39m", &c[1], color.to_fg_str(), &c[2]).as_bytes(),
+            )?;
         }
     }
 
-    if stdout().write_all(&[b'\n']).is_err() {
-        exit(0);
-    }
+    stdout().write_all(&[b'\n'])?;
+
+    Ok(())
 }

src/main.rs

@@ -57,7 +57,9 @@ fn main() {
     for file_path in files {
         if file_path == "-" {
             while let Some((x, n)) = read_line() {
-                lol::print_rainbow(&x, opts.freq, seed, opts.spread, opts.invert);
+                if lol::print_rainbow(&x, opts.freq, seed, opts.spread, opts.invert).is_err() {
+                    std::process::exit(1);
+                }
                 if n == 0 {
                     // EOF
                     break;
@@ -76,7 +78,11 @@ fn main() {
             for x in buf.lines() {
                 match x {
                     Ok(x) => {
-                        lol::print_rainbow(&x, opts.freq, seed, opts.spread, opts.invert);
+                        if lol::print_rainbow(&x, opts.freq, seed, opts.spread, opts.invert)
+                            .is_err()
+                        {
+                            std::process::exit(1);
+                        }
                         println!();
                         seed += 1.0;
                     }