Robot
/
bat
mirror of https://github.com/sharkdp/bat.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Simplify Optional handling

This commit is contained in:
sharkdp 2019-02-07 21:20:35 +01:00 committed by David Peter
parent 54143d1403
commit 972a764a74
1 changed files with 2 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/dirs.rs
View File

@ -25,10 +25,7 @@ impl BatProjectDirs {
#[cfg(not(target_os = "macos"))]
let cache_dir_op = dirs_rs::cache_dir();
let cache_dir = match cache_dir_op {
Some(d) => d.join("bat"),
None => return None,
};
let cache_dir = cache_dir_op.map(|d| d.join("bat"))?;
#[cfg(target_os = "macos")]
let config_dir_op = env::var_os("XDG_CONFIG_HOME")
@ -39,10 +36,7 @@ impl BatProjectDirs {
#[cfg(not(target_os = "macos"))]
let config_dir_op = dirs_rs::config_dir();
let config_dir = match config_dir_op {
Some(d) => d.join("bat"),
None => return None,
};
let config_dir = config_dir_op.map(|d| d.join("bat"))?;
Some(BatProjectDirs {
cache_dir,