mirror of
https://github.com/nushell/nushell.git
synced 2025-04-10 14:08:40 +02:00
1e3e034021
# Description This doesn't really do much that the user could see, but it helps get us ready to do the steps of the refactor to split the span off of Value, so that values can be spanless. This allows us to have top-level values that can hold both a Value and a Span, without requiring that all values have them. We expect to see significant memory reduction by removing so many unnecessary spans from values. For example, a table of 100,000 rows and 5 columns would have a savings of ~8megs in just spans that are almost always duplicated. # User-Facing Changes Nothing yet # 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 -A clippy::result_large_err` to check that you're using the standard code style - `cargo test --workspace` to check that all tests pass - `cargo run -- -c "use std testing; testing run-tests --path crates/nu-std"` to run the tests for the standard library > **Note** > from `nushell` you can also use the `toolkit` as follows > ```bash > use toolkit.nu # or use an `env_change` hook to activate it automatically > toolkit check pr > ``` --> # 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. -->
92 lines
2.8 KiB
Rust
92 lines
2.8 KiB
Rust
use nu_protocol::ast::CellPath;
|
|
use nu_protocol::{PipelineData, ShellError, Span, Value};
|
|
use std::sync::atomic::AtomicBool;
|
|
use std::sync::Arc;
|
|
|
|
pub trait CmdArgument {
|
|
fn take_cell_paths(&mut self) -> Option<Vec<CellPath>>;
|
|
}
|
|
|
|
/// Arguments with only cell_path.
|
|
///
|
|
/// If commands is going to use `operate` function, and it only required optional cell_paths
|
|
/// Using this to simplify code.
|
|
pub struct CellPathOnlyArgs {
|
|
cell_paths: Option<Vec<CellPath>>,
|
|
}
|
|
|
|
impl CmdArgument for CellPathOnlyArgs {
|
|
fn take_cell_paths(&mut self) -> Option<Vec<CellPath>> {
|
|
self.cell_paths.take()
|
|
}
|
|
}
|
|
|
|
impl From<Vec<CellPath>> for CellPathOnlyArgs {
|
|
fn from(cell_paths: Vec<CellPath>) -> Self {
|
|
Self {
|
|
cell_paths: (!cell_paths.is_empty()).then_some(cell_paths),
|
|
}
|
|
}
|
|
}
|
|
|
|
/// A simple wrapper for `PipelineData::map` method.
|
|
///
|
|
/// In detail, for each elements, invoking relative `cmd` with `arg`.
|
|
///
|
|
/// If `arg` tell us that its cell path is not None, only map over data under these columns.
|
|
/// Else it will apply each column inside a table.
|
|
///
|
|
/// The validation of input element should be handle by `cmd` itself.
|
|
pub fn operate<C, A>(
|
|
cmd: C,
|
|
mut arg: A,
|
|
input: PipelineData,
|
|
span: Span,
|
|
ctrlc: Option<Arc<AtomicBool>>,
|
|
) -> Result<PipelineData, ShellError>
|
|
where
|
|
A: CmdArgument + Send + Sync + 'static,
|
|
C: Fn(&Value, &A, Span) -> Value + Send + Sync + 'static + Clone + Copy,
|
|
{
|
|
match arg.take_cell_paths() {
|
|
None => input.map(
|
|
move |v| {
|
|
match v {
|
|
// Propagate errors inside the input
|
|
Value::Error { .. } => v,
|
|
_ => cmd(&v, &arg, span),
|
|
}
|
|
},
|
|
ctrlc,
|
|
),
|
|
Some(column_paths) => {
|
|
let arg = Arc::new(arg);
|
|
input.map(
|
|
move |mut v| {
|
|
for path in &column_paths {
|
|
let opt = arg.clone();
|
|
let r = v.update_cell_path(
|
|
&path.members,
|
|
Box::new(move |old| {
|
|
match old {
|
|
// Propagate errors inside the input
|
|
Value::Error { .. } => old.clone(),
|
|
_ => cmd(old, &opt, span),
|
|
}
|
|
}),
|
|
);
|
|
if let Err(error) = r {
|
|
return Value::Error {
|
|
error: Box::new(error),
|
|
span,
|
|
};
|
|
}
|
|
}
|
|
v
|
|
},
|
|
ctrlc,
|
|
)
|
|
}
|
|
}
|
|
}
|