MirroredRepos/bat
1
0
Fork 0
mirror of https://github.com/sharkdp/bat.git synced 2025-02-21 20:38:44 +00:00
Code Issues Releases Wiki Activity

Merge pull request #2513 from nickelc/deps/dirs

Browse Source 
Replace `dirs-next` with the original `dirs` crate
This commit is contained in:
David Peter 2023-03-24 22:07:47 +01:00 committed by GitHub
commit 1a142a82b4
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 17 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
Cargo.lock generated
View File

@ -77,7 +77,7 @@ dependencies = [
"clircle", "clircle",
"console", "console",
"content_inspector", "content_inspector",
"dirs-next", "dirs",
"encoding", "encoding",
"expect-test", "expect-test",
"flate2", "flate2",
@ -259,24 +259,23 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "6184e33543162437515c2e2b48714794e37845ec9851711914eec9d308f6ebe8" checksum = "6184e33543162437515c2e2b48714794e37845ec9851711914eec9d308f6ebe8"
[[package]] [[package]]
name = "dirs-next" name = "dirs"
version = "2.0.0" version = "5.0.0"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "b98cf8ebf19c3d1b223e151f99a4f9f0690dca41414773390fc824184ac833e1" checksum = "dece029acd3353e3a58ac2e3eb3c8d6c35827a892edc6cc4138ef9c33df46ecd"
dependencies = [ dependencies = [
"cfg-if", "dirs-sys",
"dirs-sys-next",
] ]
[[package]] [[package]]
name = "dirs-sys-next" name = "dirs-sys"
version = "0.1.2" version = "0.4.0"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "4ebda144c4fe02d1f7ea1a7d9641b6fc6b580adcfa024ae48797ecdeb6825b4d" checksum = "04414300db88f70d74c5ff54e50f9e1d1737d9a5b90f53fcf2e95ca2a9ab554b"
dependencies = [ dependencies = [
"libc", "libc",
"redox_users", "redox_users",
"winapi", "windows-sys 0.45.0",
] ]
[[package]] [[package]]

6
Cargo.toml
View File

@ -27,7 +27,7 @@ application = [
minimal-application = [ minimal-application = [
"atty", "atty",
"clap", "clap",
"dirs-next", "dirs",
"paging", "paging",
"regex-onig", "regex-onig",
"wild", "wild",
@ -61,7 +61,7 @@ semver = "1.0"
path_abs = { version = "0.5", default-features = false } path_abs = { version = "0.5", default-features = false }
clircle = "0.3" clircle = "0.3"
bugreport = { version = "0.5.0", optional = true } bugreport = { version = "0.5.0", optional = true }
dirs-next = { version = "2.0.0", optional = true } dirs = { version = "5.0.0", optional = true }
grep-cli = { version = "0.1.7", optional = true } grep-cli = { version = "0.1.7", optional = true }
regex = { version = "1.7.0", optional = true } regex = { version = "1.7.0", optional = true }
walkdir = { version = "2.0", optional = true } walkdir = { version = "2.0", optional = true }
@ -83,7 +83,7 @@ optional = true
features = ["wrap_help", "cargo"] features = ["wrap_help", "cargo"]
[target.'cfg(target_os = "macos")'.dependencies] [target.'cfg(target_os = "macos")'.dependencies]
dirs-next = "2.0.0" dirs = "5.0.0"
plist = "1.3" plist = "1.3"
[dev-dependencies] [dev-dependencies]

2
src/assets.rs
View File

@ -404,7 +404,7 @@ fn macos_dark_mode_active() -> bool {
const PREFERENCES_FILE: &str = "Library/Preferences/.GlobalPreferences.plist"; const PREFERENCES_FILE: &str = "Library/Preferences/.GlobalPreferences.plist";
const STYLE_KEY: &str = "AppleInterfaceStyle"; const STYLE_KEY: &str = "AppleInterfaceStyle";
let preferences_file = dirs_next::home_dir() let preferences_file = dirs::home_dir()
.map(|home| home.join(PREFERENCES_FILE)) .map(|home| home.join(PREFERENCES_FILE))
.expect("Could not get home directory"); .expect("Could not get home directory");

8
src/bin/bat/directories.rs
View File

@ -26,10 +26,10 @@ impl BatProjectDirs {
let config_dir_op = env::var_os("XDG_CONFIG_HOME") let config_dir_op = env::var_os("XDG_CONFIG_HOME")
.map(PathBuf::from) .map(PathBuf::from)
.filter(|p| p.is_absolute()) .filter(|p| p.is_absolute())
.or_else(|| dirs_next::home_dir().map(|d| d.join(".config"))); .or_else(|| dirs::home_dir().map(|d| d.join(".config")));
#[cfg(not(target_os = "macos"))] #[cfg(not(target_os = "macos"))]
let config_dir_op = dirs_next::config_dir(); let config_dir_op = dirs::config_dir();
config_dir_op.map(|d| d.join("bat"))? config_dir_op.map(|d| d.join("bat"))?
}; };
@ -51,10 +51,10 @@ impl BatProjectDirs {
let cache_dir_op = env::var_os("XDG_CACHE_HOME") let cache_dir_op = env::var_os("XDG_CACHE_HOME")
.map(PathBuf::from) .map(PathBuf::from)
.filter(|p| p.is_absolute()) .filter(|p| p.is_absolute())
.or_else(|| dirs_next::home_dir().map(|d| d.join(".cache"))); .or_else(|| dirs::home_dir().map(|d| d.join(".cache")));
#[cfg(not(target_os = "macos"))] #[cfg(not(target_os = "macos"))]
let cache_dir_op = dirs_next::cache_dir(); let cache_dir_op = dirs::cache_dir();
cache_dir_op.map(|d| d.join("bat")) cache_dir_op.map(|d| d.join("bat"))
} }