Release 1.0.104

This reverts commit 12a0d5320e.

.github/workflows/ci.yml

@@ -24,7 +24,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        rust: [nightly, beta, stable, 1.74.0]
+        rust: [nightly, beta, stable, 1.81.0]
         os: [ubuntu]
         include:
           - name: macOS
@@ -45,6 +45,11 @@ jobs:
       - name: Enable type layout randomization
         run: echo RUSTFLAGS=${RUSTFLAGS}\ -Zrandomize-layout >> $GITHUB_ENV
         if: matrix.rust == 'nightly'
+        shell: bash
+      - name: Ignore Windows linker warning
+        run: echo RUSTFLAGS=${RUSTFLAGS}\ -Alinker_messages >> $GITHUB_ENV
+        if: matrix.rust == 'nightly-x86_64-pc-windows-gnu'
+        shell: bash
       - run: cargo check --locked
       - run: cargo update
       - run: cargo check
@@ -57,6 +62,7 @@ jobs:
         with:
           name: Cargo.lock
           path: Cargo.lock
+        continue-on-error: true
 
   clippy:
     name: Clippy

.gitignore

@@ -1,2 +1,2 @@
+/target/
 expand.rs
-target

Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "cargo-expand"
-version = "1.0.95"
+version = "1.0.104"
 authors = ["David Tolnay <dtolnay@gmail.com>"]
 autotests = false
 categories = ["development-tools::cargo-plugins", "development-tools::debugging"]
@@ -10,22 +10,21 @@ edition = "2021"
 keywords = ["cargo", "subcommand", "macros"]
 license = "MIT OR Apache-2.0"
 repository = "https://github.com/dtolnay/cargo-expand"
-rust-version = "1.70"
+rust-version = "1.81"
 
 [features]
 default = ["prettyplease"]
 prettyplease = []
 
 [dependencies]
-bat = { version = "0.24", default-features = false, features = ["paging", "regex-fancy"] }
+bat = { version = "0.25", default-features = false, features = ["paging", "regex-fancy"] }
 cargo-subcommand-metadata = "0.1"
 clap = { version = "4", features = ["deprecated", "derive"] }
-clap-cargo = "0.14"
+clap-cargo = "0.15"
 console = "0.15"
-etcetera = "0.8"
 fs-err = "3"
 home = "0.5"
-prettyplease = { version = "0.2.25", features = ["verbatim"] }
+prettyplease = { version = "0.2.31", features = ["verbatim"] }
 proc-macro2 = "1.0.80"
 quote = { version = "1.0.35", default-features = false }
 semver = "1"
@@ -38,6 +37,9 @@ termcolor = "1.0"
 toml = "0.8"
 toolchain_find = "0.4"
 
+[target.'cfg(all(windows, not(target_vendor = "uwp")))'.dependencies]
+windows-sys = { version = "0.59", features = ["Win32_Foundation", "Win32_System_Com", "Win32_UI_Shell"] }
+
 [package.metadata.docs.rs]
 targets = ["x86_64-unknown-linux-gnu"]
 

src/assets.rs

@@ -1,5 +1,4 @@
-use crate::error::Result;
+use crate::error::{Error, Result};
-use etcetera::BaseStrategy as _;
 use std::env;
 use std::path::PathBuf;
 use std::str;
@@ -21,6 +20,84 @@ pub fn cache_dir() -> Result<PathBuf> {
         return Ok(PathBuf::from(cache_dir));
     }
 
-    let basedirs = etcetera::choose_base_strategy()?;
+    let home_dir = home::home_dir().ok_or(Error::HomeDir)?;
-    Ok(basedirs.cache_dir().join("bat"))
+
+    #[cfg(windows)]
+    let cache_dir = windows::cache_dir(&home_dir);
+    #[cfg(not(windows))]
+    let cache_dir = xdg::cache_dir(&home_dir);
+
+    Ok(cache_dir.join("bat"))
+}
+
+// Based on etcetera v0.9.0
+#[cfg(windows)]
+mod windows {
+    use std::env;
+    use std::path::{Path, PathBuf};
+
+    pub fn cache_dir(home_dir: &Path) -> PathBuf {
+        env::var_os("LOCALAPPDATA")
+            .filter(|s| !s.is_empty())
+            .map(PathBuf::from)
+            .or_else(dir_crt)
+            .unwrap_or_else(|| home_dir.join("AppData").join("Local"))
+    }
+
+    // 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.
+    #[cfg(not(target_vendor = "uwp"))]
+    fn dir_crt() -> Option<PathBuf> {
+        use std::ffi::OsString;
+        use std::os::windows::ffi::OsStringExt;
+        use std::ptr;
+        use std::slice;
+        use windows_sys::Win32::Foundation::S_OK;
+        use windows_sys::Win32::System::Com::CoTaskMemFree;
+        use windows_sys::Win32::UI::Shell::{
+            FOLDERID_LocalAppData, SHGetKnownFolderPath, KF_FLAG_DONT_VERIFY,
+        };
+
+        extern "C" {
+            fn wcslen(buf: *const u16) -> usize;
+        }
+
+        let mut path = ptr::null_mut();
+        let S_OK = (unsafe {
+            SHGetKnownFolderPath(
+                &FOLDERID_LocalAppData,
+                KF_FLAG_DONT_VERIFY as u32,
+                ptr::null_mut(),
+                &mut path,
+            )
+        }) else {
+            // Free any allocated memory even on failure. A null ptr is a no-op for `CoTaskMemFree`.
+            unsafe { CoTaskMemFree(path.cast()) };
+            return None;
+        };
+
+        let path_slice = unsafe { slice::from_raw_parts(path, wcslen(path)) };
+        let s = OsString::from_wide(path_slice);
+        unsafe { CoTaskMemFree(path.cast()) };
+        Some(PathBuf::from(s))
+    }
+
+    #[cfg(target_vendor = "uwp")]
+    fn dir_crt() -> Option<PathBuf> {
+        None
+    }
+}
+
+// Based on etcetera v0.9.0
+#[cfg(not(windows))]
+mod xdg {
+    use std::env;
+    use std::path::{Path, PathBuf};
+
+    pub fn cache_dir(home_dir: &Path) -> PathBuf {
+        env::var_os("XDG_CACHE_HOME")
+            .map(PathBuf::from)
+            .filter(|path| path.is_absolute())
+            .unwrap_or_else(|| home_dir.join(".cache/"))
+    }
 }

src/bat.version

@@ -1 +1 @@
-0.24.0
+0.25.0

src/error.rs

@@ -8,7 +8,7 @@ pub enum Error {
     TomlSer(toml::ser::Error),
     TomlDe(toml::de::Error),
     Quote(shlex::QuoteError),
-    HomeDir(etcetera::HomeDirError),
+    HomeDir,
     Bat(bat::error::Error),
 }
 
@@ -38,12 +38,6 @@ impl From<shlex::QuoteError> for Error {
     }
 }
 
-impl From<etcetera::HomeDirError> for Error {
-    fn from(error: etcetera::HomeDirError) -> Self {
-        Error::HomeDir(error)
-    }
-}
-
 impl From<bat::error::Error> for Error {
     fn from(error: bat::error::Error) -> Self {
         Error::Bat(error)
@@ -57,7 +51,7 @@ impl Display for Error {
             Error::TomlSer(e) => e.fmt(formatter),
             Error::TomlDe(e) => e.fmt(formatter),
             Error::Quote(e) => e.fmt(formatter),
-            Error::HomeDir(e) => e.fmt(formatter),
+            Error::HomeDir => formatter.write_str("could not locate home directory"),
             Error::Bat(e) => e.fmt(formatter),
         }
     }
@@ -70,7 +64,7 @@ impl StdError for Error {
             Error::TomlSer(e) => e.source(),
             Error::TomlDe(e) => e.source(),
             Error::Quote(e) => e.source(),
-            Error::HomeDir(e) => e.source(),
+            Error::HomeDir => None,
             Error::Bat(e) => e.source(),
         }
     }

src/main.rs

@@ -320,7 +320,7 @@ fn do_cargo_expand() -> Result<i32> {
             },
             visible_lines: VisibleLines::Ranges(LineRanges::all()),
             theme: theme.unwrap_or_else(String::new),
-            syntax_mapping: SyntaxMapping::empty(),
+            syntax_mapping: SyntaxMapping::new(),
             pager: None,
             use_italic_text: false,
             highlighted_lines: HighlightedLineRanges(LineRanges::none()),
@@ -675,7 +675,7 @@ fn print_themes() -> Result<()> {
     let metadata = AssetsMetadata::load_from_folder(&cache_dir)?;
     let compatible = metadata
         .as_ref()
-        .map_or(false, |m| m.is_compatible_with(assets::BAT_VERSION));
+        .is_some_and(|m| m.is_compatible_with(assets::BAT_VERSION));
     let assets = if compatible {
         HighlightingAssets::from_cache(&cache_dir)?
     } else {