mirror of
https://github.com/nushell/nushell.git
synced 2025-08-09 21:27:45 +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:
@ -77,7 +77,9 @@ impl Command for Cd {
|
||||
if let Ok(path) = nu_path::canonicalize_with(path_no_whitespace, &cwd) {
|
||||
if !path.is_dir() {
|
||||
return Err(shell_error::io::IoError::new(
|
||||
shell_error::io::ErrorKind::NotADirectory,
|
||||
shell_error::io::ErrorKind::Std(
|
||||
std::io::ErrorKind::NotADirectory,
|
||||
),
|
||||
v.span,
|
||||
None,
|
||||
)
|
||||
@ -104,7 +106,7 @@ impl Command for Cd {
|
||||
};
|
||||
if !path.is_dir() {
|
||||
return Err(shell_error::io::IoError::new(
|
||||
shell_error::io::ErrorKind::NotADirectory,
|
||||
shell_error::io::ErrorKind::Std(std::io::ErrorKind::NotADirectory),
|
||||
v.span,
|
||||
path,
|
||||
)
|
||||
|
@ -151,7 +151,7 @@ impl Command for Open {
|
||||
// At least under windows this check ensures that we don't get a
|
||||
// permission denied error on directories
|
||||
return Err(ShellError::Io(IoError::new(
|
||||
shell_error::io::ErrorKind::IsADirectory,
|
||||
shell_error::io::ErrorKind::Std(std::io::ErrorKind::IsADirectory),
|
||||
arg_span,
|
||||
PathBuf::from(path),
|
||||
)));
|
||||
|
@ -424,7 +424,9 @@ fn open_file(path: &Path, span: Span, append: bool) -> Result<File, ShellError>
|
||||
// A TOCTOU problem exists here, which may cause wrong error message to be shown
|
||||
#[cfg(target_os = "windows")]
|
||||
if path.is_dir() {
|
||||
Err(nu_protocol::shell_error::io::ErrorKind::IsADirectory)
|
||||
Err(nu_protocol::shell_error::io::ErrorKind::Std(
|
||||
std::io::ErrorKind::IsADirectory,
|
||||
))
|
||||
} else {
|
||||
std::fs::File::create(path).map_err(|err| err.kind().into())
|
||||
}
|
||||
|
@ -405,7 +405,7 @@ impl From<TestRow> for Value {
|
||||
}
|
||||
}
|
||||
|
||||
impl<'r> TryFrom<&rusqlite::Row<'r>> for TestRow {
|
||||
impl TryFrom<&rusqlite::Row<'_>> for TestRow {
|
||||
type Error = rusqlite::Error;
|
||||
|
||||
fn try_from(row: &rusqlite::Row) -> Result<Self, Self::Error> {
|
||||
|
@ -419,7 +419,7 @@ fn set_dir_read_only(directory: &AbsolutePath, read_only: bool) {
|
||||
}
|
||||
|
||||
#[cfg(not(windows))]
|
||||
impl<'a> Drop for Cleanup<'a> {
|
||||
impl Drop for Cleanup<'_> {
|
||||
/// Restores write permissions to the given directory so that the Playground can be successfully
|
||||
/// cleaned up.
|
||||
fn drop(&mut self) {
|
||||
|
Reference in New Issue
Block a user