holm/nushell
1
1
Fork 0
forked from extern/nushell
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Tighten how input streams handle nothing, and related (#2847)

Browse Source
This commit is contained in:
Jonathan Turner
2021-01-03 14:22:44 +13:00
committed by GitHub
parent a5f7600f6f
commit 77f915befe
8 changed files with 99 additions and 63 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
crates/nu-cli/src/commands/reduce.rs
View File

@ -6,7 +6,7 @@ use crate::{CommandArgs, Example, OutputStream};
use futures::stream::once;
use nu_errors::ShellError;
use nu_parser::ParserScope;
use nu_protocol::{hir::CapturedBlock, Primitive, Signature, SyntaxShape, UntaggedValue, Value};
use nu_protocol::{hir::CapturedBlock, Signature, SyntaxShape, UntaggedValue, Value};
use nu_source::Tagged;
pub struct Reduce;
@ -93,22 +93,25 @@ async fn process_row(
}
async fn reduce(raw_args: CommandArgs) -> Result<OutputStream, ShellError> {
let span = raw_args.call_info.name_tag.span;
let context = Arc::new(EvaluationContext::from_raw(&raw_args));
let (reduce_args, mut input): (ReduceArgs, _) = raw_args.process().await?;
let block = Arc::new(reduce_args.block);
let (ioffset, start) = match reduce_args.fold {
None => {
let first = input
.next()
.await
.expect("empty stream expected to contain Primitive::Nothing");
if let UntaggedValue::Primitive(Primitive::Nothing) = first.value {
return Err(ShellError::missing_value(None, "empty input"));
}
let (ioffset, start) = if !input.is_empty() {
match reduce_args.fold {
None => {
let first = input.next().await.expect("non-empty stream");
(1, first)
(1, first)
}
Some(acc) => (0, acc),
}
Some(acc) => (0, acc),
} else {
return Err(ShellError::labeled_error(
"Expected input",
"needs input",
span,
));
};
if reduce_args.numbered.item {