mirror of
https://github.com/nushell/nushell.git
synced 2025-04-26 22:28:19 +02:00
# Description As title, closes: #7921 closes: #8273 # User-Facing Changes when define a closure without pipe, nushell will raise error for now: ``` ❯ let x = {ss ss} Error: nu::parser::closure_missing_pipe × Missing || inside closure ╭─[entry #2:1:1] 1 │ let x = {ss ss} · ───┬─── · ╰── Parsing as a closure, but || is missing ╰──── help: Try add || to the beginning of closure ``` `any`, `each`, `all`, `where` command accepts closure, it forces user input closure like `{||`, or parse error will returned. ``` ❯ {major:2, minor:1, patch:4} | values | each { into string } Error: nu::parser::closure_missing_pipe × Missing || inside closure ╭─[entry #4:1:1] 1 │ {major:2, minor:1, patch:4} | values | each { into string } · ───────┬─────── · ╰── Parsing as a closure, but || is missing ╰──── help: Try add || to the beginning of closure ``` `with-env`, `do`, `def`, `try` are special, they still remain the same, although it says that it accepts a closure, but they don't need to be written like `{||`, it's more likely a block but can capture variable outside of scope: ``` ❯ def test [input] { echo [0 1 2] | do { do { echo $input } } }; test aaa aaa ``` Just realize that It's a big breaking change, we need to update config and scripts... # Tests + Formatting Don't forget to add tests that cover your changes. Make sure you've run and fixed any issues with these commands: - `cargo fmt --all -- --check` to check standard code formatting (`cargo fmt --all` applies these changes) - `cargo clippy --workspace -- -D warnings -D clippy::unwrap_used -A clippy::needless_collect` to check that you're using the standard code style - `cargo test --workspace` to check that all tests pass # After Submitting If your PR had any user-facing changes, update [the documentation](https://github.com/nushell/nushell.github.io) after the PR is merged, if necessary. This will help us keep the docs up to date.
136 lines
4.3 KiB
Rust
136 lines
4.3 KiB
Rust
use nu_engine::{eval_block, CallExt};
|
|
use nu_protocol::{
|
|
ast::Call,
|
|
engine::{Closure, Command, EngineState, Stack},
|
|
Category, Example, IntoPipelineData, PipelineData, ShellError, Signature, SyntaxShape, Type,
|
|
Value,
|
|
};
|
|
use std::time::Instant;
|
|
|
|
#[derive(Clone)]
|
|
pub struct TimeIt;
|
|
|
|
impl Command for TimeIt {
|
|
fn name(&self) -> &str {
|
|
"timeit"
|
|
}
|
|
|
|
fn usage(&self) -> &str {
|
|
"Time the running time of a closure."
|
|
}
|
|
|
|
fn signature(&self) -> nu_protocol::Signature {
|
|
Signature::build("timeit")
|
|
.required(
|
|
"closure",
|
|
SyntaxShape::Closure(Some(vec![SyntaxShape::Any])),
|
|
"the closure to run",
|
|
)
|
|
.input_output_types(vec![
|
|
(Type::Any, Type::Duration),
|
|
(Type::Nothing, Type::Duration),
|
|
])
|
|
.allow_variants_without_examples(true)
|
|
.category(Category::Debug)
|
|
}
|
|
|
|
fn search_terms(&self) -> Vec<&str> {
|
|
vec!["timing", "timer", "benchmark", "measure"]
|
|
}
|
|
|
|
fn run(
|
|
&self,
|
|
engine_state: &EngineState,
|
|
stack: &mut Stack,
|
|
call: &Call,
|
|
input: PipelineData,
|
|
) -> Result<PipelineData, ShellError> {
|
|
let capture_block: Closure = call.req(engine_state, stack, 0)?;
|
|
let block = engine_state.get_block(capture_block.block_id);
|
|
|
|
let redirect_stdout = call.redirect_stdout;
|
|
let redirect_stderr = call.redirect_stderr;
|
|
|
|
let mut stack = stack.captures_to_stack(&capture_block.captures);
|
|
|
|
// In order to provide the pipeline as a positional, it must be converted into a value.
|
|
// But because pipelines do not have Clone, this one has to be cloned as a value
|
|
// and then converted back into a pipeline for eval_block().
|
|
// So, the metadata must be saved here and restored at that point.
|
|
let input_metadata = input.metadata();
|
|
let input_val = input.into_value(call.head);
|
|
|
|
if let Some(var) = block.signature.get_positional(0) {
|
|
if let Some(var_id) = &var.var_id {
|
|
stack.add_var(*var_id, input_val.clone());
|
|
}
|
|
}
|
|
|
|
// Get the start time after all other computation has been done.
|
|
let start_time = Instant::now();
|
|
eval_block(
|
|
engine_state,
|
|
&mut stack,
|
|
block,
|
|
input_val.into_pipeline_data_with_metadata(input_metadata),
|
|
redirect_stdout,
|
|
redirect_stderr,
|
|
)?
|
|
.into_value(call.head);
|
|
|
|
let end_time = Instant::now();
|
|
|
|
let output = Value::Duration {
|
|
val: (end_time - start_time).as_nanos() as i64,
|
|
span: call.head,
|
|
};
|
|
|
|
Ok(output.into_pipeline_data())
|
|
}
|
|
|
|
fn examples(&self) -> Vec<Example> {
|
|
vec![
|
|
Example {
|
|
description: "Times a command within a closure",
|
|
example: "timeit { sleep 500ms }",
|
|
result: None,
|
|
},
|
|
Example {
|
|
description: "Times a command using an existing input",
|
|
example: "http get https://www.nushell.sh/book/ | timeit { split chars }",
|
|
result: None,
|
|
},
|
|
]
|
|
}
|
|
}
|
|
|
|
#[test]
|
|
// Due to difficulty in observing side-effects from time closures,
|
|
// checks that the closures have run correctly must use the filesystem.
|
|
fn test_time_closure() {
|
|
use nu_test_support::{nu, nu_repl_code, playground::Playground};
|
|
Playground::setup("test_time_closure", |dirs, _| {
|
|
let inp = [
|
|
r#"[2 3 4] | timeit {|_| to nuon | save foo.txt }"#,
|
|
"open foo.txt",
|
|
];
|
|
let actual_repl = nu!(cwd: dirs.test(), nu_repl_code(&inp));
|
|
assert_eq!(actual_repl.err, "");
|
|
assert_eq!(actual_repl.out, "[2, 3, 4]");
|
|
});
|
|
}
|
|
|
|
#[test]
|
|
fn test_time_closure_2() {
|
|
use nu_test_support::{nu, nu_repl_code, playground::Playground};
|
|
Playground::setup("test_time_closure", |dirs, _| {
|
|
let inp = [
|
|
r#"[2 3 4] | timeit {|e| {result: $e} | to nuon | save foo.txt }"#,
|
|
"open foo.txt",
|
|
];
|
|
let actual_repl = nu!(cwd: dirs.test(), nu_repl_code(&inp));
|
|
assert_eq!(actual_repl.err, "");
|
|
assert_eq!(actual_repl.out, "{result: [2, 3, 4]}");
|
|
});
|
|
}
|