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

Fix each while behavior when printing. (#6897)

Browse Source 
Fixes #6895

Warning: `Iterator::map_while` does not return a `FusedIterator`!
Depending on the consuming adaptor or code (e.g. for loop) the iteration
may be stopped but this is not guaranteed.

Adds a test example but Examples handle iterators like
`FusedIterator` and thus don't catch the regression

Cleanup the message on another test
This commit is contained in:
Stefan Holderbach 2022-10-27 23:45:45 +02:00 committed by GitHub
parent f281cd5aa3
commit 834522d002
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 24 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
crates/nu-command/src/filters/each_while.rs
View File

@ -36,24 +36,42 @@ impl Command for EachWhile {
fn examples(&self) -> Vec<Example> { fn examples(&self) -> Vec<Example> {
let stream_test_1 = vec![ let stream_test_1 = vec![
Value::Int { Value::Int {
val: 1, val: 2,
span: Span::test_data(), span: Span::test_data(),
}, },
Value::Int { Value::Int {
val: 2, val: 4,
span: Span::test_data(),
},
];
let stream_test_2 = vec![
Value::String {
val: "Output: 1".into(),
span: Span::test_data(),
},
Value::String {
val: "Output: 2".into(),
span: Span::test_data(), span: Span::test_data(),
}, },
]; ];
vec![ vec![
Example { Example {
example: "[1 2 3] | each while { |it| if $it < 3 { $it } else { null } }", example: "[1 2 3] | each while { |it| if $it < 3 { $it * 2 } else { null } }",
description: "Multiplies elements in list", description: "Multiplies elements below three by two",
result: Some(Value::List { result: Some(Value::List {
vals: stream_test_1, vals: stream_test_1,
span: Span::test_data(), span: Span::test_data(),
}), }),
}, },
Example {
example: r#"[1 2 stop 3 4] | each while { |it| if $it == 'stop' { null } else { $"Output: ($it)" } }"#,
description: "Output elements till reaching 'stop'",
result: Some(Value::List {
vals: stream_test_2,
span: Span::test_data(),
}),
},
Example { Example {
example: r#"[1 2 3] | each while -n { |it| if $it.item < 2 { $"value ($it.item) at ($it.index)!"} else { null } }"#, example: r#"[1 2 3] | each while -n { |it| if $it.item < 2 { $"value ($it.item) at ($it.index)!"} else { null } }"#,
description: "Iterate over each element, print the matching value and its index", description: "Iterate over each element, print the matching value and its index",
@ -140,6 +158,7 @@ impl Command for EachWhile {
Err(_) => None, Err(_) => None,
} }
}) })
.fuse()
.into_pipeline_data(ctrlc)), .into_pipeline_data(ctrlc)),
PipelineData::ExternalStream { stdout: None, .. } => Ok(PipelineData::new(call.head)), PipelineData::ExternalStream { stdout: None, .. } => Ok(PipelineData::new(call.head)),
PipelineData::ExternalStream { PipelineData::ExternalStream {
@ -198,6 +217,7 @@ impl Command for EachWhile {
Err(_) => None, Err(_) => None,
} }
}) })
.fuse()
.into_pipeline_data(ctrlc)), .into_pipeline_data(ctrlc)),
PipelineData::Value(x, ..) => { PipelineData::Value(x, ..) => {
if let Some(var) = block.signature.get_positional(0) { if let Some(var) = block.signature.get_positional(0) {