Use match instead of if-lets (fix #11)

This commit is contained in:
Roey Darwish Dror
2018-06-04 23:23:25 +03:00
parent 2def00501b
commit d473b288b3

View File

@@ -15,26 +15,36 @@ impl Terminal {
pub fn print_separator<P: AsRef<str>>(&self, message: P) { pub fn print_separator<P: AsRef<str>>(&self, message: P) {
let message = message.as_ref(); let message = message.as_ref();
if let Some(width) = self.width { match self.width {
print!("\n{}―― {} ", color::Fg(color::LightWhite), message); Some(width) => {
let border = max(2, min(80, width as usize) - 3 - message.len()); print!("\n{}―― {} ", color::Fg(color::LightWhite), message);
for _ in 0..border { let border = max(2, min(80, width as usize) - 3 - message.len());
print!(""); for _ in 0..border {
print!("");
}
println!("{}", color::Fg(color::Reset));
}
None => {
println!("―― {} ――", message);
} }
println!("{}", color::Fg(color::Reset));
} else {
println!("―― {} ――", message);
} }
} }
pub fn print_warning<P: AsRef<str>>(&self, message: P) { pub fn print_warning<P: AsRef<str>>(&self, message: P) {
if let Some(_) = self.width { let message = message.as_ref();
println!(
"{}{}{}", match self.width {
color::Fg(color::LightYellow), Some(_) => {
message.as_ref(), println!(
color::Fg(color::Reset) "{}{}{}",
); color::Fg(color::LightYellow),
message,
color::Fg(color::Reset)
);
}
None => {
println!("{}", message);
}
} }
} }
} }