forked from extern/nushell
Fix clippy warnings (upcoming) (#9282)
# Description Fixes the clippy warnings we're about to get hit with next time we upgrade Rust. The big one was shrinking ShellError and related under 128 bytes. # User-Facing Changes Shouldn't notice much difference. In theory, we could see a tiny perf improvement, but I didn't notice 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 -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 -- crates/nu-std/tests/run.nu` 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:
@@ -394,9 +394,7 @@ fn convert_str_from_unit_to_unit(
|
||||
("yr", "yr") => Ok(val as f64),
|
||||
("yr", "dec") => Ok(val as f64 / 10.0),
|
||||
|
||||
_ => Err(ShellError::CantConvertWithValue {
|
||||
to_type: "string duration".to_string(),
|
||||
from_type: "string duration".to_string(),
|
||||
_ => Err(ShellError::CantConvertToDuration {
|
||||
details: to_unit.to_string(),
|
||||
dst_span: span,
|
||||
src_span: value_span,
|
||||
@@ -433,9 +431,7 @@ fn string_to_duration(s: &str, span: Span, value_span: Span) -> Result<i64, Shel
|
||||
}
|
||||
}
|
||||
|
||||
Err(ShellError::CantConvertWithValue {
|
||||
to_type: "duration".to_string(),
|
||||
from_type: "string".to_string(),
|
||||
Err(ShellError::CantConvertToDuration {
|
||||
details: s.to_string(),
|
||||
dst_span: span,
|
||||
src_span: value_span,
|
||||
@@ -476,9 +472,7 @@ fn string_to_unit_duration(
|
||||
}
|
||||
}
|
||||
|
||||
Err(ShellError::CantConvertWithValue {
|
||||
to_type: "duration".to_string(),
|
||||
from_type: "string".to_string(),
|
||||
Err(ShellError::CantConvertToDuration {
|
||||
details: s.to_string(),
|
||||
dst_span: span,
|
||||
src_span: value_span,
|
||||
|
Reference in New Issue
Block a user