Merge branch 'master' into fix/list-themes-pager-hang

Cargo.lock

@@ -1,6 +1,6 @@
 # This file is automatically @generated by Cargo.
 # It is not intended for manual editing.
-version = 3
+version = 4
 
 [[package]]
 name = "adler2"
@@ -131,7 +131,6 @@ dependencies = [
  "git2",
  "globset",
  "grep-cli",
- "home",
  "indexmap",
  "itertools",
  "minus",
@@ -517,13 +516,12 @@ dependencies = [
 
 [[package]]
 name = "etcetera"
-version = "0.10.0"
+version = "0.11.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "26c7b13d0780cb82722fd59f6f57f925e143427e4a75313a6c77243bf5326ae6"
+checksum = "de48cc4d1c1d97a20fd819def54b890cadde72ed3ad0c614822a0a433361be96"
 dependencies = [
  "cfg-if",
- "home",
- "windows-sys 0.59.0",
+ "windows-sys 0.61.2",
 ]
 
 [[package]]
@@ -723,15 +721,6 @@ version = "0.15.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "bf151400ff0baff5465007dd2f3e717f3fe502074ca563069ce3a6629d07b289"
 
-[[package]]
-name = "home"
-version = "0.5.9"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e3d1354bf6b7235cb4a0576c2619fd4ed18183f689b12b006a0ee7329eeff9a5"
-dependencies = [
- "windows-sys 0.52.0",
-]
-
 [[package]]
 name = "icu_collections"
 version = "1.5.0"

Cargo.toml

@@ -11,7 +11,7 @@ exclude = ["assets/syntaxes/*", "assets/themes/*"]
 build = "build/main.rs"
 edition = '2021'
 # You are free to bump MSRV as soon as a reason for bumping emerges.
-rust-version = "1.79"
+rust-version = "1.87"
 
 [features]
 default = ["application", "git"]
@@ -65,7 +65,7 @@ semver = "1.0"
 path_abs = { version = "0.5", default-features = false }
 clircle = { version = "0.6.1", default-features = false }
 bugreport = { version = "0.5.0", optional = true }
-etcetera = { version = "0.10.0", optional = true }
+etcetera = { version = "0.11.0", optional = true }
 grep-cli = { version = "0.1.11", optional = true }
 regex = { version = "1.12.2", optional = true }
 walkdir = { version = "2.5", optional = true }
@@ -92,7 +92,6 @@ optional = true
 features = ["wrap_help", "cargo"]
 
 [target.'cfg(target_os = "macos")'.dependencies]
-home = "0.5.9"
 plist = "1.7.0"
 
 [dev-dependencies]

src/theme.rs

@@ -288,7 +288,7 @@ fn color_scheme_from_system() -> Option<ColorScheme> {
     const PREFERENCES_FILE: &str = "Library/Preferences/.GlobalPreferences.plist";
     const STYLE_KEY: &str = "AppleInterfaceStyle";
 
-    let preferences_file = home::home_dir()
+    let preferences_file = std::env::home_dir()
         .map(|home| home.join(PREFERENCES_FILE))
         .expect("Could not get home directory");