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

Some iter perf improvements

Browse Source
This commit is contained in:
JT 2021-10-26 16:22:37 +13:00
parent e039e5f6a4
commit 543c566ccc
2 changed files with 16 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
crates/nu-command/src/core_commands/for_.rs
View File

@ -56,18 +56,17 @@ impl Command for For {
.expect("internal error: expected block");
let engine_state = engine_state.clone();
let block = engine_state.get_block(block_id);
let block = engine_state.get_block(block_id).clone();
let mut stack = stack.collect_captures(&block.captures);
match values {
Value::List { vals, .. } => Ok(vals
.into_iter()
.map(move |x| {
let mut stack = stack.clone();
stack.add_var(var_id, x);
let block = engine_state.get_block(block_id);
match eval_block(&engine_state, &mut stack, block, PipelineData::new()) {
//let block = engine_state.get_block(block_id);
match eval_block(&engine_state, &mut stack, &block, PipelineData::new()) {
Ok(pipeline_data) => pipeline_data.into_value(),
Err(error) => Value::Error { error },
}
@ -78,8 +77,8 @@ impl Command for For {
.map(move |x| {
stack.add_var(var_id, x);
let block = engine_state.get_block(block_id);
match eval_block(&engine_state, &mut stack, block, PipelineData::new()) {
//let block = engine_state.get_block(block_id);
match eval_block(&engine_state, &mut stack, &block, PipelineData::new()) {
Ok(pipeline_data) => pipeline_data.into_value(),
Err(error) => Value::Error { error },
}
@ -88,7 +87,7 @@ impl Command for For {
x => {
stack.add_var(var_id, x);
eval_block(&engine_state, &mut stack, block, PipelineData::new())
eval_block(&engine_state, &mut stack, &block, PipelineData::new())
}
}
}

35
crates/nu-command/src/filters/each.rs
View File

@ -64,7 +64,7 @@ impl Command for Each {
let numbered = call.has_flag("numbered");
let engine_state = engine_state.clone();
let block = engine_state.get_block(block_id);
let block = engine_state.get_block(block_id).clone();
let mut stack = stack.collect_captures(&block.captures);
let span = call.head;
@ -73,10 +73,6 @@ impl Command for Each {
.into_range_iter()?
.enumerate()
.map(move |(idx, x)| {
let block = engine_state.get_block(block_id);
let mut stack = stack.clone();
if let Some(var) = block.signature.get_positional(0) {
if let Some(var_id) = &var.var_id {
if numbered {
@ -100,21 +96,16 @@ impl Command for Each {
}
}
match eval_block(&engine_state, &mut stack, block, PipelineData::new()) {
Ok(v) => v,
Err(error) => Value::Error { error }.into_pipeline_data(),
match eval_block(&engine_state, &mut stack, &block, PipelineData::new()) {
Ok(v) => v.into_value(),
Err(error) => Value::Error { error },
}
})
.flatten()
.into_pipeline_data()),
PipelineData::Value(Value::List { vals: val, .. }) => Ok(val
.into_iter()
.enumerate()
.map(move |(idx, x)| {
let block = engine_state.get_block(block_id);
let mut stack = stack.clone();
if let Some(var) = block.signature.get_positional(0) {
if let Some(var_id) = &var.var_id {
if numbered {
@ -138,20 +129,15 @@ impl Command for Each {
}
}
match eval_block(&engine_state, &mut stack, block, PipelineData::new()) {
Ok(v) => v,
Err(error) => Value::Error { error }.into_pipeline_data(),
match eval_block(&engine_state, &mut stack, &block, PipelineData::new()) {
Ok(v) => v.into_value(),
Err(error) => Value::Error { error },
}
})
.flatten()
.into_pipeline_data()),
PipelineData::Stream(stream) => Ok(stream
.enumerate()
.map(move |(idx, x)| {
let block = engine_state.get_block(block_id);
let mut stack = stack.clone();
if let Some(var) = block.signature.get_positional(0) {
if let Some(var_id) = &var.var_id {
if numbered {
@ -175,12 +161,11 @@ impl Command for Each {
}
}
match eval_block(&engine_state, &mut stack, block, PipelineData::new()) {
Ok(v) => v,
Err(error) => Value::Error { error }.into_pipeline_data(),
match eval_block(&engine_state, &mut stack, &block, PipelineData::new()) {
Ok(v) => v.into_value(),
Err(error) => Value::Error { error },
}
})
.flatten()
.into_pipeline_data()),
PipelineData::Value(Value::Record { cols, vals, .. }) => {
let mut output_cols = vec![];