summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorJesse Luehrs <doy@tozt.net>2022-02-12 13:25:39 -0500
committerJesse Luehrs <doy@tozt.net>2022-02-12 13:25:39 -0500
commit7b66471194490a1421001fd51d073cc6d18848ea (patch)
tree3a53e4bd79748a5eb1d096aea3ad5a52b81b8327 /src
parent42e976aaed4b4a01fc55cb56e789144849807aac (diff)
downloadnbsh-7b66471194490a1421001fd51d073cc6d18848ea.tar.gz
nbsh-7b66471194490a1421001fd51d073cc6d18848ea.zip
clippy
Diffstat (limited to 'src')
-rw-r--r--src/shell/history/pty.rs5
-rw-r--r--src/shell/mod.rs2
2 files changed, 5 insertions, 2 deletions
diff --git a/src/shell/history/pty.rs b/src/shell/history/pty.rs
index 0fe0942..5a51e73 100644
--- a/src/shell/history/pty.rs
+++ b/src/shell/history/pty.rs
@@ -70,9 +70,10 @@ async fn pty_task(
event_w.send(Event::PtyOutput).await.unwrap();
}
Err(e) => {
- if e.raw_os_error() != Some(libc::EIO) {
- panic!("pty read failed: {:?}", e);
+ if e.raw_os_error() == Some(libc::EIO) {
+ continue;
}
+ panic!("pty read failed: {:?}", e);
}
},
Res::Write(res) => match res {
diff --git a/src/shell/mod.rs b/src/shell/mod.rs
index f7080a4..9c4002b 100644
--- a/src/shell/mod.rs
+++ b/src/shell/mod.rs
@@ -85,6 +85,8 @@ pub async fn main() -> anyhow::Result<i32> {
async_std::channel::unbounded();
{
let event_w = event_w.clone();
+ // clippy can't tell that we assign to this later
+ #[allow(clippy::no_effect_underscore_binding)]
let mut _active_watcher = None;
async_std::task::spawn(async move {
while let Ok(mut dir) = git_r.recv().await {