wez/wezterm
1
1
Fork 0
mirror of https://github.com/wez/wezterm.git synced 2024-11-23 15:04:36 +03:00
Code Issues Projects Releases Wiki Activity

mux client: avoid unwrap in a couple of cases

Browse Source 
propagate the likely client destroyed error instead

refs: https://github.com/wez/wezterm/issues/631
This commit is contained in:
Wez Furlong 2021-04-16 09:16:22 -07:00
parent 91cd2e22e4
commit d6007547fe
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
wezterm-client/src/client.rs
View File

@ -197,7 +197,7 @@ async fn client_thread_async(
fn fail_all(&mut self, reason: &str) {
log::trace!("failing all promises: {}", reason);
for (_, promise) in self.map.drain() {
promise.try_send(Err(anyhow!("{}", reason))).unwrap();
let _ = promise.try_send(Err(anyhow!("{}", reason)));
}
}
}
@ -241,7 +241,9 @@ async fn client_thread_async(
e
})?;
} else if let Some(promise) = promises.map.remove(&decoded.serial) {
promise.try_send(Ok(decoded.pdu)).unwrap();
if promise.try_send(Ok(decoded.pdu)).is_err() {
return Err(NotReconnectableError::ClientWasDestroyed.into());
}
} else {
log::error!(
"got serial {} without a corresponding promise",