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

Fix the auto-conversion regression (#3307)

Browse Source
This commit is contained in:
Jonathan Turner 2021-04-13 14:25:18 +12:00 committed by GitHub
parent fc15e0e27d
commit e09e3b01d6
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 16 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

48
crates/nu-engine/src/evaluate/internal.rs
View File

@ -63,7 +63,7 @@ impl Iterator for InternalIteratorSimple {
pub struct InternalIterator {
pub context: EvaluationContext,
pub leftovers: Vec<Value>,
pub leftovers: InputStream,
pub input: ActionStream,
}
@ -71,8 +71,7 @@ impl Iterator for InternalIterator {
type Item = Value;
fn next(&mut self) -> Option<Self::Item> {
if !self.leftovers.is_empty() {
let output = self.leftovers.remove(0);
if let Some(output) = self.leftovers.next() {
return Some(output);
}
@ -114,45 +113,24 @@ impl Iterator for InternalIterator {
},
scope: self.context.scope.clone(),
};
let result = converter
.run_with_actions(new_args.with_input(vec![tagged_contents]));
let result = converter.run(new_args.with_input(vec![tagged_contents]));
match result {
Ok(mut result) => {
let result_vec: Vec<Result<ReturnSuccess, ShellError>> =
result.drain_vec();
let mut output = vec![];
for res in result_vec {
match res {
Ok(ReturnSuccess::Value(Value {
value: UntaggedValue::Table(list),
..
})) => {
for l in list {
output.push(l);
}
}
Ok(ReturnSuccess::Value(Value { value, .. })) => {
output.push(value.into_value(contents_tag.clone()));
}
Err(e) => output.push(
UntaggedValue::Error(e).into_untagged_value(),
),
_ => {}
}
}
let mut output = output.into_iter();
if let Some(x) = output.next() {
self.leftovers = output.collect();
if let Some(x) = result.next() {
self.leftovers =
InputStream::from_stream(result.map(move |x| Value {
value: x.value,
tag: contents_tag.clone(),
}));
return Some(x);
} else {
return None;
}
}
Err(err) => {
self.context.error(err);
self.leftovers = InputStream::empty();
return Some(Value::error(err));
}
}
} else {

2
crates/nu-engine/src/whole_stream_command.rs
View File

@ -38,7 +38,7 @@ pub trait WholeStreamCommand: Send + Sync {
Ok(Box::new(crate::evaluate::internal::InternalIterator {
context,
input: stream,
leftovers: vec![],
leftovers: InputStream::empty(),
})
.to_output_stream())
}

2
crates/nu-stream/src/output.rs
View File

@ -44,9 +44,11 @@ impl ActionStream {
pub fn drain_vec(&mut self) -> Vec<ReturnValue> {
let mut output = vec![];
while let Some(x) = self.values.next() {
output.push(x);
}
output
}
}