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

Fixed $in in where blocks (#6976)

Browse source
This commit is contained in:
Leon 2022-11-10 08:05:15 +10:00 committed by GitHub
parent c600c1ebe7
commit 2c238aea6a
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
13 changed files with 103 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -93,6 +93,9 @@ impl Command for For {
Ok(ListStream::from_stream(vals.into_iter(), ctrlc.clone())
.enumerate()
.map(move |(idx, x)| {
// with_env() is used here to ensure that each iteration uses
// a different set of environment variables.
// Hence, a 'cd' in the first loop won't affect the next loop.
stack.with_env(&orig_env_vars, &orig_env_hidden);
stack.add_var(
@ -134,6 +137,9 @@ impl Command for For {
.into_range_iter(ctrlc.clone())?
.enumerate()
.map(move |(idx, x)| {
// with_env() is used here to ensure that each iteration uses
// a different set of environment variables.
// Hence, a 'cd' in the first loop won't affect the next loop.
stack.with_env(&orig_env_vars, &orig_env_hidden);
stack.add_var(

3
crates/nu-command/src/filters/all.rs
View file

@ -82,6 +82,9 @@ impl Command for All {
let engine_state = engine_state.clone();
for value in input.into_interruptible_iter(ctrlc) {
// with_env() is used here to ensure that each iteration uses
// a different set of environment variables.
// Hence, a 'cd' in the first loop won't affect the next loop.
stack.with_env(&orig_env_vars, &orig_env_hidden);
if let Some(var_id) = var_id {

3
crates/nu-command/src/filters/any.rs
View file

@ -81,6 +81,9 @@ impl Command for Any {
let engine_state = engine_state.clone();
for value in input.into_interruptible_iter(ctrlc) {
// with_env() is used here to ensure that each iteration uses
// a different set of environment variables.
// Hence, a 'cd' in the first loop won't affect the next loop.
stack.with_env(&orig_env_vars, &orig_env_hidden);
if let Some(var_id) = var_id {

6
crates/nu-command/src/filters/each.rs
View file

@ -151,6 +151,9 @@ with 'transpose' first."#
.into_iter()
.enumerate()
.map(move |(idx, x)| {
// with_env() is used here to ensure that each iteration uses
// a different set of environment variables.
// Hence, a 'cd' in the first loop won't affect the next loop.
stack.with_env(&orig_env_vars, &orig_env_hidden);
if let Some(var) = block.signature.get_positional(0) {
@ -201,6 +204,9 @@ with 'transpose' first."#
.into_iter()
.enumerate()
.map(move |(idx, x)| {
// with_env() is used here to ensure that each iteration uses
// a different set of environment variables.
// Hence, a 'cd' in the first loop won't affect the next loop.
stack.with_env(&orig_env_vars, &orig_env_hidden);
let x = match x {

6
crates/nu-command/src/filters/each_while.rs
View file

@ -118,6 +118,9 @@ impl Command for EachWhile {
.into_iter()
.enumerate()
.map_while(move |(idx, x)| {
// with_env() is used here to ensure that each iteration uses
// a different set of environment variables.
// Hence, a 'cd' in the first loop won't affect the next loop.
stack.with_env(&orig_env_vars, &orig_env_hidden);
if let Some(var) = block.signature.get_positional(0) {
@ -172,6 +175,9 @@ impl Command for EachWhile {
.into_iter()
.enumerate()
.map_while(move |(idx, x)| {
// with_env() is used here to ensure that each iteration uses
// a different set of environment variables.
// Hence, a 'cd' in the first loop won't affect the next loop.
stack.with_env(&orig_env_vars, &orig_env_hidden);
let x = match x {

3
crates/nu-command/src/filters/insert.rs
View file

@ -100,6 +100,9 @@ fn insert(
input.map(
move |mut input| {
// with_env() is used here to ensure that each iteration uses
// a different set of environment variables.
// Hence, a 'cd' in the first loop won't affect the next loop.
stack.with_env(&orig_env_vars, &orig_env_hidden);
if let Some(var) = block.signature.get_positional(0) {

3
crates/nu-command/src/filters/reduce.rs
View file

@ -165,6 +165,9 @@ impl Command for Reduce {
.peekable();
while let Some((idx, x)) = input_iter.next() {
// with_env() is used here to ensure that each iteration uses
// a different set of environment variables.
// Hence, a 'cd' in the first loop won't affect the next loop.
stack.with_env(&orig_env_vars, &orig_env_hidden);
if let Some(var) = block.signature.get_positional(0) {

3
crates/nu-command/src/filters/update.rs
View file

@ -99,6 +99,9 @@ fn update(
input.map(
move |mut input| {
// with_env() is used here to ensure that each iteration uses
// a different set of environment variables.
// Hence, a 'cd' in the first loop won't affect the next loop.
stack.with_env(&orig_env_vars, &orig_env_hidden);
if let Some(var) = block.signature.get_positional(0) {

3
crates/nu-command/src/filters/upsert.rs
View file

@ -119,6 +119,9 @@ fn upsert(
input.map(
move |mut input| {
// with_env() is used here to ensure that each iteration uses
// a different set of environment variables.
// Hence, a 'cd' in the first loop won't affect the next loop.
stack.with_env(&orig_env_vars, &orig_env_hidden);
if let Some(var) = block.signature.get_positional(0) {

18
crates/nu-command/src/filters/where_.rs
View file

@ -68,6 +68,9 @@ impl Command for Where {
| PipelineData::ListStream { .. } => Ok(input
.into_iter()
.filter_map(move |x| {
// with_env() is used here to ensure that each iteration uses
// a different set of environment variables.
// Hence, a 'cd' in the first loop won't affect the next loop.
stack.with_env(&orig_env_vars, &orig_env_hidden);
if let Some(var) = block.signature.get_positional(0) {
@ -80,6 +83,7 @@ impl Command for Where {
&engine_state,
&mut stack,
&block,
// clone() is used here because x is given to Ok() below.
x.clone().into_pipeline_data(),
redirect_stdout,
redirect_stderr,
@ -106,6 +110,7 @@ impl Command for Where {
} => Ok(stream
.into_iter()
.filter_map(move |x| {
// see note above about with_env()
stack.with_env(&orig_env_vars, &orig_env_hidden);
let x = match x {
@ -123,6 +128,7 @@ impl Command for Where {
&engine_state,
&mut stack,
&block,
// clone() is used here because x is given to Ok() below.
x.clone().into_pipeline_data(),
redirect_stdout,
redirect_stderr,
@ -141,6 +147,9 @@ impl Command for Where {
})
.into_pipeline_data(ctrlc)),
PipelineData::Value(x, ..) => {
// see note above about with_env()
stack.with_env(&orig_env_vars, &orig_env_hidden);
if let Some(var) = block.signature.get_positional(0) {
if let Some(var_id) = &var.var_id {
stack.add_var(*var_id, x.clone());
@ -150,6 +159,7 @@ impl Command for Where {
&engine_state,
&mut stack,
&block,
// clone() is used here because x is given to Ok() below.
x.clone().into_pipeline_data(),
redirect_stdout,
redirect_stderr,
@ -178,6 +188,9 @@ impl Command for Where {
let mut stack = stack.captures_to_stack(&block.captures);
let block = engine_state.get_block(block.block_id).clone();
let orig_env_vars = stack.env_vars.clone();
let orig_env_hidden = stack.env_hidden.clone();
let ctrlc = engine_state.ctrlc.clone();
let engine_state = engine_state.clone();
@ -186,6 +199,8 @@ impl Command for Where {
Ok(input
.into_iter()
.filter_map(move |value| {
stack.with_env(&orig_env_vars, &orig_env_hidden);
if let Some(var) = block.signature.get_positional(0) {
if let Some(var_id) = &var.var_id {
stack.add_var(*var_id, value.clone());
@ -195,7 +210,8 @@ impl Command for Where {
&engine_state,
&mut stack,
&block,
PipelineData::new(span),
// clone() is used here because x is given to Ok() below.
value.clone().into_pipeline_data(),
redirect_stdout,
redirect_stderr,
);

10
crates/nu-command/tests/commands/all.rs
View file

@ -107,3 +107,13 @@ fn early_exits_with_0_param_blocks() {
assert_eq!(actual.out, "1false");
}
#[test]
fn unique_env_each_iteration() {
let actual = nu!(
cwd: "tests/fixtures/formats",
"[1 2] | all { print ($env.PWD | str ends-with 'formats') | cd '/' | true } | to nuon"
);
assert_eq!(actual.out, "truetruetrue");
}

10
crates/nu-command/tests/commands/any.rs
View file

@ -83,3 +83,13 @@ fn early_exits_with_0_param_blocks() {
assert_eq!(actual.out, "1true");
}
#[test]
fn unique_env_each_iteration() {
let actual = nu!(
cwd: "tests/fixtures/formats",
"[1 2] | any { print ($env.PWD | str ends-with 'formats') | cd '/' | false } | to nuon"
);
assert_eq!(actual.out, "truetruefalse");
}

30
crates/nu-command/tests/commands/where_.rs
View file

@ -22,6 +22,36 @@ fn filters_with_nothing_comparison() {
assert_eq!(actual.out, "7");
}
#[test]
fn filters_with_0_arity_block() {
let actual = nu!(
cwd: ".",
"[1 2 3 4] | where { $in < 3 } | to nuon"
);
assert_eq!(actual.out, "[1, 2]");
}
#[test]
fn filters_with_1_arity_block() {
let actual = nu!(
cwd: ".",
"[1 2 3 6 7 8] | where {|e| $e < 5 } | to nuon"
);
assert_eq!(actual.out, "[1, 2, 3]");
}
#[test]
fn unique_env_each_iteration() {
let actual = nu!(
cwd: "tests/fixtures/formats",
"[1 2] | where { print ($env.PWD | str ends-with 'formats') | cd '/' | true } | to nuon"
);
assert_eq!(actual.out, "truetrue[1, 2]");
}
#[test]
fn where_in_table() {
let actual = nu!(