Llewellyn/zoxide
1
0
Fork 0
mirror of https://github.com/Llewellynvdm/zoxide.git synced 2024-12-29 04:23:01 +00:00
Code Issues Projects Releases Wiki Activity

Remove i32 conversion from fzf helper

Browse Source
This commit is contained in:
Ajeet D'Souza 2020-03-26 00:53:04 +05:30
parent dc5f965b0c
commit 5d709bded5
1 changed files with 17 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
src/util.rs
View File

@ -45,15 +45,8 @@ pub fn fzf_helper(now: Epoch, mut dirs: Vec<Dir>) -> Result<Option<String>> {
for dir in dirs.iter() {
// ensure that frecency fits in 4 characters
let frecency = if dir.rank > 9999.0 {
9999
} else if dir.rank > 0.0 {
dir.rank as i32
} else {
0
};
writeln!(fzf_stdin, "{:>4} {}", frecency, dir.path)
let frecency = clamp(dir.rank, 0.0, 9999.0);
writeln!(fzf_stdin, "{:>4.0} {}", frecency, dir.path)
.with_context(|| anyhow!("could not write into fzf stdin"))?;
}
@ -89,3 +82,18 @@ pub fn fzf_helper(now: Epoch, mut dirs: Vec<Dir>) -> Result<Option<String>> {
_ => bail!("fzf returned an unknown error"),
}
}
// FIXME: replace with f64::clamp once it is stable <https://github.com/rust-lang/rust/issues/44095>
#[must_use = "method returns a new number and does not mutate the original value"]
#[inline]
pub fn clamp(val: f64, min: f64, max: f64) -> f64 {
assert!(min <= max);
let mut x = val;
if x < min {
x = min;
}
if x > max {
x = max;
}
x
}