Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 6 additions & 6 deletions Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,7 @@ unicode-segmentation = "1.10.1"
# 0.2.0 (and 0.1.13) treats \n as width 1. Lines processed by delta have, lose,
# and re-gain \n in various stages, which complicates upgrading.
unicode-width = ">=0.1.14, <0.2.0"
xdg = "2.4.1"
xdg = "3.0.0"

[lints.rust]
unexpected_cfgs = { level = "warn", check-cfg = ['cfg(tarpaulin_include)'] }
Expand Down
11 changes: 6 additions & 5 deletions src/features/navigate.rs
Original file line number Diff line number Diff line change
Expand Up @@ -102,7 +102,7 @@ fn get_delta_less_hist_file() -> std::io::Result<PathBuf> {

#[cfg(not(target_os = "windows"))]
fn get_delta_less_hist_file() -> std::io::Result<PathBuf> {
let dir = xdg::BaseDirectories::with_prefix("delta")?;
let dir = xdg::BaseDirectories::with_prefix("delta");
dir.place_data_file("lesshst")
}

Expand All @@ -126,13 +126,14 @@ fn get_less_hist_file() -> Option<PathBuf> {
// According to the less 643 manual:
// "$XDG_STATE_HOME/lesshst" or "$HOME/.local/state/lesshst" or
// "$XDG_DATA_HOME/lesshst" or "$HOME/.lesshst".
let xdg_dirs = xdg::BaseDirectories::new().ok()?;
let xdg_dirs = xdg::BaseDirectories::new();
[
xdg_dirs.get_state_home().join("lesshst"),
xdg_dirs.get_data_home().join("lesshst"),
home_dir.join(".lesshst"),
xdg_dirs.get_state_home().map(|path| path.join("lesshst")),
xdg_dirs.get_data_home().map(|path| path.join("lesshst")),
Some(home_dir.join(".lesshst")),
]
.iter()
.flatten()
.filter(|path| path.exists())
.max_by_key(|path| {
std::fs::metadata(path)
Expand Down
Loading