chore(deps): lock file maintenance

2025-11-24 00:53:52 +00:00
28 changed files with 152 additions and 124 deletions
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -193,7 +193,7 @@ checksum = "3b43422f69d8ff38f95f1b2bb76517c91589a924d1559a0e935d7c8ce0274c11"
 dependencies = [
 "proc-macro2",
 "quote",
- "syn 2.0.110",
+ "syn 2.0.111",
 ]

 [[package]]
@@ -228,7 +228,7 @@ checksum = "9035ad2d096bed7955a320ee7e2230574d28fd3c3a0f186cbea1ff3c7eed5dbb"
 dependencies = [
 "proc-macro2",
 "quote",
- "syn 2.0.110",
+ "syn 2.0.111",
 ]

 [[package]]
@@ -272,9 +272,9 @@ checksum = "72b3254f16251a8381aa12e40e3c4d2f0199f8c6508fbecb9d91f575e0fbb8c6"

 [[package]]
 name = "base64ct"
-version = "1.8.0"
+version = "1.7.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "55248b47b0caf0546f7988906588779981c43bb1bc9d0c44087278f80cdb44ba"
+checksum = "89e25b6adfb930f02d1981565a6e5d9c547ac15a96606256d3b59040e5cd4ca3"

 [[package]]
 name = "bitflags"
@@ -350,9 +350,9 @@ checksum = "b35204fbdc0b3f4446b89fc1ac2cf84a8a68971995d0bf2e925ec7cd960f9cb3"

 [[package]]
 name = "cc"
-version = "1.2.46"
+version = "1.2.47"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b97463e1064cb1b1c1384ad0a0b9c8abd0988e2a91f52606c80ef14aadb63e36"
+checksum = "cd405d82c84ff7f35739f175f67d8b9fb7687a0e84ccdc78bd3568839827cf07"
 dependencies = [
 "find-msvc-tools",
 "shlex",
@@ -395,9 +395,9 @@ dependencies = [

 [[package]]
 name = "clap-cargo"
-version = "0.18.3"
+version = "0.15.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "936551935c8258754bb8216aec040957d261f977303754b9bf1a213518388006"
+checksum = "d546f0e84ff2bfa4da1ce9b54be42285767ba39c688572ca32412a09a73851e5"
 dependencies = [
 "anstyle",
 "clap",
@@ -433,7 +433,7 @@ dependencies = [
 "heck",
 "proc-macro2",
 "quote",
- "syn 2.0.110",
+ "syn 2.0.111",
 ]

 [[package]]
@@ -635,7 +635,7 @@ checksum = "f46882e17999c6cc590af592290432be3bce0428cb0d5f8b6715e4dc7b383eb3"
 dependencies = [
 "proc-macro2",
 "quote",
- "syn 2.0.110",
+ "syn 2.0.111",
 ]

 [[package]]
@@ -665,7 +665,7 @@ checksum = "1e567bd82dcff979e4b03460c307b3cdc9e96fde3d73bed1496d2bc75d9dd62a"
 dependencies = [
 "proc-macro2",
 "quote",
- "syn 2.0.110",
+ "syn 2.0.111",
 ]

 [[package]]
@@ -717,7 +717,7 @@ checksum = "97369cbbc041bc366949bc74d34658d6cda5621039731c6310521892a3a20ae0"
 dependencies = [
 "proc-macro2",
 "quote",
- "syn 2.0.110",
+ "syn 2.0.111",
 ]

 [[package]]
@@ -790,7 +790,7 @@ checksum = "67c78a4d8fdf9953a5c9d458f9efe940fd97a0cab0941c075a813ac594733827"
 dependencies = [
 "proc-macro2",
 "quote",
- "syn 2.0.110",
+ "syn 2.0.111",
 ]

 [[package]]
@@ -817,12 +817,13 @@ dependencies = [

 [[package]]
 name = "etcetera"
-version = "0.11.0"
+version = "0.10.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "de48cc4d1c1d97a20fd819def54b890cadde72ed3ad0c614822a0a433361be96"
+checksum = "26c7b13d0780cb82722fd59f6f57f925e143427e4a75313a6c77243bf5326ae6"
 dependencies = [
 "cfg-if",
- "windows-sys 0.61.2",
+ "home",
+ "windows-sys 0.59.0",
 ]

 [[package]]
@@ -994,7 +995,7 @@ checksum = "162ee34ebcb7c64a8abebc059ce0fee27c2262618d7b60ed8faf72fef13c3650"
 dependencies = [
 "proc-macro2",
 "quote",
- "syn 2.0.110",
+ "syn 2.0.111",
 ]

 [[package]]
@@ -1078,9 +1079,9 @@ checksum = "0cc23270f6e1808e30a928bdc84dea0b9b4136a8bc82338574f23baf47bbd280"

 [[package]]
 name = "globset"
-version = "0.4.18"
+version = "0.4.16"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "52dfc19153a48bde0cbd630453615c8151bce3a5adfac7a0aebfbf0a1e1f57e3"
+checksum = "54a1028dfc5f5df5da8a56a73e6c153c9a9708ec57232470703592a3f18e49f5"
 dependencies = [
 "aho-corasick",
 "bstr",
@@ -1149,6 +1150,15 @@ version = "0.4.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "7f24254aa9a54b5c858eaee2f5bccdb46aaf0e486a595ed5fd8f86ba55232a70"

+[[package]]
+name = "home"
+version = "0.5.11"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "589533453244b0995c858700322199b2becb13b627df2851f64a2775d024abcf"
+dependencies = [
+ "windows-sys 0.59.0",
+]
+
 [[package]]
 name = "http"
 version = "1.3.1"
@@ -1380,9 +1390,9 @@ dependencies = [

 [[package]]
 name = "ignore"
-version = "0.4.25"
+version = "0.4.23"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d3d782a365a015e0f5c04902246139249abf769125006fbe7649e2ee88169b4a"
+checksum = "6d89fd380afde86567dfba715db065673989d6253f42b88179abd3eae47bda4b"
 dependencies = [
 "crossbeam-deque",
 "globset",
@@ -2204,7 +2214,7 @@ dependencies = [
 "serde",
 "serde_json",
 "serde_yaml",
- "syn 2.0.110",
+ "syn 2.0.111",
 ]

 [[package]]
@@ -2398,7 +2408,7 @@ checksum = "d540f220d3187173da220f885ab66608367b6574e925011a9353e4badda91d79"
 dependencies = [
 "proc-macro2",
 "quote",
- "syn 2.0.110",
+ "syn 2.0.111",
 ]

 [[package]]
@@ -2422,7 +2432,7 @@ checksum = "175ee3e80ae9982737ca543e96133087cbd9a485eecc3bc4de9c1a37b47ea59c"
 dependencies = [
 "proc-macro2",
 "quote",
- "syn 2.0.110",
+ "syn 2.0.111",
 ]

 [[package]]
@@ -2511,9 +2521,9 @@ checksum = "0fda2ff0d084019ba4d7c6f371c95d8fd75ce3524c3cb8fb653a3023f6323e64"

 [[package]]
 name = "signal-hook-registry"
-version = "1.4.6"
+version = "1.4.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b2a4719bff48cee6b39d12c020eeb490953ad2443b7055bd0b21fca26bd8c28b"
+checksum = "7664a098b8e616bdfcc2dc0e9ac44eb231eedf41db4e9fe95d8d32ec728dedad"
 dependencies = [
 "libc",
 ]
@@ -2608,7 +2618,7 @@ dependencies = [
 "heck",
 "proc-macro2",
 "quote",
- "syn 2.0.110",
+ "syn 2.0.111",
 ]

 [[package]]
@@ -2630,9 +2640,9 @@ dependencies = [

 [[package]]
 name = "syn"
-version = "2.0.110"
+version = "2.0.111"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a99801b5bd34ede4cf3fc688c5919368fea4e4814a4664359503e6015b280aea"
+checksum = "390cc9a294ab71bdb1aa2e99d13be9c753cd2d7bd6560c77118597410c4d2e87"
 dependencies = [
 "proc-macro2",
 "quote",
@@ -2656,7 +2666,7 @@ checksum = "728a70f3dbaf5bab7f0c4b1ac8d7ae5ea60a4b5549c8a5914361c99147a709d2"
 dependencies = [
 "proc-macro2",
 "quote",
- "syn 2.0.110",
+ "syn 2.0.111",
 ]

 [[package]]
@@ -2744,7 +2754,7 @@ checksum = "4fee6c4efc90059e10f81e6d42c60a18f76588c3d74cb83a0b242a2b6c7504c1"
 dependencies = [
 "proc-macro2",
 "quote",
- "syn 2.0.110",
+ "syn 2.0.111",
 ]

 [[package]]
@@ -2755,7 +2765,7 @@ checksum = "3ff15c8ecd7de3849db632e14d18d2571fa09dfc5ed93479bc4485c7a517c913"
 dependencies = [
 "proc-macro2",
 "quote",
- "syn 2.0.110",
+ "syn 2.0.111",
 ]

 [[package]]
@@ -2966,6 +2976,7 @@ checksum = "df8b2b54733674ad286d16267dcfc7a71ed5c776e4ac7aa3c3e2561f7c637bf2"
 name = "topgrade"
 version = "16.4.2"
 dependencies = [
+ "base64ct",
 "chrono",
 "clap",
 "clap-cargo",
@@ -2976,6 +2987,9 @@ dependencies = [
 "etcetera",
 "futures",
 "glob",
+ "globset",
+ "home",
+ "ignore",
 "indexmap",
 "is_elevated",
 "jetbrains-toolbox-updater",
@@ -3073,7 +3087,7 @@ checksum = "81383ab64e72a7a8b8e13130c49e3dab29def6d0c7d76a03087b3cf71c5c6903"
 dependencies = [
 "proc-macro2",
 "quote",
- "syn 2.0.110",
+ "syn 2.0.111",
 ]

 [[package]]
@@ -3322,7 +3336,7 @@ dependencies = [
 "bumpalo",
 "proc-macro2",
 "quote",
- "syn 2.0.110",
+ "syn 2.0.111",
 "wasm-bindgen-shared",
 ]

@@ -3517,7 +3531,7 @@ checksum = "053e2e040ab57b9dc951b72c264860db7eb3b0200ba345b4e4c3b14f67855ddf"
 dependencies = [
 "proc-macro2",
 "quote",
- "syn 2.0.110",
+ "syn 2.0.111",
 ]

 [[package]]
@@ -3528,7 +3542,7 @@ checksum = "3f316c4a2570ba26bbec722032c4099d8c8bc095efccdc15688708623367e358"
 dependencies = [
 "proc-macro2",
 "quote",
- "syn 2.0.110",
+ "syn 2.0.111",
 ]

 [[package]]
@@ -3864,7 +3878,7 @@ checksum = "b659052874eb698efe5b9e8cf382204678a0086ebf46982b79d6ca3182927e5d"
 dependencies = [
 "proc-macro2",
 "quote",
- "syn 2.0.110",
+ "syn 2.0.111",
 "synstructure",
 ]

@@ -3911,7 +3925,7 @@ dependencies = [
 "proc-macro-crate",
 "proc-macro2",
 "quote",
- "syn 2.0.110",
+ "syn 2.0.111",
 "zbus_names",
 "zvariant",
 "zvariant_utils",
@@ -3931,22 +3945,22 @@ dependencies = [

 [[package]]
 name = "zerocopy"
-version = "0.8.27"
+version = "0.8.28"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0894878a5fa3edfd6da3f88c4805f4c8558e2b996227a3d864f47fe11e38282c"
+checksum = "43fa6694ed34d6e57407afbccdeecfa268c470a7d2a5b0cf49ce9fcc345afb90"
 dependencies = [
 "zerocopy-derive",
 ]

 [[package]]
 name = "zerocopy-derive"
-version = "0.8.27"
+version = "0.8.28"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "88d2b8d9c68ad2b9e4340d7832716a4d21a22a1154777ad56ea55c51a9cf3831"
+checksum = "c640b22cd9817fae95be82f0d2f90b11f7605f6c319d16705c459b27ac2cbc26"
 dependencies = [
 "proc-macro2",
 "quote",
- "syn 2.0.110",
+ "syn 2.0.111",
 ]

 [[package]]
@@ -3966,7 +3980,7 @@ checksum = "d71e5d6e06ab090c67b5e44993ec16b72dcbaabc526db883a360057678b48502"
 dependencies = [
 "proc-macro2",
 "quote",
- "syn 2.0.110",
+ "syn 2.0.111",
 "synstructure",
 ]

@@ -4006,7 +4020,7 @@ checksum = "eadce39539ca5cb3985590102671f2567e659fca9666581ad3411d59207951f3"
 dependencies = [
 "proc-macro2",
 "quote",
- "syn 2.0.110",
+ "syn 2.0.111",
 ]

 [[package]]
@@ -4073,7 +4087,7 @@ dependencies = [
 "proc-macro-crate",
 "proc-macro2",
 "quote",
- "syn 2.0.110",
+ "syn 2.0.111",
 "zvariant_utils",
 ]

@@ -4086,6 +4100,6 @@ dependencies = [
 "proc-macro2",
 "quote",
 "serde",
- "syn 2.0.110",
+ "syn 2.0.111",
 "winnow",
 ]
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -5,18 +5,19 @@ categories = ["os"]
 keywords = ["upgrade", "update"]
 license = "GPL-3.0-or-later"
 repository = "https://github.com/topgrade-rs/topgrade"
-rust-version = "1.87.0"
+rust-version = "1.84.1"
 version = "16.4.2"
 authors = ["Roey Darwish Dror <roey.ghost@gmail.com>", "Thomas Schönauer <t.schoenauer@hgs-wt.at>"]
 exclude = ["doc/screenshot.gif", "BREAKINGCHANGES_dev.md"]
-edition = "2024"
+edition = "2021"

 readme = "README.md"

 [dependencies]
-etcetera = "~0.11.0"
+home = "=0.5.11"
+etcetera = "=0.10.0"
 serde = { version = "~1.0", features = ["derive"] }
-toml = { version = "~0.9.8", features = ["preserve_order"] }
+toml = { version = "=0.9.8", features = ["preserve_order"] }
 which_crate = { version = "~8.0", package = "which" }
 shellexpand = "~3.1"
 clap = { version = "~4.5", features = ["cargo", "derive"] }
@@ -46,7 +47,11 @@ sys-locale = "0.3.1"
 jetbrains-toolbox-updater = "5.0.0"
 indexmap = { version = "2.9.0", features = ["serde"] }
 serde_json = "1.0.145"
-clap-cargo = "0.18.0"
+# Temporary transitive dependency pins
+ignore = "=0.4.23"
+globset = "=0.4.16"
+base64ct = "<1.8.0"
+clap-cargo = "0.15.2"

 [patch.crates-io]
 mac-notification-sys = { git = "https://github.com/h4llow3En/mac-notification-sys" }
@@ -60,7 +65,7 @@ git = "*"
 [package.metadata.deb]
 name = "topgrade"
 maintainer = "Chris Gelatt <kreeblah@gmail.com>"
-copyright = "2025, Topgrade Team"
+copyright = "2024, Topgrade Team"
 license-file = ["LICENSE", "0"]
 depends = "$auto"
 extended-description = "Keeping your system up to date usually involves invoking multiple package managers. This results in big, non-portable shell one-liners saved in your shell. To remedy this, Topgrade detects which tools you use and runs the appropriate commands to update them."
--- a/rust-toolchain.toml
+++ b/rust-toolchain.toml
@@ -1,2 +1,2 @@
 [toolchain]
-channel = "1.87.0"
+channel = "1.84.1"
--- a/src/breaking_changes.rs
+++ b/src/breaking_changes.rs
@@ -4,17 +4,17 @@
 //!     1. The Topgrade being executed is a new major release
 //!     2. This is the first launch of that major release

+use crate::terminal::print_separator;
 #[cfg(windows)]
 use crate::WINDOWS_DIRS;
 #[cfg(unix)]
 use crate::XDG_DIRS;
-use crate::terminal::print_separator;
 use color_eyre::eyre::Result;
 use etcetera::base_strategy::BaseStrategy;
 use rust_i18n::t;
 use std::{
    env::var,
-    fs::{OpenOptions, read_to_string},
+    fs::{read_to_string, OpenOptions},
    io::Write,
    path::PathBuf,
    str::FromStr,
--- a/src/command.rs
+++ b/src/command.rs
@@ -5,8 +5,8 @@ use std::process::Child;
 use std::process::{Command, ExitStatus, Output};

 use color_eyre::eyre;
-use color_eyre::eyre::Context;
 use color_eyre::eyre::eyre;
+use color_eyre::eyre::Context;

 use crate::error::TopgradeError;

--- a/src/config.rs
+++ b/src/config.rs
@@ -1,6 +1,6 @@
 #![allow(dead_code)]

-use std::fs::{File, write};
+use std::fs::{write, File};
 use std::io::Write;
 use std::path::{Path, PathBuf};
 use std::process::Command;
--- a/src/ctrlc/unix.rs
+++ b/src/ctrlc/unix.rs
@@ -1,6 +1,6 @@
 //! SIGINT handling in Unix systems.
 use crate::ctrlc::interrupted::set_interrupted;
-use nix::sys::signal::{SaFlags, SigAction, SigHandler, SigSet, Signal, sigaction};
+use nix::sys::signal::{sigaction, SaFlags, SigAction, SigHandler, SigSet, Signal};

 /// Handle SIGINT. Set the interruption flag.
 extern "C" fn handle_sigint(_: i32) {
--- a/src/ctrlc/windows.rs
+++ b/src/ctrlc/windows.rs
@@ -1,8 +1,8 @@
 //! A stub for Ctrl + C handling.
 use crate::ctrlc::interrupted::set_interrupted;
 use tracing::error;
-use windows::Win32::System::Console::{CTRL_C_EVENT, SetConsoleCtrlHandler};
 use windows::core::BOOL;
+use windows::Win32::System::Console::{SetConsoleCtrlHandler, CTRL_C_EVENT};

 extern "system" fn handler(ctrl_type: u32) -> BOOL {
    match ctrl_type {
--- a/src/executor.rs
+++ b/src/executor.rs
@@ -7,7 +7,7 @@ use std::process::{Child, Command, ExitStatus, Output};

 use color_eyre::eyre::Result;
 use rust_i18n::t;
-use tracing::{Level, debug, enabled};
+use tracing::{debug, enabled, Level};

 use crate::command::CommandExt;
 use crate::error::DryRun;
--- a/src/main.rs
+++ b/src/main.rs
@@ -1,7 +1,6 @@
 #![allow(clippy::cognitive_complexity)]

 use std::env;
-use std::env::home_dir;
 use std::io;
 use std::path::PathBuf;
 use std::process::exit;
@@ -9,7 +8,7 @@ use std::time::Duration;

 use crate::breaking_changes::{first_run_of_major_release, print_breaking_changes, should_skip, write_keep_file};
 use clap::CommandFactory;
-use clap::{Parser, crate_version};
+use clap::{crate_version, Parser};
 use color_eyre::eyre::Context;
 use color_eyre::eyre::Result;
 use console::Key;
@@ -49,7 +48,7 @@ mod sudo;
 mod terminal;
 mod utils;

-pub(crate) static HOME_DIR: LazyLock<PathBuf> = LazyLock::new(|| home_dir().expect("No home directory"));
+pub(crate) static HOME_DIR: LazyLock<PathBuf> = LazyLock::new(|| home::home_dir().expect("No home directory"));
 #[cfg(unix)]
 pub(crate) static XDG_DIRS: LazyLock<Xdg> = LazyLock::new(|| Xdg::new().expect("No home directory"));

@@ -99,7 +98,7 @@ fn run() -> Result<()> {
        let mut parts = env.split('=');
        let var = parts.next().unwrap();
        let value = parts.next().unwrap();
-        unsafe { env::set_var(var, value) };
+        env::set_var(var, value);
    }

    if opt.edit_config() {
@@ -322,7 +321,11 @@ fn run() -> Result<()> {
        );
    }

-    if failed { Err(StepFailed.into()) } else { Ok(()) }
+    if failed {
+        Err(StepFailed.into())
+    } else {
+        Ok(())
+    }
 }

 fn main() {
--- a/src/runner.rs
+++ b/src/runner.rs
@@ -9,7 +9,7 @@ use crate::ctrlc;
 use crate::error::{DryRun, MissingSudo, SkipStep};
 use crate::execution_context::ExecutionContext;
 use crate::step::Step;
-use crate::terminal::{ShouldRetry, print_error, print_warning, should_retry};
+use crate::terminal::{print_error, print_warning, should_retry, ShouldRetry};

 pub enum StepResult {
    Success,
--- a/src/self_update.rs
+++ b/src/self_update.rs
@@ -1,14 +1,14 @@
 use std::env;
 #[cfg(unix)]
 use std::os::unix::process::CommandExt as _;
-use std::process::Command;
 #[cfg(windows)]
 use std::process::exit;
+use std::process::Command;

 use crate::step::Step;
-use color_eyre::eyre::Result;
 #[cfg(unix)]
 use color_eyre::eyre::bail;
+use color_eyre::eyre::Result;
 use rust_i18n::t;
 use self_update_crate::backends::github::Update;
 use self_update_crate::update::UpdateStatus;
--- a/src/steps/containers.rs
+++ b/src/steps/containers.rs
@@ -6,7 +6,7 @@ use std::process::Command;

 use color_eyre::eyre::Context;
 use color_eyre::eyre::Result;
-use color_eyre::eyre::{OptionExt, eyre};
+use color_eyre::eyre::{eyre, OptionExt};
 use tracing::{debug, error, warn};
 use wildmatch::WildMatch;

--- a/src/steps/emacs.rs
+++ b/src/steps/emacs.rs
@@ -10,7 +10,7 @@ use crate::command::CommandExt;
 use crate::execution_context::ExecutionContext;
 use crate::step::Step;
 use crate::terminal::print_separator;
-use crate::utils::{PathExt, require, require_option};
+use crate::utils::{require, require_option, PathExt};

 const EMACS_UPGRADE: &str = include_str!("emacs.el");
 #[cfg(windows)]
--- a/src/steps/generic.rs
+++ b/src/steps/generic.rs
@@ -1,7 +1,7 @@
 use color_eyre::eyre::Context;
 use color_eyre::eyre::Result;
-use color_eyre::eyre::{OptionExt, eyre};
-use jetbrains_toolbox_updater::{FindError, find_jetbrains_toolbox, update_jetbrains_toolbox};
+use color_eyre::eyre::{eyre, OptionExt};
+use jetbrains_toolbox_updater::{find_jetbrains_toolbox, update_jetbrains_toolbox, FindError};
 use regex::bytes::Regex;
 use rust_i18n::t;
 use semver::Version;
@@ -16,7 +16,6 @@ use std::{fs, io::Write};
 use tempfile::tempfile_in;
 use tracing::{debug, error, warn};

-use crate::HOME_DIR;
 use crate::command::{CommandExt, Utf8Output};
 use crate::execution_context::ExecutionContext;
 use crate::executor::ExecutorOutput;
@@ -24,7 +23,8 @@ use crate::output_changed_message;
 use crate::step::Step;
 use crate::sudo::SudoExecuteOpts;
 use crate::terminal::{print_separator, shell};
-use crate::utils::{PathExt, check_is_python_2_or_shim, require, require_one, require_option, which};
+use crate::utils::{check_is_python_2_or_shim, require, require_one, require_option, which, PathExt};
+use crate::HOME_DIR;
 use crate::{
    error::{SkipStep, StepFailed, TopgradeError},
    terminal::print_warning,
@@ -65,9 +65,7 @@ pub fn run_cargo_update(ctx: &ExecutionContext) -> Result<()> {
        .or_else(|| cargo_dir.join("bin/cargo-install-update").if_exists());

    let Some(cargo_update) = cargo_update else {
-        let message = String::from(
-            "cargo-update isn't installed so Topgrade can't upgrade cargo packages.\nInstall cargo-update by running `cargo install cargo-update`",
-        );
+        let message = String::from("cargo-update isn't installed so Topgrade can't upgrade cargo packages.\nInstall cargo-update by running `cargo install cargo-update`");
        print_warning(&message);
        return Err(SkipStep(message).into());
    };
@@ -83,9 +81,7 @@ pub fn run_cargo_update(ctx: &ExecutionContext) -> Result<()> {
        if let Some(e) = cargo_cache {
            ctx.execute(e).args(["-a"]).status_checked()?;
        } else {
-            let message = String::from(
-                "cargo-cache isn't installed so Topgrade can't cleanup cargo packages.\nInstall cargo-cache by running `cargo install cargo-cache`",
-            );
+            let message = String::from("cargo-cache isn't installed so Topgrade can't cleanup cargo packages.\nInstall cargo-cache by running `cargo install cargo-cache`");
            print_warning(message);
        }
    }
@@ -546,7 +542,7 @@ fn run_vscode_compatible(variant: VSCodeVariant, ctx: &ExecutionContext) -> Resu
            return Err(eyre!(output_changed_message!(
                &format!("{bin_name} --version"),
                "No first line"
-            )));
+            )))
        }
    };

@@ -1243,7 +1239,11 @@ pub fn run_helm_repo_update(ctx: &ExecutionContext) -> Result<()> {
        };
    }

-    if success { Ok(()) } else { Err(eyre!(StepFailed)) }
+    if success {
+        Ok(())
+    } else {
+        Err(eyre!(StepFailed))
+    }
 }

 pub fn run_stew(ctx: &ExecutionContext) -> Result<()> {
@@ -1428,7 +1428,8 @@ pub fn run_poetry(ctx: &ExecutionContext) -> Result<()> {
            .map_err(|e| SkipStep(format!("Could not find interpreter for {}: {}", poetry.display(), e)))?;
        debug!("poetry interpreter: {:?}, args: {:?}", interp, interp_args);

-        let check_official_install_script = "import sys; from os import path; print('Y') if path.isfile(path.join(sys.prefix, 'poetry_env')) else print('N')";
+        let check_official_install_script =
+            "import sys; from os import path; print('Y') if path.isfile(path.join(sys.prefix, 'poetry_env')) else print('N')";
        let mut command = Command::new(&interp);
        if let Some(args) = interp_args {
            command.arg(args);
@@ -1707,10 +1708,7 @@ fn run_jetbrains_ide_generic<const IS_JETBRAINS: bool>(ctx: &ExecutionContext, b
            .code()
            .ok_or_eyre("Failed to get status code; was killed with signal")?;
        if status_code != 1 {
-            return Err(eyre!(
-                "Expected status code 1 ('Only one instance of <IDE> can be run at a time.'), but found status code {}. Output: {output:?}",
-                status_code
-            ));
+            return Err(eyre!("Expected status code 1 ('Only one instance of <IDE> can be run at a time.'), but found status code {}. Output: {output:?}", status_code));
        }
        // Don't crash, but don't be silent either
        warn!("{name} is already running, can't update it now.");
--- a/src/steps/git.rs
+++ b/src/steps/git.rs
@@ -4,10 +4,10 @@ use std::path::{Path, PathBuf};
 use std::process::{Command, Output, Stdio};

 use color_eyre::eyre::Context;
-use color_eyre::eyre::{Result, eyre};
+use color_eyre::eyre::{eyre, Result};
 use console::style;
-use futures::stream::{FuturesUnordered, StreamExt, iter};
-use glob::{MatchOptions, glob_with};
+use futures::stream::{iter, FuturesUnordered, StreamExt};
+use glob::{glob_with, MatchOptions};
 use tokio::process::Command as AsyncCommand;
 use tokio::runtime;
 use tracing::{debug, error};
@@ -17,8 +17,8 @@ use crate::execution_context::ExecutionContext;
 use crate::step::Step;
 use crate::steps::emacs::Emacs;
 use crate::terminal::print_separator;
-use crate::utils::{PathExt, require};
-use crate::{HOME_DIR, error::SkipStep, terminal::print_warning};
+use crate::utils::{require, PathExt};
+use crate::{error::SkipStep, terminal::print_warning, HOME_DIR};
 use etcetera::base_strategy::BaseStrategy;
 use rust_i18n::t;

--- a/src/steps/node.rs
+++ b/src/steps/node.rs
@@ -14,7 +14,7 @@ use tracing::debug;

 use crate::command::CommandExt;
 use crate::terminal::{print_info, print_separator};
-use crate::utils::{PathExt, require};
+use crate::utils::{require, PathExt};
 use crate::{error::SkipStep, execution_context::ExecutionContext};

 enum NPMVariant {
@@ -65,7 +65,11 @@ impl NPM {
    /// If the “NPM” version is larger than 8.11.0, we use
    /// `--location=global`; otherwise, use `-g`.
    fn global_location_arg(&self) -> &str {
-        if self.is_npm_8() { "--location=global" } else { "-g" }
+        if self.is_npm_8() {
+            "--location=global"
+        } else {
+            "-g"
+        }
    }

    #[cfg(target_os = "linux")]
--- a/src/steps/os/linux.rs
+++ b/src/steps/os/linux.rs
@@ -6,7 +6,6 @@ use ini::Ini;
 use rust_i18n::t;
 use tracing::{debug, warn};

-use crate::HOME_DIR;
 use crate::command::CommandExt;
 use crate::error::{SkipStep, TopgradeError};
 use crate::execution_context::ExecutionContext;
@@ -15,7 +14,8 @@ use crate::steps::generic::is_wsl;
 use crate::steps::os::archlinux;
 use crate::sudo::SudoExecuteOpts;
 use crate::terminal::{print_separator, prompt_yesno};
-use crate::utils::{PathExt, require, require_one, which};
+use crate::utils::{require, require_one, which, PathExt};
+use crate::HOME_DIR;

 static OS_RELEASE_PATH: &str = "/etc/os-release";

--- a/src/steps/os/macos.rs
+++ b/src/steps/os/macos.rs
@@ -200,7 +200,7 @@ pub fn update_xcodes(ctx: &ExecutionContext) -> Result<()> {
 pub fn process_xcodes_releases(releases_filtered: Vec<String>, should_ask: bool, ctx: &ExecutionContext) -> Result<()> {
    let xcodes = require("xcodes")?;

-    if releases_filtered.last().is_none_or(|s| !s.contains("(Installed)")) && !releases_filtered.is_empty() {
+    if releases_filtered.last().map_or(true, |s| !s.contains("(Installed)")) && !releases_filtered.is_empty() {
        println!(
            "{} {}",
            t!("New Xcode release detected:"),
--- a/src/steps/os/unix.rs
+++ b/src/steps/os/unix.rs
@@ -1,14 +1,14 @@
 use color_eyre::eyre::Context;
 use color_eyre::eyre::Result;
-use color_eyre::eyre::{OptionExt, eyre};
+use color_eyre::eyre::{eyre, OptionExt};
 use etcetera::BaseStrategy;
+use home;
 use ini::Ini;
 #[cfg(target_os = "linux")]
 use nix::unistd::Uid;
 use regex::Regex;
 use rust_i18n::t;
 use semver::Version;
-use std::env::home_dir;
 use std::ffi::OsStr;
 use std::io::Write;
 use std::os::unix::fs::MetadataExt;
@@ -20,10 +20,10 @@ use std::{env::var, path::Path};
 use std::{fs, io};
 use tracing::{debug, warn};

-use crate::XDG_DIRS;
 use crate::command::CommandExt;
 use crate::sudo::SudoExecuteOpts;
-use crate::{HOME_DIR, output_changed_message};
+use crate::XDG_DIRS;
+use crate::{output_changed_message, HOME_DIR};

 #[cfg(target_os = "linux")]
 use super::linux::Distribution;
@@ -33,7 +33,7 @@ use crate::execution_context::ExecutionContext;
 use crate::executor::Executor;
 use crate::step::Step;
 use crate::terminal::print_separator;
-use crate::utils::{PathExt, require};
+use crate::utils::{require, PathExt};

 #[cfg(any(target_os = "linux", target_os = "macos"))]
 const INTEL_BREW: &str = "/usr/local/bin/brew";
@@ -526,8 +526,8 @@ pub fn run_nix(ctx: &ExecutionContext) -> Result<()> {
    let nix = require("nix")?;
    let nix_channel = require("nix-channel")?;
    let nix_env = require("nix-env")?;
-    // TODO: Is None possible here? Should we use HOME_DIR instead?
-    let profile_path = match home_dir() {
+    // TODO: Is None possible here?
+    let profile_path = match home::home_dir() {
        Some(home) => XDG_DIRS
            .state_dir()
            .map(|d| d.join("nix/profile"))
--- a/src/steps/os/windows.rs
+++ b/src/steps/os/windows.rs
@@ -254,7 +254,11 @@ pub fn microsoft_store(ctx: &ExecutionContext) -> Result<()> {
            }
            let ret_val = output.stdout.trim();
            debug!("Command return value: {}", ret_val);
-            if ret_val == "0" { Ok(()) } else { Err(()) }
+            if ret_val == "0" {
+                Ok(())
+            } else {
+                Err(())
+            }
        })?;
    println!(
        "{}",
--- a/src/steps/powershell.rs
+++ b/src/steps/powershell.rs
@@ -1,15 +1,15 @@
 use std::path::PathBuf;
 use std::process::Command;

-use color_eyre::eyre::Result;
 #[cfg(windows)]
 use color_eyre::eyre::eyre;
+use color_eyre::eyre::Result;
 use tracing::debug;

 use crate::command::CommandExt;
 use crate::execution_context::ExecutionContext;
 use crate::terminal;
-use crate::utils::{PathExt, which};
+use crate::utils::{which, PathExt};

 pub struct Powershell {
    path: PathBuf,
--- a/src/steps/tmux.rs
+++ b/src/steps/tmux.rs
@@ -2,20 +2,20 @@ use std::env;
 use std::path::PathBuf;
 use std::process::Command;

+use color_eyre::eyre::eyre;
 use color_eyre::eyre::Context;
 use color_eyre::eyre::Result;
-use color_eyre::eyre::eyre;
 use etcetera::base_strategy::BaseStrategy;

 use crate::command::CommandExt;
 use crate::config::TmuxConfig;
 use crate::config::TmuxSessionMode;
 use crate::terminal::print_separator;
-use crate::{HOME_DIR, XDG_DIRS};
 use crate::{
    execution_context::ExecutionContext,
-    utils::{PathExt, which},
+    utils::{which, PathExt},
 };
+use crate::{HOME_DIR, XDG_DIRS};

 use rust_i18n::t;
 #[cfg(unix)]
--- a/src/steps/vim.rs
+++ b/src/steps/vim.rs
@@ -1,6 +1,6 @@
-use crate::HOME_DIR;
 use crate::command::CommandExt;
 use crate::error::{SkipStep, TopgradeError};
+use crate::HOME_DIR;
 use color_eyre::eyre::Result;
 use etcetera::base_strategy::BaseStrategy;

@@ -8,7 +8,7 @@ use crate::executor::{Executor, ExecutorOutput};
 use crate::terminal::print_separator;
 use crate::{
    execution_context::ExecutionContext,
-    utils::{PathExt, require},
+    utils::{require, PathExt},
 };
 use rust_i18n::t;
 use std::path::PathBuf;
--- a/src/steps/zsh.rs
+++ b/src/steps/zsh.rs
@@ -6,13 +6,13 @@ use color_eyre::eyre::Result;
 use tracing::debug;
 use walkdir::WalkDir;

-use crate::HOME_DIR;
-use crate::XDG_DIRS;
 use crate::command::CommandExt;
 use crate::execution_context::ExecutionContext;
 use crate::git::RepoStep;
 use crate::terminal::print_separator;
-use crate::utils::{PathExt, require};
+use crate::utils::{require, PathExt};
+use crate::HOME_DIR;
+use crate::XDG_DIRS;
 use etcetera::base_strategy::BaseStrategy;

 pub fn run_zr(ctx: &ExecutionContext) -> Result<()> {
@@ -162,7 +162,7 @@ pub fn run_oh_my_zsh(ctx: &ExecutionContext) -> Result<()> {
        if let Ok(output) = res_env_zsh {
            let env_zsh = output.stdout;
            debug!("Oh-my-zsh: under SSH, setting ZSH={}", env_zsh);
-            unsafe { env::set_var("ZSH", env_zsh) };
+            env::set_var("ZSH", env_zsh);
        }
    }

--- a/src/sudo.rs
+++ b/src/sudo.rs
@@ -4,10 +4,10 @@ use std::path::PathBuf;

 #[cfg(windows)]
 use color_eyre::eyre;
-use color_eyre::eyre::Context;
-use color_eyre::eyre::Result;
 #[cfg(windows)]
 use color_eyre::eyre::eyre;
+use color_eyre::eyre::Context;
+use color_eyre::eyre::Result;
 use rust_i18n::t;
 use serde::Deserialize;
 use strum::Display;
--- a/src/terminal.rs
+++ b/src/terminal.rs
@@ -8,7 +8,7 @@ use std::time::Duration;
 use chrono::{Local, Timelike};
 use color_eyre::eyre;
 use color_eyre::eyre::Context;
-use console::{Key, Term, style};
+use console::{style, Key, Term};
 use notify_rust::{Notification, Timeout};
 use rust_i18n::t;
 use tracing::{debug, error};
--- a/src/utils.rs
+++ b/src/utils.rs
@@ -11,8 +11,8 @@ use tracing::{debug, error};
 use tracing_subscriber::layer::SubscriberExt;
 use tracing_subscriber::reload::{Handle, Layer};
 use tracing_subscriber::util::SubscriberInitExt;
-use tracing_subscriber::{EnvFilter, registry};
-use tracing_subscriber::{Registry, fmt};
+use tracing_subscriber::{fmt, Registry};
+use tracing_subscriber::{registry, EnvFilter};

 use crate::command::CommandExt;
 use crate::config::DEFAULT_LOG_LEVEL;
@@ -218,7 +218,7 @@ pub mod merge_strategies {
    where
        T: Merge,
    {
-        if let Some(left_inner) = left {
+        if let Some(ref mut left_inner) = left {
            if let Some(right_inner) = right {
                left_inner.merge(right_inner);
            }
@@ -228,7 +228,7 @@ pub mod merge_strategies {
    }

    pub fn commands_merge_opt(left: &mut Option<Commands>, right: Option<Commands>) {
-        if let Some(left_inner) = left {
+        if let Some(ref mut left_inner) = left {
            if let Some(right_inner) = right {
                left_inner.extend(right_inner);
            }