mirror of
https://github.com/nushell/nushell
synced 2025-01-12 21:29:07 +00:00
better error message for "sum", "product", and "sum_of_squares" (#14711)
# Description This PR tries to improve a few error messages. ### Before ![image](https://github.com/user-attachments/assets/58ab3ff6-baab-4075-8746-e83cb3acab14) ### After ![image](https://github.com/user-attachments/assets/9653776a-371b-4454-b092-3cc49f1329cd) # User-Facing Changes <!-- List of all changes that impact the user experience here. This helps us keep track of breaking changes. --> # 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` to check that you're using the standard code style - `cargo test --workspace` to check that all tests pass (on Windows make sure to [enable developer mode](https://learn.microsoft.com/en-us/windows/apps/get-started/developer-mode-features-and-debugging)) - `cargo run -- -c "use toolkit.nu; toolkit test stdlib"` 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. -->
This commit is contained in:
parent
4884894ddb
commit
a0d4ae18ee
3 changed files with 8 additions and 10 deletions
|
@ -111,8 +111,8 @@ pub fn sum(data: Vec<Value>, span: Span, head: Span) -> Result<Value, ShellError
|
||||||
Value::Error { error, .. } => return Err(*error.clone()),
|
Value::Error { error, .. } => return Err(*error.clone()),
|
||||||
other => {
|
other => {
|
||||||
return Err(ShellError::UnsupportedInput {
|
return Err(ShellError::UnsupportedInput {
|
||||||
msg: "Attempted to compute the sum of a value that cannot be summed"
|
msg: format!("Attempted to compute the sum of a value '{}' that cannot be summed with a type of `{}`.",
|
||||||
.to_string(),
|
other.coerce_string()?, other.get_type()),
|
||||||
input: "value originates from here".into(),
|
input: "value originates from here".into(),
|
||||||
msg_span: head,
|
msg_span: head,
|
||||||
input_span: other.span(),
|
input_span: other.span(),
|
||||||
|
@ -150,8 +150,8 @@ pub fn product(data: Vec<Value>, span: Span, head: Span) -> Result<Value, ShellE
|
||||||
Value::Error { error, .. } => return Err(*error.clone()),
|
Value::Error { error, .. } => return Err(*error.clone()),
|
||||||
other => {
|
other => {
|
||||||
return Err(ShellError::UnsupportedInput {
|
return Err(ShellError::UnsupportedInput {
|
||||||
msg: "Attempted to compute the product of a value that cannot be multiplied"
|
msg: format!("Attempted to compute the product of a value '{}' that cannot be multiplied with a type of `{}`.",
|
||||||
.to_string(),
|
other.coerce_string()?, other.get_type()),
|
||||||
input: "value originates from here".into(),
|
input: "value originates from here".into(),
|
||||||
msg_span: head,
|
msg_span: head,
|
||||||
input_span: other.span(),
|
input_span: other.span(),
|
||||||
|
|
|
@ -90,9 +90,9 @@ fn sum_of_squares(values: &[Value], span: Span) -> Result<Value, ShellError> {
|
||||||
let v = match &value {
|
let v = match &value {
|
||||||
Value::Int { .. } | Value::Float { .. } => Ok(value),
|
Value::Int { .. } | Value::Float { .. } => Ok(value),
|
||||||
Value::Error { error, .. } => Err(*error.clone()),
|
Value::Error { error, .. } => Err(*error.clone()),
|
||||||
_ => Err(ShellError::UnsupportedInput {
|
other => Err(ShellError::UnsupportedInput {
|
||||||
msg: "Attempted to compute the sum of squares of a non-int, non-float value"
|
msg: format!("Attempted to compute the sum of squares of a non-int, non-float value '{}' with a type of `{}`.",
|
||||||
.to_string(),
|
other.coerce_string()?, other.get_type()),
|
||||||
input: "value originates from here".into(),
|
input: "value originates from here".into(),
|
||||||
msg_span: span,
|
msg_span: span,
|
||||||
input_span: value.span(),
|
input_span: value.span(),
|
||||||
|
|
|
@ -73,9 +73,7 @@ fn sum_of_a_row_containing_a_table_is_an_error() {
|
||||||
cwd: "tests/fixtures/formats/",
|
cwd: "tests/fixtures/formats/",
|
||||||
"open sample-sys-output.json | math sum"
|
"open sample-sys-output.json | math sum"
|
||||||
);
|
);
|
||||||
assert!(actual
|
assert!(actual.err.contains("can't convert record"));
|
||||||
.err
|
|
||||||
.contains("Attempted to compute the sum of a value that cannot be summed"));
|
|
||||||
}
|
}
|
||||||
|
|
||||||
#[test]
|
#[test]
|
||||||
|
|
Loading…
Reference in a new issue