mirror of
https://github.com/nushell/nushell.git
synced 2025-05-22 19:00:47 +02:00
# 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.
139 lines
3.6 KiB
Rust
139 lines
3.6 KiB
Rust
use crate::input_handler::{operate, CmdArgument};
|
|
use nu_engine::CallExt;
|
|
use nu_protocol::ast::{Call, CellPath};
|
|
use nu_protocol::engine::{Command, EngineState, Stack};
|
|
use nu_protocol::Span;
|
|
use nu_protocol::{Example, PipelineData, ShellError, Signature, SyntaxShape, Type, Value};
|
|
use std::marker::PhantomData;
|
|
|
|
pub trait HashDigest: digest::Digest + Clone {
|
|
fn name() -> &'static str;
|
|
fn examples() -> Vec<Example>;
|
|
}
|
|
|
|
#[derive(Clone)]
|
|
pub struct GenericDigest<D: HashDigest> {
|
|
name: String,
|
|
usage: String,
|
|
phantom: PhantomData<D>,
|
|
}
|
|
|
|
impl<D: HashDigest> Default for GenericDigest<D> {
|
|
fn default() -> Self {
|
|
Self {
|
|
name: format!("hash {}", D::name()),
|
|
usage: format!("Hash a value using the {} hash algorithm", D::name()),
|
|
phantom: PhantomData,
|
|
}
|
|
}
|
|
}
|
|
|
|
pub(super) struct Arguments {
|
|
pub(super) cell_paths: Option<Vec<CellPath>>,
|
|
pub(super) binary: bool,
|
|
}
|
|
|
|
impl CmdArgument for Arguments {
|
|
fn take_cell_paths(&mut self) -> Option<Vec<CellPath>> {
|
|
self.cell_paths.take()
|
|
}
|
|
}
|
|
|
|
impl<D> Command for GenericDigest<D>
|
|
where
|
|
D: HashDigest + Send + Sync + 'static,
|
|
digest::Output<D>: core::fmt::LowerHex,
|
|
{
|
|
fn name(&self) -> &str {
|
|
&self.name
|
|
}
|
|
|
|
fn signature(&self) -> Signature {
|
|
Signature::build(self.name())
|
|
.input_output_types(vec![
|
|
(Type::String, Type::String),
|
|
(Type::String, Type::Binary),
|
|
])
|
|
.switch(
|
|
"binary",
|
|
"Output binary instead of hexadecimal representation",
|
|
Some('b'),
|
|
)
|
|
.rest(
|
|
"rest",
|
|
SyntaxShape::CellPath,
|
|
format!("optionally {} hash data by cell path", D::name()),
|
|
)
|
|
}
|
|
|
|
fn usage(&self) -> &str {
|
|
&self.usage
|
|
}
|
|
|
|
fn examples(&self) -> Vec<Example> {
|
|
D::examples()
|
|
}
|
|
|
|
fn run(
|
|
&self,
|
|
engine_state: &EngineState,
|
|
stack: &mut Stack,
|
|
call: &Call,
|
|
input: PipelineData,
|
|
) -> Result<nu_protocol::PipelineData, nu_protocol::ShellError> {
|
|
let binary = call.has_flag("binary");
|
|
let cell_paths: Vec<CellPath> = call.rest(engine_state, stack, 0)?;
|
|
let cell_paths = (!cell_paths.is_empty()).then_some(cell_paths);
|
|
let args = Arguments { binary, cell_paths };
|
|
operate(
|
|
action::<D>,
|
|
args,
|
|
input,
|
|
call.head,
|
|
engine_state.ctrlc.clone(),
|
|
)
|
|
}
|
|
}
|
|
|
|
pub(super) fn action<D>(input: &Value, args: &Arguments, _span: Span) -> Value
|
|
where
|
|
D: HashDigest,
|
|
digest::Output<D>: core::fmt::LowerHex,
|
|
{
|
|
let (bytes, span) = match input {
|
|
Value::String { val, span } => (val.as_bytes(), *span),
|
|
Value::Binary { val, span } => (val.as_slice(), *span),
|
|
// Propagate existing errors
|
|
Value::Error { .. } => return input.clone(),
|
|
other => {
|
|
let span = match input.span() {
|
|
Ok(span) => span,
|
|
Err(error) => return Value::Error { error },
|
|
};
|
|
|
|
return Value::Error {
|
|
error: ShellError::OnlySupportsThisInputType(
|
|
"string or binary".into(),
|
|
other.get_type().to_string(),
|
|
span,
|
|
other.expect_span(),
|
|
),
|
|
};
|
|
}
|
|
};
|
|
|
|
let digest = D::digest(bytes);
|
|
|
|
if args.binary {
|
|
Value::Binary {
|
|
val: digest.to_vec(),
|
|
span,
|
|
}
|
|
} else {
|
|
Value::String {
|
|
val: format!("{:x}", digest),
|
|
span,
|
|
}
|
|
}
|
|
}
|