diff options
| -rw-r--r-- | src/clients/tldr.rs | 2 | ||||
| -rw-r--r-- | src/config/mod.rs | 2 | ||||
| -rw-r--r-- | src/config/yaml.rs | 9 | ||||
| -rw-r--r-- | src/finder/mod.rs | 21 |
4 files changed, 13 insertions, 21 deletions
diff --git a/src/clients/tldr.rs b/src/clients/tldr.rs index 01cec89..79c56bf 100644 --- a/src/clients/tldr.rs +++ b/src/clients/tldr.rs @@ -1,5 +1,5 @@ -use crate::prelude::*; use crate::config::CONFIG; +use crate::prelude::*; use std::process::{Command, Stdio}; lazy_static! { diff --git a/src/config/mod.rs b/src/config/mod.rs index a5b89c1..a5d1e4a 100644 --- a/src/config/mod.rs +++ b/src/config/mod.rs @@ -100,7 +100,7 @@ impl Config { } pub fn tealdeer(&self) -> bool { - self.yaml.client.tealdeer.clone() + self.yaml.client.tealdeer } pub fn shell(&self) -> String { diff --git a/src/config/yaml.rs b/src/config/yaml.rs index e0c7e87..868411b 100644 --- a/src/config/yaml.rs +++ b/src/config/yaml.rs @@ -80,6 +80,7 @@ pub struct Shell { #[derive(Deserialize, Debug)] #[serde(default)] +#[derive(Default)] pub struct Client { pub tealdeer: bool, } @@ -169,11 +170,3 @@ impl Default for Shell { } } } - -impl Default for Client { - fn default() -> Self { - Self { - tealdeer: false, - } - } -} diff --git a/src/finder/mod.rs b/src/finder/mod.rs index f19f2ca..a1edee6 100644 --- a/src/finder/mod.rs +++ b/src/finder/mod.rs @@ -52,11 +52,7 @@ fn parse(out: Output, opts: Opts) -> Result<String> { impl FinderChoice { fn check_fzf_version() -> Option<(u32, u32, u32)> { - let output = Command::new("fzf") - .arg("--version") - .output() - .ok()? - .stdout; + let output = Command::new("fzf").arg("--version").output().ok()?.stdout; let version_string = String::from_utf8(output).ok()?; let version_parts: Vec<_> = version_string.split('.').collect(); if version_parts.len() == 3 { @@ -80,12 +76,15 @@ impl FinderChoice { if let Self::Fzf = self { if let Some((major, minor, patch)) = Self::check_fzf_version() { - if major == MIN_FZF_VERSION_MAJOR && minor < MIN_FZF_VERSION_MINOR && patch < MIN_FZF_VERSION_PATCH { - eprintln!("Warning: Fzf version {}.{} does not support the preview window layout used by navi.", major, minor); - eprintln!("Consider updating Fzf to a version >= {}.{}.{} or use a compatible layout.", - MIN_FZF_VERSION_MAJOR, - MIN_FZF_VERSION_MINOR, - MIN_FZF_VERSION_PATCH + if major == MIN_FZF_VERSION_MAJOR + && minor < MIN_FZF_VERSION_MINOR + && patch < MIN_FZF_VERSION_PATCH + { + eprintln!( + "Warning: Fzf version {major}.{minor} does not support the preview window layout used by navi.", + ); + eprintln!( + "Consider updating Fzf to a version >= {MIN_FZF_VERSION_MAJOR}.{MIN_FZF_VERSION_MINOR}.{MIN_FZF_VERSION_PATCH} or use a compatible layout.", ); process::exit(1); } |