Mirrors/nushell
2
0
Fork 0
mirror of https://github.com/nushell/nushell synced 2024-09-22 15:42:01 +00:00
Code Issues Projects Releases Packages Wiki Activity

Remove take_while from internal iterator (#3301)

Browse source
This commit is contained in:
Jonathan Turner 2021-04-11 18:29:01 +12:00 committed by GitHub
parent 2e439ca77f
commit 734877338d
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 8 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
crates/nu-engine/src/evaluate/internal.rs
View file

@ -33,15 +33,12 @@ pub(crate) fn run_internal_command(
)?
};
Ok(InputStream::from_stream(
InternalIterator {
command,
context: context.clone(),
leftovers: vec![],
input: result,
}
.take_while(|x| !x.is_error()),
))
Ok(InputStream::from_stream(InternalIterator {
command,
context: context.clone(),
leftovers: vec![],
input: result,
}))
}
struct InternalIterator {
@ -73,6 +70,7 @@ impl Iterator for InternalIterator {
CommandAction::Exit(code) => std::process::exit(code), // TODO: save history.txt
CommandAction::Error(err) => {
self.context.error(err);
return None;
}
CommandAction::AutoConvert(tagged_contents, extension) => {
let contents_tag = tagged_contents.tag.clone();
@ -205,6 +203,7 @@ impl Iterator for InternalIterator {
..
})) => {
self.context.error(err);
return None;
}
Ok(ReturnSuccess::Value(v)) => return Some(v),