Mirrors/nushell
2
0
Fork 0
mirror of https://github.com/nushell/nushell synced 2024-12-26 13:03:07 +00:00
Code Issues Projects Releases Packages Wiki Activity

Make 'for' implicitly filter out nothings (#4536)

Browse source 
* Make 'for' implicitly filter out nothings

* Fix test
This commit is contained in:
JT 2022-02-18 13:41:41 -05:00 committed by GitHub
parent f65955ccc5
commit 786e4ab971
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 7 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
crates/nu-command/src/core_commands/for_.rs
View file

@ -109,6 +109,7 @@ impl Command for For {
Err(error) => Value::Error { error },
}
})
.filter(|x| !x.is_nothing())
.into_pipeline_data(ctrlc)),
Value::Range { val, .. } => Ok(val
.into_range_iter()?
@ -146,6 +147,7 @@ impl Command for For {
Err(error) => Value::Error { error },
}
})
.filter(|x| !x.is_nothing())
.into_pipeline_data(ctrlc)),
x => {
stack.add_var(var_id, x);

4
crates/nu-protocol/src/value/mod.rs
View file

@ -562,6 +562,10 @@ impl Value {
}
}
pub fn is_nothing(&self) -> bool {
matches!(self, Value::Nothing { .. })
}
/// Create a new `Nothing` value
pub fn nothing(span: Span) -> Value {
Value::Nothing { span }

2
src/tests/test_engine.rs
View file

@ -149,7 +149,7 @@ fn proper_variable_captures_with_nesting() -> TestResult {
#[test]
fn proper_variable_for() -> TestResult {
run_test(r#"for x in 1..3 { if $x == 2 { "bob" } } | get 1"#, "bob")
run_test(r#"for x in 1..3 { if $x == 2 { "bob" } } | get 0"#, "bob")
}
#[test]