mirror of
https://github.com/nushell/nushell.git
synced 2025-04-09 21:28:55 +02:00
# Description Our `ShellError` at the moment has a `std::mem::size_of<ShellError>` of 136 bytes (on AMD64). As a result `Value` directly storing the struct also required 136 bytes (thanks to alignment requirements). This change stores the `Value::Error` `ShellError` on the heap. Pro: - Value now needs just 80 bytes - Should be 1 cacheline less (still at least 2 cachelines) Con: - More small heap allocations when dealing with `Value::Error` - More heap fragmentation - Potential for additional required memcopies # Further code changes Includes a small refactor of `try` due to a type mismatch in its large match. # User-Facing Changes None for regular users. Plugin authors may have to update their matches on `Value` if they use `nu-protocol` Needs benchmarking to see if there is a benefit in real world workloads. **Update** small improvements in runtime for workloads with high volume of values. Significant reduction in maximum resident set size, when many values are held in memory. # Tests + Formatting
145 lines
4.1 KiB
Rust
145 lines
4.1 KiB
Rust
use crate::input_handler::{operate, CellPathOnlyArgs};
|
|
use nu_engine::CallExt;
|
|
use nu_protocol::{
|
|
ast::{Call, CellPath},
|
|
engine::{Command, EngineState, Stack},
|
|
Category, Example, PipelineData, ShellError, Signature, Span, Type, Value,
|
|
};
|
|
|
|
#[derive(Clone)]
|
|
pub struct Fmt;
|
|
|
|
impl Command for Fmt {
|
|
fn name(&self) -> &str {
|
|
"fmt"
|
|
}
|
|
|
|
fn usage(&self) -> &str {
|
|
"Format a number."
|
|
}
|
|
|
|
fn signature(&self) -> nu_protocol::Signature {
|
|
Signature::build("fmt")
|
|
.input_output_types(vec![(Type::Number, Type::Record(vec![]))])
|
|
.category(Category::Conversions)
|
|
}
|
|
|
|
fn search_terms(&self) -> Vec<&str> {
|
|
vec!["display", "render", "format"]
|
|
}
|
|
|
|
fn examples(&self) -> Vec<Example> {
|
|
vec![Example {
|
|
description: "Get a record containing multiple formats for the number 42",
|
|
example: "42 | fmt",
|
|
result: Some(Value::Record {
|
|
cols: vec![
|
|
"binary".into(),
|
|
"debug".into(),
|
|
"display".into(),
|
|
"lowerexp".into(),
|
|
"lowerhex".into(),
|
|
"octal".into(),
|
|
"upperexp".into(),
|
|
"upperhex".into(),
|
|
],
|
|
vals: vec![
|
|
Value::test_string("0b101010"),
|
|
Value::test_string("42"),
|
|
Value::test_string("42"),
|
|
Value::test_string("4.2e1"),
|
|
Value::test_string("0x2a"),
|
|
Value::test_string("0o52"),
|
|
Value::test_string("4.2E1"),
|
|
Value::test_string("0x2A"),
|
|
],
|
|
span: Span::test_data(),
|
|
}),
|
|
}]
|
|
}
|
|
|
|
fn run(
|
|
&self,
|
|
engine_state: &EngineState,
|
|
stack: &mut Stack,
|
|
call: &Call,
|
|
input: PipelineData,
|
|
) -> Result<PipelineData, ShellError> {
|
|
fmt(engine_state, stack, call, input)
|
|
}
|
|
}
|
|
|
|
fn fmt(
|
|
engine_state: &EngineState,
|
|
stack: &mut Stack,
|
|
call: &Call,
|
|
input: PipelineData,
|
|
) -> Result<PipelineData, ShellError> {
|
|
let cell_paths: Vec<CellPath> = call.rest(engine_state, stack, 0)?;
|
|
let args = CellPathOnlyArgs::from(cell_paths);
|
|
operate(action, args, input, call.head, engine_state.ctrlc.clone())
|
|
}
|
|
|
|
fn action(input: &Value, _args: &CellPathOnlyArgs, span: Span) -> Value {
|
|
match input {
|
|
Value::Int { val, .. } => fmt_it(*val, span),
|
|
Value::Filesize { val, .. } => fmt_it(*val, span),
|
|
// Propagate errors by explicitly matching them before the final case.
|
|
Value::Error { .. } => input.clone(),
|
|
other => Value::Error {
|
|
error: Box::new(ShellError::OnlySupportsThisInputType {
|
|
exp_input_type: "integer or filesize".into(),
|
|
wrong_type: other.get_type().to_string(),
|
|
dst_span: span,
|
|
src_span: other.expect_span(),
|
|
}),
|
|
},
|
|
}
|
|
}
|
|
|
|
fn fmt_it(num: i64, span: Span) -> Value {
|
|
let mut cols = vec![];
|
|
let mut vals = vec![];
|
|
|
|
cols.push("binary".into());
|
|
vals.push(Value::string(format!("{num:#b}"), span));
|
|
|
|
cols.push("debug".into());
|
|
vals.push(Value::string(format!("{num:#?}"), span));
|
|
|
|
cols.push("display".into());
|
|
vals.push(Value::string(format!("{num}"), span));
|
|
|
|
cols.push("lowerexp".into());
|
|
vals.push(Value::string(format!("{num:#e}"), span));
|
|
|
|
cols.push("lowerhex".into());
|
|
vals.push(Value::string(format!("{num:#x}"), span));
|
|
|
|
cols.push("octal".into());
|
|
vals.push(Value::string(format!("{num:#o}"), span));
|
|
|
|
// cols.push("pointer".into());
|
|
// vals.push(Value::string(format!("{:#p}", &num), span));
|
|
|
|
cols.push("upperexp".into());
|
|
vals.push(Value::string(format!("{num:#E}"), span));
|
|
|
|
cols.push("upperhex".into());
|
|
vals.push(Value::string(format!("{num:#X}"), span));
|
|
|
|
Value::Record { cols, vals, span }
|
|
}
|
|
|
|
#[cfg(test)]
|
|
mod test {
|
|
use super::*;
|
|
|
|
#[test]
|
|
fn test_examples() {
|
|
use crate::test_examples;
|
|
|
|
test_examples(Fmt {})
|
|
}
|
|
}
|