Merge branch 'master' into refactor-lessopen

sharkdp · Jan 4, 2025 · 44265b3 · 44265b3
2 parents f77032a + 2d3581e
commit 44265b3
Show file tree

Hide file tree

Showing 15 changed files with 266 additions and 69 deletions.
diff --git a/.cargo/audit.toml b/.cargo/audit.toml
@@ -0,0 +1,2 @@
+[advisories]
+ignore = ["RUSTSEC-2024-0320", "RUSTSEC-2024-0421"]
diff --git a/.github/workflows/CICD.yml b/.github/workflows/CICD.yml
@@ -152,6 +152,7 @@ jobs:
     name: cargo audit
     runs-on: ubuntu-latest
     steps:
+      - run: cargo install cargo-audit --locked
       - uses: actions/checkout@v4
       - run: cargo audit
 

diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -12,6 +12,7 @@
 - Automatically choose theme based on the terminal's color scheme, see #2896 (@bash)
 - Add option `--binary=as-text` for printing binary content, see issue #2974 and PR #2976 (@einfachIrgendwer0815)
 - Make shell completions available via `--completion <shell>`, see issue #2057 and PR #3126 (@einfachIrgendwer0815)
+- Syntax highlighting for puppet code blocks within Markdown files, see #3152 (@liliwilson)
 
 ## Bugfixes
 
@@ -50,6 +51,7 @@
 - Support 'statically linked binary' for aarch64 in 'Release' page, see #2992 (@tzq0301)
 - Update options in shell completions and the man page of `bat`, see #2995 (@akinomyoga)
 - Update nix dev-dependency to v0.29.0, see #3112 (@decathorpe)
+- Bump MSRV to [1.74](https://blog.rust-lang.org/2023/11/16/Rust-1.74.0.html), see #3154 (@keith-hall)
 
 ## Syntaxes
 
@@ -74,6 +76,8 @@
 
 ## Themes
 
+- Patched/improved themes for better Manpage syntax highlighting support, see #2994 (@keith-hall).
+
 ## `bat` as a library
 
 - Changes to `syntax_mapping::SyntaxMapping` #2755 (@cyqsimon)
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,2 @@
		[advisories]
		ignore = ["RUSTSEC-2024-0320", "RUSTSEC-2024-0421"]