diff --git a/Cargo.lock b/Cargo.lock index c07d28369..2bab448c0 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -1269,7 +1269,6 @@ dependencies = [ "glow", "glutin", "glutin-winit", - "home", "image", "js-sys", "log", @@ -2204,15 +2203,6 @@ version = "0.4.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7f24254aa9a54b5c858eaee2f5bccdb46aaf0e486a595ed5fd8f86ba55232a70" -[[package]] -name = "home" -version = "0.5.12" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cc627f471c528ff0c4a49e1d5e60450c8f6461dd6d10ba9dcd3a61d3dff7728d" -dependencies = [ - "windows-sys 0.61.2", -] - [[package]] name = "http" version = "1.4.2" diff --git a/Cargo.toml b/Cargo.toml index 5a4193dad..884f9c7de 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -96,7 +96,6 @@ glow = "0.17.0" # Can't update to 0.18: wgpu 30's wgpu-hal pins glow 0.17, so bu glutin = { version = "0.32.3", default-features = false } glutin-winit = { version = "0.5.0", default-features = false } harfrust = "0.12.0" -home = "0.5.12" image = { version = "0.25.6", default-features = false } # Can't update to 0.25.7+: it needs png 0.18, which only matches resvg once resvg moves to tiny-skia 0.12 — blocked, see resvg below itertools = "0.15.0" jiff = { version = "0.2.35", default-features = false } diff --git a/crates/eframe/Cargo.toml b/crates/eframe/Cargo.toml index 60b796bc5..65e3150a8 100644 --- a/crates/eframe/Cargo.toml +++ b/crates/eframe/Cargo.toml @@ -61,7 +61,7 @@ default_fonts = ["egui/default_fonts"] glow = ["dep:egui_glow", "dep:glow", "dep:glutin-winit", "dep:glutin"] ## Enable saving app state to disk. -persistence = ["dep:home", "egui-winit/serde", "egui/persistence", "ron", "serde"] +persistence = ["egui-winit/serde", "egui/persistence", "ron", "serde"] ## Enables wayland support and fixes clipboard issue. ## @@ -165,7 +165,6 @@ glutin-winit = { workspace = true, optional = true, default-features = false, fe "egl", "wgl", ] } -home = { workspace = true, optional = true } # mac: [target.'cfg(any(target_os = "macos"))'.dependencies] diff --git a/crates/eframe/src/native/file_storage.rs b/crates/eframe/src/native/file_storage.rs index 947554a00..830fdcc24 100644 --- a/crates/eframe/src/native/file_storage.rs +++ b/crates/eframe/src/native/file_storage.rs @@ -21,7 +21,7 @@ pub fn storage_dir(app_id: &str) -> Option { OS::Nix => var_os("XDG_DATA_HOME") .map(PathBuf::from) .filter(|p| p.is_absolute()) - .or_else(|| home::home_dir().map(|p| p.join(".local").join("share"))) + .or_else(|| std::env::home_dir().map(|p| p.join(".local").join("share"))) .map(|p| { p.join( app_id @@ -29,7 +29,7 @@ pub fn storage_dir(app_id: &str) -> Option { .replace(|c: char| c.is_ascii_whitespace(), ""), ) }), - OS::Mac => home::home_dir().map(|p| { + OS::Mac => std::env::home_dir().map(|p| { p.join("Library") .join("Application Support") .join(app_id.replace(|c: char| c.is_ascii_whitespace(), "-"))