mirror of
https://github.com/nushell/nushell.git
synced 2025-08-09 11:55:55 +02:00
Replaced IoError::new_with_additional_context
calls that still had Span::unknown()
(#15056)
<!-- if this PR closes one or more issues, you can automatically link the PR with them by using one of the [*linking keywords*](https://docs.github.com/en/issues/tracking-your-work-with-issues/linking-a-pull-request-to-an-issue#linking-a-pull-request-to-an-issue-using-a-keyword), e.g. - this PR should close #xxxx - fixes #xxxx you can also mention related issues, PRs or discussions! --> # Description <!-- Thank you for improving Nushell. Please, check our [contributing guide](../CONTRIBUTING.md) and talk to the core team before making major changes. Description of your pull request goes here. **Provide examples and/or screenshots** if your changes affect the user experience. --> In #14968 I grepped the code for `IoError::new` calls with unknown spans, but I forgot to also grep for `IoError::new_with_additional_context`, so I missed some. Hopefullly this is the last P.S. to #14968. # User-Facing Changes <!-- List of all changes that impact the user experience here. This helps us keep track of breaking changes. --> N/A # 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 > ``` --> - 🟢 `toolkit fmt` - 🟢 `toolkit clippy` - 🟢 `toolkit test` - 🟢 `toolkit test stdlib` # 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. --> N/A
This commit is contained in:
@ -3,7 +3,7 @@ use std::io::{Stdin, Stdout};
|
||||
use std::process::{Child, ChildStdin, ChildStdout, Command, Stdio};
|
||||
|
||||
use nu_protocol::shell_error::io::IoError;
|
||||
use nu_protocol::{ShellError, Span};
|
||||
use nu_protocol::ShellError;
|
||||
|
||||
#[cfg(feature = "local-socket")]
|
||||
mod local_socket;
|
||||
@ -189,11 +189,10 @@ impl PreparedServerCommunication {
|
||||
listener
|
||||
.set_nonblocking(ListenerNonblockingMode::Accept)
|
||||
.map_err(|err| {
|
||||
IoError::new_with_additional_context(
|
||||
IoError::new_internal(
|
||||
err.kind(),
|
||||
Span::unknown(),
|
||||
None,
|
||||
"Could not set non-blocking mode accept for listener",
|
||||
nu_protocol::location!(),
|
||||
)
|
||||
})?;
|
||||
let mut get_socket = || {
|
||||
@ -204,11 +203,10 @@ impl PreparedServerCommunication {
|
||||
// Success! Ensure the stream is in nonblocking mode though, for
|
||||
// good measure. Had an issue without this on macOS.
|
||||
stream.set_nonblocking(false).map_err(|err| {
|
||||
IoError::new_with_additional_context(
|
||||
IoError::new_internal(
|
||||
err.kind(),
|
||||
Span::unknown(),
|
||||
None,
|
||||
"Could not disable non-blocking mode for listener",
|
||||
nu_protocol::location!(),
|
||||
)
|
||||
})?;
|
||||
result = Some(stream);
|
||||
|
@ -3,7 +3,7 @@
|
||||
use nu_plugin_protocol::{ByteStreamInfo, ListStreamInfo, PipelineDataHeader, StreamMessage};
|
||||
use nu_protocol::{
|
||||
engine::Sequence, shell_error::io::IoError, ByteStream, ListStream, PipelineData, Reader,
|
||||
ShellError, Signals, Span,
|
||||
ShellError, Signals,
|
||||
};
|
||||
use std::{
|
||||
io::{Read, Write},
|
||||
@ -367,11 +367,10 @@ where
|
||||
result
|
||||
})
|
||||
.map_err(|err| {
|
||||
IoError::new_with_additional_context(
|
||||
IoError::new_internal(
|
||||
err.kind(),
|
||||
Span::unknown(),
|
||||
None,
|
||||
"Could not spawn plugin stream background writer",
|
||||
nu_protocol::location!(),
|
||||
)
|
||||
})?,
|
||||
)),
|
||||
|
Reference in New Issue
Block a user