mirrors/cargo-expand
1
0
Fork 0
mirror of https://github.com/dtolnay/cargo-expand.git synced 2025-04-03 12:57:38 +03:00
Code Issues Projects Releases Packages Wiki Activity

Conditionally compile OS-specific cache dir logic

Browse source
This commit is contained in:
David Tolnay 2025-03-02 22:39:59 -08:00
parent d46967c745
commit 36dbffb78c
No known key found for this signature in database
GPG key ID: F9BA143B95FF6D82
1 changed files with 8 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

15
src/assets.rs
View file

@ -22,15 +22,15 @@ pub fn cache_dir() -> Result<PathBuf> {
let home_dir = home::home_dir().ok_or(Error::HomeDir)?; let home_dir = home::home_dir().ok_or(Error::HomeDir)?;
let cache_dir = if cfg!(windows) { #[cfg(windows)]
windows::cache_dir(&home_dir) let cache_dir = windows::cache_dir(&home_dir);
} else { #[cfg(not(windows))]
xdg::cache_dir(&home_dir) let cache_dir = xdg::cache_dir(&home_dir);
};
Ok(cache_dir.join("bat")) Ok(cache_dir.join("bat"))
} }
#[cfg(windows)]
mod windows { mod windows {
use std::path::{Path, PathBuf}; use std::path::{Path, PathBuf};
@ -43,7 +43,7 @@ mod windows {
// Ref: https://github.com/rust-lang/cargo/blob/home-0.5.11/crates/home/src/windows.rs // Ref: https://github.com/rust-lang/cargo/blob/home-0.5.11/crates/home/src/windows.rs
// We should keep this code in sync with the above. // We should keep this code in sync with the above.
#[cfg(all(windows, not(target_vendor = "uwp")))] #[cfg(not(target_vendor = "uwp"))]
fn dir_crt(env: &'static str) -> Option<PathBuf> { fn dir_crt(env: &'static str) -> Option<PathBuf> {
use std::ffi::OsString; use std::ffi::OsString;
use std::os::windows::ffi::OsStringExt; use std::os::windows::ffi::OsStringExt;
@ -90,7 +90,7 @@ mod windows {
} }
} }
#[cfg(not(all(windows, not(target_vendor = "uwp"))))] #[cfg(target_vendor = "uwp")]
fn dir_crt(_env: &'static str) -> Option<PathBuf> { fn dir_crt(_env: &'static str) -> Option<PathBuf> {
None None
} }
@ -100,6 +100,7 @@ mod windows {
} }
} }
#[cfg(not(windows))]
mod xdg { mod xdg {
use std::path::{Path, PathBuf}; use std::path::{Path, PathBuf};