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:
JT
2023-05-25 10:58:18 +12:00
committed by GitHub
parent 7ead89844a
commit fa113172da
11 changed files with 124 additions and 137 deletions

View File

@ -138,7 +138,7 @@ pub fn request_add_authorization_header(
#[allow(clippy::large_enum_variant)]
pub enum ShellErrorOrRequestError {
ShellError(ShellError),
RequestError(String, Error),
RequestError(String, Box<Error>),
}
impl From<ShellError> for ShellErrorOrRequestError {
@ -256,7 +256,7 @@ fn send_cancellable_request(
match rx.recv_timeout(Duration::from_millis(100)) {
Ok(result) => {
return result.map_err(|e| {
ShellErrorOrRequestError::RequestError(request_url.to_string(), e)
ShellErrorOrRequestError::RequestError(request_url.to_string(), Box::new(e))
});
}
Err(RecvTimeoutError::Timeout) => continue,
@ -516,7 +516,7 @@ pub fn request_handle_response(
ShellErrorOrRequestError::ShellError(e) => Err(e),
ShellErrorOrRequestError::RequestError(_, e) => {
if flags.allow_errors {
if let Error::Status(_, resp) = e {
if let Error::Status(_, resp) = *e {
Ok(request_handle_response_content(
engine_state,
stack,
@ -526,10 +526,10 @@ pub fn request_handle_response(
resp,
)?)
} else {
Err(handle_response_error(span, requested_url, e))
Err(handle_response_error(span, requested_url, *e))
}
} else {
Err(handle_response_error(span, requested_url, e))
Err(handle_response_error(span, requested_url, *e))
}
}
},
@ -574,7 +574,7 @@ pub fn request_handle_response_headers(
Err(e) => match e {
ShellErrorOrRequestError::ShellError(e) => Err(e),
ShellErrorOrRequestError::RequestError(requested_url, e) => {
Err(handle_response_error(span, &requested_url, e))
Err(handle_response_error(span, &requested_url, *e))
}
},
}