Archives/bat
2
0
Fork 0
mirror of https://github.com/sharkdp/bat synced 2024-11-18 15:26:16 +00:00
Code Issues Projects Releases Wiki Activity

removed compile errors and warnings on non-macs

Browse Source
This commit is contained in:
Lavi 2019-02-05 14:34:08 -05:00 committed by David Peter
parent 69227222b5
commit 05e2c2c66b
1 changed files with 9 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/dirs.rs
View File

@ -1,8 +1,11 @@
use dirs_rs::home_dir; use dirs_rs;
use std::env;
use std::ffi::OsString;
use std::path::{Path, PathBuf}; use std::path::{Path, PathBuf};
#[cfg(target_os = "macos")]
use std::env;
#[cfg(target_os = "macos")]
use std::ffi::OsString;
/// Wrapper for dirs that treats MacOS more like Linux. /// Wrapper for dirs that treats MacOS more like Linux.
/// First, env variables `XDG_CACHE_HOME` and `XDG_CONFIG_HOME` are checked and the fall back is /// First, env variables `XDG_CACHE_HOME` and `XDG_CONFIG_HOME` are checked and the fall back is
/// `~/.cache/bat` and `~/.config/bat`. /// `~/.cache/bat` and `~/.config/bat`.
@ -16,7 +19,7 @@ impl BatProjectDirs {
#[cfg(target_os = "macos")] #[cfg(target_os = "macos")]
let cache_dir_op = env::var_os("XDG_CACHE_HOME") let cache_dir_op = env::var_os("XDG_CACHE_HOME")
.and_then(is_absolute_path) .and_then(is_absolute_path)
.or_else(|| home_dir().map(|d| d.join(".cache"))); .or_else(|| dirs_rs::home_dir().map(|d| d.join(".cache")));
#[cfg(not(target_os = "macos"))] #[cfg(not(target_os = "macos"))]
let cache_dir_op = dirs_rs::cache_dir(); let cache_dir_op = dirs_rs::cache_dir();
@ -29,7 +32,7 @@ impl BatProjectDirs {
#[cfg(target_os = "macos")] #[cfg(target_os = "macos")]
let config_dir_op = env::var_os("XDG_CONFIG_HOME") let config_dir_op = env::var_os("XDG_CONFIG_HOME")
.and_then(is_absolute_path) .and_then(is_absolute_path)
.or_else(|| home_dir().map(|d| d.join(".config"))); .or_else(|| dirs_rs::home_dir().map(|d| d.join(".config")));
#[cfg(not(target_os = "macos"))] #[cfg(not(target_os = "macos"))]
let config_dir_op = dirs_rs::config_dir(); let config_dir_op = dirs_rs::config_dir();
@ -55,6 +58,7 @@ impl BatProjectDirs {
} }
// Returns path if it is an absolute path // Returns path if it is an absolute path
#[cfg(target_os = "macos")]
fn is_absolute_path(path: OsString) -> Option<PathBuf> { fn is_absolute_path(path: OsString) -> Option<PathBuf> {
let path = PathBuf::from(path); let path = PathBuf::from(path);
if path.is_absolute() { if path.is_absolute() {