# Description * I was dismayed to discover recently that UnsupportedInput and TypeMismatch are used *extremely* inconsistently across the codebase. UnsupportedInput is sometimes used for input type-checks (as per the name!!), but *also* used for argument type-checks. TypeMismatch is also used for both. I thus devised the following standard: input type-checking *only* uses UnsupportedInput, and argument type-checking *only* uses TypeMismatch. Moreover, to differentiate them, UnsupportedInput now has *two* error arrows (spans), one pointing at the command and the other at the input origin, while TypeMismatch only has the one (because the command should always be nearby) * In order to apply that standard, a very large number of UnsupportedInput uses were changed so that the input's span could be retrieved and delivered to it. * Additionally, I noticed many places where **errors are not propagated correctly**: there are lots of `match` sites which take a Value::Error, then throw it away and replace it with a new Value::Error with less/misleading information (such as reporting the error as an "incorrect type"). I believe that the earliest errors are the most important, and should always be propagated where possible. * Also, to standardise one broad subset of UnsupportedInput error messages, who all used slightly different wordings of "expected `<type>`, got `<type>`", I created OnlySupportsThisInputType as a variant of it. * Finally, a bunch of error sites that had "repeated spans" - i.e. where an error expected two spans, but `call.head` was given for both - were fixed to use different spans. # Example BEFORE ``` 〉20b | str starts-with 'a' Error: nu:🐚:unsupported_input (link) × Unsupported input ╭─[entry #31:1:1] 1 │ 20b | str starts-with 'a' · ┬ · ╰── Input's type is filesize. This command only works with strings. ╰──── 〉'a' | math cos Error: nu:🐚:unsupported_input (link) × Unsupported input ╭─[entry #33:1:1] 1 │ 'a' | math cos · ─┬─ · ╰── Only numerical values are supported, input type: String ╰──── 〉0x[12] | encode utf8 Error: nu:🐚:unsupported_input (link) × Unsupported input ╭─[entry #38:1:1] 1 │ 0x[12] | encode utf8 · ───┬── · ╰── non-string input ╰──── ``` AFTER ``` 〉20b | str starts-with 'a' Error: nu:🐚:pipeline_mismatch (link) × Pipeline mismatch. ╭─[entry #1:1:1] 1 │ 20b | str starts-with 'a' · ┬ ───────┬─────── · │ ╰── only string input data is supported · ╰── input type: filesize ╰──── 〉'a' | math cos Error: nu:🐚:pipeline_mismatch (link) × Pipeline mismatch. ╭─[entry #2:1:1] 1 │ 'a' | math cos · ─┬─ ────┬─── · │ ╰── only numeric input data is supported · ╰── input type: string ╰──── 〉0x[12] | encode utf8 Error: nu:🐚:pipeline_mismatch (link) × Pipeline mismatch. ╭─[entry #3:1:1] 1 │ 0x[12] | encode utf8 · ───┬── ───┬── · │ ╰── only string input data is supported · ╰── input type: binary ╰──── ``` # User-Facing Changes Various error messages suddenly make more sense (i.e. have two arrows instead of one). # 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.
131 lines
4.1 KiB
Rust
131 lines
4.1 KiB
Rust
use nu_engine::CallExt;
|
|
use nu_protocol::ast::Call;
|
|
use nu_protocol::engine::{Command, EngineState, Stack};
|
|
use nu_protocol::{
|
|
Category, Example, IntoPipelineData, PipelineData, ShellError, Signature, Span, SyntaxShape,
|
|
Type, Value,
|
|
};
|
|
|
|
#[derive(Clone, Copy)]
|
|
pub struct BytesCollect;
|
|
|
|
impl Command for BytesCollect {
|
|
fn name(&self) -> &str {
|
|
"bytes collect"
|
|
}
|
|
|
|
fn signature(&self) -> Signature {
|
|
Signature::build("bytes collect")
|
|
.input_output_types(vec![(Type::List(Box::new(Type::Binary)), Type::Binary)])
|
|
.optional(
|
|
"separator",
|
|
SyntaxShape::Binary,
|
|
"optional separator to use when creating binary",
|
|
)
|
|
.category(Category::Bytes)
|
|
}
|
|
|
|
fn usage(&self) -> &str {
|
|
"Concatenate multiple binary into a single binary, with an optional separator between each"
|
|
}
|
|
|
|
fn search_terms(&self) -> Vec<&str> {
|
|
vec!["join", "concatenate"]
|
|
}
|
|
|
|
fn run(
|
|
&self,
|
|
engine_state: &EngineState,
|
|
stack: &mut Stack,
|
|
call: &Call,
|
|
input: PipelineData,
|
|
) -> Result<PipelineData, ShellError> {
|
|
let separator: Option<Vec<u8>> = call.opt(engine_state, stack, 0)?;
|
|
// input should be a list of binary data.
|
|
let mut output_binary = vec![];
|
|
for value in input {
|
|
match value {
|
|
Value::Binary { mut val, .. } => {
|
|
output_binary.append(&mut val);
|
|
// manually concat
|
|
// TODO: make use of std::slice::Join when it's available in stable.
|
|
if let Some(sep) = &separator {
|
|
let mut work_sep = sep.clone();
|
|
output_binary.append(&mut work_sep)
|
|
}
|
|
}
|
|
// Explictly propagate errors instead of dropping them.
|
|
Value::Error { error } => return Err(error),
|
|
other => {
|
|
return Err(ShellError::OnlySupportsThisInputType(
|
|
"integer".into(),
|
|
other.get_type().to_string(),
|
|
call.head,
|
|
// This line requires the Value::Error match above.
|
|
other.expect_span(),
|
|
));
|
|
}
|
|
}
|
|
}
|
|
|
|
match separator {
|
|
None => Ok(Value::Binary {
|
|
val: output_binary,
|
|
span: call.head,
|
|
}
|
|
.into_pipeline_data()),
|
|
Some(sep) => {
|
|
if output_binary.is_empty() {
|
|
Ok(Value::Binary {
|
|
val: output_binary,
|
|
span: call.head,
|
|
}
|
|
.into_pipeline_data())
|
|
} else {
|
|
// have push one extra separator in previous step, pop them out.
|
|
for _ in sep {
|
|
let _ = output_binary.pop();
|
|
}
|
|
Ok(Value::Binary {
|
|
val: output_binary,
|
|
span: call.head,
|
|
}
|
|
.into_pipeline_data())
|
|
}
|
|
}
|
|
}
|
|
}
|
|
|
|
fn examples(&self) -> Vec<Example> {
|
|
vec![
|
|
Example {
|
|
description: "Create a byte array from input",
|
|
example: "[0x[11] 0x[13 15]] | bytes collect",
|
|
result: Some(Value::Binary {
|
|
val: vec![0x11, 0x13, 0x15],
|
|
span: Span::test_data(),
|
|
}),
|
|
},
|
|
Example {
|
|
description: "Create a byte array from input with a separator",
|
|
example: "[0x[11] 0x[33] 0x[44]] | bytes collect 0x[01]",
|
|
result: Some(Value::Binary {
|
|
val: vec![0x11, 0x01, 0x33, 0x01, 0x44],
|
|
span: Span::test_data(),
|
|
}),
|
|
},
|
|
]
|
|
}
|
|
}
|
|
|
|
#[cfg(test)]
|
|
mod tests {
|
|
use super::*;
|
|
#[test]
|
|
fn test_examples() {
|
|
use crate::test_examples;
|
|
|
|
test_examples(BytesCollect {})
|
|
}
|
|
}
|