strangechoice/ironbar-fork
1
0
Fork 0
Code Pull Requests Activity

refactor: standardise error messages

Browse Source
This commit is contained in:
Jake Stanger
2022-12-11 21:31:45 +00:00
parent fd2d7e5c7a
commit 9d5049dde0
19 changed files with 117 additions and 110 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
src/script.rs
View File

@@ -1,3 +1,4 @@
use crate::error as err;
use color_eyre::eyre::WrapErr;
use color_eyre::{Report, Result};
use serde::Deserialize;
@@ -129,12 +130,10 @@ impl From<&str> for Script {
.iter()
.take_while(|c| c.is_ascii_digit())
.collect::<String>();
(
ScriptInputToken::Interval(
interval_str.parse::<u64>().expect("Invalid interval"),
),
interval_str.len(),
)
// TODO: Handle this better than panicking
let interval = interval_str.parse::<u64>().expect("Invalid interval");
(ScriptInputToken::Interval(interval), interval_str.len())
}
// watching or polling
'w' | 'p' => {
@@ -262,10 +261,10 @@ impl Script {
select! {
_ = handle.wait() => break,
Ok(Some(line)) = stdout_lines.next_line() => {
tx.send(OutputStream::Stdout(line)).await.expect("Failed to send stdout");
tx.send(OutputStream::Stdout(line)).await.expect(err::ERR_CHANNEL_SEND);
}
Ok(Some(line)) = stderr_lines.next_line() => {
tx.send(OutputStream::Stderr(line)).await.expect("Failed to send stderr");
tx.send(OutputStream::Stderr(line)).await.expect(err::ERR_CHANNEL_SEND);
}
}
}