aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChristian Duerr <chrisduerr@users.noreply.github.com>2019-08-01 14:26:55 +0000
committerGitHub <noreply@github.com>2019-08-01 14:26:55 +0000
commitf51c7b067a05dec7863cca9b8bfaf8329b0cfdfc (patch)
tree4a140de556b4b93f142d57c56a9d74edfe563211
parent28b726cbfa9788bd563ea7a04212f917cc9341f2 (diff)
downloadalacritty-f51c7b067a05dec7863cca9b8bfaf8329b0cfdfc.tar.gz
alacritty-f51c7b067a05dec7863cca9b8bfaf8329b0cfdfc.zip
Remove color from log output
Fixes #2474.
-rw-r--r--alacritty/src/main.rs3
-rw-r--r--alacritty_terminal/src/util.rs37
-rw-r--r--alacritty_terminal/tests/ref.rs5
3 files changed, 3 insertions, 42 deletions
diff --git a/alacritty/src/main.rs b/alacritty/src/main.rs
index 3fa3ff53..65313cbe 100644
--- a/alacritty/src/main.rs
+++ b/alacritty/src/main.rs
@@ -49,7 +49,6 @@ use alacritty_terminal::panic;
use alacritty_terminal::sync::FairMutex;
use alacritty_terminal::term::{cell::Cell, Term};
use alacritty_terminal::tty;
-use alacritty_terminal::util::fmt::Red;
use alacritty_terminal::{die, event};
mod cli;
@@ -109,7 +108,7 @@ fn main() {
// Run alacritty
if let Err(err) = run(config, message_buffer) {
- die!("Alacritty encountered an unrecoverable error:\n\n\t{}\n", Red(err));
+ die!("Alacritty encountered an unrecoverable error:\n\n\t{}\n", err);
}
// Clean up logfile
diff --git a/alacritty_terminal/src/util.rs b/alacritty_terminal/src/util.rs
index 7bc7c08b..250fa430 100644
--- a/alacritty_terminal/src/util.rs
+++ b/alacritty_terminal/src/util.rs
@@ -44,43 +44,6 @@ pub fn limit<T: Ord>(value: T, min: T, max: T) -> T {
cmp::min(cmp::max(value, min), max)
}
-/// Utilities for writing to the
-pub mod fmt {
- use std::fmt;
-
- macro_rules! define_colors {
- ($($(#[$attrs:meta])* pub struct $s:ident => $color:expr;)*) => {
- $(
- $(#[$attrs])*
- pub struct $s<T>(pub T);
-
- impl<T: fmt::Display> fmt::Display for $s<T> {
- fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
- write!(f, concat!("\x1b[", $color, "m{}\x1b[0m"), self.0)
- }
- }
-
- impl<T: fmt::Debug> fmt::Debug for $s<T> {
- fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
- write!(f, concat!("\x1b[", $color, "m{:?}\x1b[0m"), self.0)
- }
- }
- )*
- }
- }
-
- define_colors! {
- /// Write a `Display` or `Debug` escaped with Red
- pub struct Red => "31";
-
- /// Write a `Display` or `Debug` escaped with Green
- pub struct Green => "32";
-
- /// Write a `Display` or `Debug` escaped with Yellow
- pub struct Yellow => "33";
- }
-}
-
#[cfg(not(windows))]
pub fn start_daemon<I, S>(program: &str, args: I) -> io::Result<()>
where
diff --git a/alacritty_terminal/tests/ref.rs b/alacritty_terminal/tests/ref.rs
index 91c0b6ee..fb87adb1 100644
--- a/alacritty_terminal/tests/ref.rs
+++ b/alacritty_terminal/tests/ref.rs
@@ -13,7 +13,6 @@ use alacritty_terminal::index::Column;
use alacritty_terminal::message_bar::MessageBuffer;
use alacritty_terminal::term::cell::Cell;
use alacritty_terminal::term::SizeInfo;
-use alacritty_terminal::util::fmt::{Green, Red};
use alacritty_terminal::Grid;
use alacritty_terminal::Term;
@@ -116,8 +115,8 @@ fn ref_test(dir: &Path) {
"[{i}][{j}] {original:?} => {now:?}",
i = i,
j = j,
- original = Green(original_cell),
- now = Red(cell)
+ original = original_cell,
+ now = cell,
);
}
}