1
1
mirror of https://github.com/wez/wezterm.git synced 2024-12-22 21:01:36 +03:00

deps: dirs -> dirs_next

I saw that former is unmaintained, and dependabot wants
to upgrade that one.
This commit is contained in:
Wez Furlong 2020-12-10 10:08:49 -08:00
parent c1fa08319e
commit eb83f28810
6 changed files with 28 additions and 9 deletions

26
Cargo.lock generated
View File

@ -708,7 +708,7 @@ version = "0.1.0"
dependencies = [
"anyhow",
"bstr 0.2.14",
"dirs 2.0.2",
"dirs-next",
"filenamegen",
"hostname",
"lazy_static",
@ -1037,6 +1037,16 @@ dependencies = [
"dirs-sys",
]
[[package]]
name = "dirs-next"
version = "2.0.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "b98cf8ebf19c3d1b223e151f99a4f9f0690dca41414773390fc824184ac833e1"
dependencies = [
"cfg-if 1.0.0",
"dirs-sys-next",
]
[[package]]
name = "dirs-sys"
version = "0.3.5"
@ -1048,6 +1058,17 @@ dependencies = [
"winapi 0.3.9",
]
[[package]]
name = "dirs-sys-next"
version = "0.1.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "99de365f605554ae33f115102a02057d4fc18b01f3284d6870be0938743cfe7d"
dependencies = [
"libc",
"redox_users",
"winapi 0.3.9",
]
[[package]]
name = "discard"
version = "1.0.4"
@ -1114,7 +1135,7 @@ version = "0.1.0"
dependencies = [
"cocoa",
"config",
"dirs 2.0.2",
"dirs-next",
"libc",
"objc",
]
@ -4468,7 +4489,6 @@ dependencies = [
"cc",
"codec",
"config",
"dirs 2.0.2",
"downcast-rs",
"embed-resource",
"env-bootstrap",

View File

@ -16,7 +16,7 @@ pretty_env_logger = "0.4"
[dependencies]
anyhow = "1.0"
bstr = "0.2"
dirs = "2.0"
dirs-next = "2.0"
filenamegen = "0.2"
hostname = "0.3"
lazy_static = "1.4"

View File

@ -55,7 +55,7 @@ type LuaFactory = fn(&Path) -> anyhow::Result<Lua>;
type ErrorCallback = fn(&str);
lazy_static! {
pub static ref HOME_DIR: PathBuf = dirs::home_dir().expect("can't find HOME dir");
pub static ref HOME_DIR: PathBuf = dirs_next::home_dir().expect("can't find HOME dir");
pub static ref CONFIG_DIR: PathBuf = xdg_config_home();
pub static ref RUNTIME_DIR: PathBuf = compute_runtime_dir().unwrap();
static ref CONFIG: Configuration = Configuration::new();
@ -1254,7 +1254,7 @@ fn default_font_size() -> f64 {
}
fn compute_runtime_dir() -> Result<PathBuf, Error> {
if let Some(runtime) = dirs::runtime_dir() {
if let Some(runtime) = dirs_next::runtime_dir() {
return Ok(runtime.join("wezterm"));
}

View File

@ -8,7 +8,7 @@ edition = "2018"
[dependencies]
config = { path = "../config" }
dirs = "2.0"
dirs-next = "2.0"
[target.'cfg(target_os = "macos")'.dependencies]
cocoa = "0.20"

View File

@ -51,7 +51,7 @@ pub fn fixup_appimage() {
if config::HOME_DIR.starts_with(append_extra_file_name_suffix(&appimage, ".home")) {
// Fixup HOME to point to the user's actual home dir
std::env::remove_var("HOME");
std::env::set_var("HOME", dirs::home_dir().expect("can't resolve HOME dir"));
std::env::set_var("HOME", dirs_next::home_dir().expect("can't resolve HOME dir"));
clean_wezterm_config_env();
}

View File

@ -19,7 +19,6 @@ anyhow = "1.0"
bitflags = "1.0"
codec = { path = "../codec" }
config = { path = "../config" }
dirs = "2.0"
downcast-rs = "1.0"
env-bootstrap = { path = "../env-bootstrap" }
euclid = "0.22"