Add booleans and fix semicolon shortcircuit (#1620)

This commit is contained in:
Jonathan Turner
2020-04-21 12:30:01 +12:00
committed by GitHub
parent e4fdb36511
commit 72cf57dd99
4 changed files with 26 additions and 4 deletions

View File

@ -30,17 +30,24 @@ pub(crate) async fn run_block(
..
}))) => return Err(e),
Ok(Some(_item)) => {
if let Some(err) = ctx.get_errors().get(0) {
ctx.clear_errors();
return Err(err.clone());
}
if ctx.ctrl_c.load(Ordering::SeqCst) {
break;
}
}
Ok(None) => break,
Ok(None) => {
if let Some(err) = ctx.get_errors().get(0) {
ctx.clear_errors();
return Err(err.clone());
}
break;
}
Err(e) => return Err(e),
}
}
if !ctx.get_errors().is_empty() {
return Ok(InputStream::empty());
}
}
Err(e) => {
return Err(e);