diff --git a/crates/fspy_shared_unix/src/elf.rs b/crates/fspy_shared_unix/src/elf.rs index a9845ea3..7dde8637 100644 --- a/crates/fspy_shared_unix/src/elf.rs +++ b/crates/fspy_shared_unix/src/elf.rs @@ -38,7 +38,7 @@ fn get_interp(executable: &[u8]) -> nix::Result> { return Err(nix::Error::ENOEXEC); }; - let interp = CStr::from_bytes_until_nul(interp).map(CStr::to_bytes).unwrap_or(interp); + let interp = CStr::from_bytes_until_nul(interp).map_or(interp, CStr::to_bytes); Ok(Some(BStr::new(interp))) } diff --git a/crates/vite_select/src/fuzzy.rs b/crates/vite_select/src/fuzzy.rs index 4fa4f4dc..f4067743 100644 --- a/crates/vite_select/src/fuzzy.rs +++ b/crates/vite_select/src/fuzzy.rs @@ -26,7 +26,7 @@ pub fn fuzzy_match(query: &str, items: &[&str]) -> Vec { }) .collect(); - scored.sort_by(|a, b| b.1.cmp(&a.1)); + scored.sort_by_key(|b| std::cmp::Reverse(b.1)); scored.into_iter().map(|(idx, _)| idx).collect() } diff --git a/crates/vite_tui/src/components/tasks_list.rs b/crates/vite_tui/src/components/tasks_list.rs index 0090c9d6..df2eef85 100644 --- a/crates/vite_tui/src/components/tasks_list.rs +++ b/crates/vite_tui/src/components/tasks_list.rs @@ -62,10 +62,8 @@ impl Component for TasksList { match action { Action::Up => self.up(), Action::Down => self.down(), - Action::SelectTask(index) => { - if index < self.tasks.len() { - self.select(index); - } + Action::SelectTask(index) if index < self.tasks.len() => { + self.select(index); } _ => {} } diff --git a/crates/vite_workspace/src/package.rs b/crates/vite_workspace/src/package.rs index 87e886cc..25cc6508 100644 --- a/crates/vite_workspace/src/package.rs +++ b/crates/vite_workspace/src/package.rs @@ -27,7 +27,7 @@ pub struct PackageJson { impl std::fmt::Debug for PackageJson { fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result { - if std::env::var("VITE_DEBUG_VERBOSE").map(|v| v != "0" && v != "false").unwrap_or(false) { + if std::env::var("VITE_DEBUG_VERBOSE").is_ok_and(|v| v != "0" && v != "false") { write!( f, "PackageJson {{ name: {:?}, scripts: {:?}, dependencies: {:?}, dev_dependencies: {:?}, peer_dependencies: {:?} }}", diff --git a/rust-toolchain.toml b/rust-toolchain.toml index d60d3811..0c951099 100644 --- a/rust-toolchain.toml +++ b/rust-toolchain.toml @@ -2,5 +2,5 @@ # Needed nightly features: # - cargo `Z-bindeps` to build and embed preload shared libraries as dependencies of fspy # - `windows_process_extensions_main_thread_handle` to get the main thread handle for Detours injection -channel = "nightly-2025-12-11" +channel = "nightly-2026-03-05" profile = "default"