mirror of
https://github.com/nushell/nushell.git
synced 2025-08-09 14:36:08 +02:00
bump the rust toolchain to 1.83.0 (#15148)
# Description This PR bumps the rust toolchain to 1.83.0 and fixes a clippy lint. We do this because Rust 1.85.0 was released today, and we try and stay 2 versions behind. # 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:
@ -132,11 +132,7 @@ pub struct IoError {
|
||||
#[derive(Debug, Clone, Copy, PartialEq, Eq, Diagnostic)]
|
||||
pub enum ErrorKind {
|
||||
Std(std::io::ErrorKind),
|
||||
// TODO: in Rust 1.83 this can be std::io::ErrorKind::NotADirectory
|
||||
NotADirectory,
|
||||
NotAFile,
|
||||
// TODO: in Rust 1.83 this can be std::io::ErrorKind::IsADirectory
|
||||
IsADirectory,
|
||||
}
|
||||
|
||||
#[derive(Debug, Clone, PartialEq, Eq, Error, Diagnostic)]
|
||||
@ -321,9 +317,7 @@ impl Display for ErrorKind {
|
||||
let (first, rest) = msg.split_at(1);
|
||||
write!(f, "{}{}", first.to_uppercase(), rest)
|
||||
}
|
||||
ErrorKind::NotADirectory => write!(f, "Not a directory"),
|
||||
ErrorKind::NotAFile => write!(f, "Not a file"),
|
||||
ErrorKind::IsADirectory => write!(f, "Is a directory"),
|
||||
}
|
||||
}
|
||||
}
|
||||
@ -357,9 +351,7 @@ impl Diagnostic for IoError {
|
||||
std::io::ErrorKind::Other => code.push_str("other"),
|
||||
kind => code.push_str(&kind.to_string().to_lowercase().replace(" ", "_")),
|
||||
},
|
||||
ErrorKind::NotADirectory => code.push_str("not_a_directory"),
|
||||
ErrorKind::NotAFile => code.push_str("not_a_file"),
|
||||
ErrorKind::IsADirectory => code.push_str("is_a_directory"),
|
||||
}
|
||||
|
||||
Some(Box::new(code))
|
||||
|
Reference in New Issue
Block a user