From 60560a4b3167c0bf0967f4a7e01d9e77a6c38d16 Mon Sep 17 00:00:00 2001 From: Dheepak Krishnamurthy Date: Thu, 29 Oct 2020 00:11:04 -0600 Subject: [PATCH] Revert 42d2704 --- src/app.rs | 6 +++--- src/config.rs | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/app.rs b/src/app.rs index e156514..0a4377e 100644 --- a/src/app.rs +++ b/src/app.rs @@ -672,9 +672,9 @@ impl TTApp { } } - let output = task.output().unwrap(); - let data = String::from_utf8(output.stdout).unwrap(); - let error = String::from_utf8(output.stderr).unwrap(); + let output = task.output()?; + let data = String::from_utf8(output.stdout)?; + let error = String::from_utf8(output.stderr)?; if !error.contains("The expression could not be evaluated.") { let imported = import(data.as_bytes())?; *(self.tasks.lock().unwrap()) = imported; diff --git a/src/config.rs b/src/config.rs index aa64fdd..434f04b 100644 --- a/src/config.rs +++ b/src/config.rs @@ -96,9 +96,9 @@ impl Config { fn get_color_collection() -> Result, Box> { let mut color_collection = HashMap::new(); - let output = Command::new("task").arg("rc.color=off").arg("show").output().unwrap(); + let output = Command::new("task").arg("rc.color=off").arg("show").output()?; - let data = String::from_utf8(output.stdout).unwrap(); + let data = String::from_utf8(output.stdout).expect("Unable to convert stdout to string"); for line in data.split('\n') { if line.starts_with("color.") { let mut i = line.split(' ');