Merge the v0.18.3 hotfix release into master
The v0.18.3 release was a hotfix release to make bat build again with Rust 1.54.
This merge commit brings in all changes from the hotfix release into the master
branch.
In practice, this only brings in one new commit, namely b146958ec. The other
three commits in the release were cherry-picks from master.
commitb3247d93648265d67b1f82291e2c226ae3fbc135
authorMartin Nordholts <enselic@gmail.com>
dateSun 22 Aug 2021, 18:56 (5 years ago)
parentba8a694b146958
CHANGELOG.md+7
@@ -32,6 +32,13 @@
3232
3333
3434
35+# v0.18.3
36+
37+## Bugfixes
38+
39+- Bump `git2` dependency to fix build with Rust 1.54, see #1761
40+
41+
3542# v0.18.2
3643
3744## Features
Cargo.lock+1−1
@@ -83,7 +83,7 @@ checksum = "904dfeac50f3cdaba28fc6f57fdcddb75f49ed61346676a78c4ffe55877802fd"
8383
8484[[package]]
8585name = "bat"
86−version = "0.18.2"
86+version = "0.18.3"
8787dependencies = [
8888 "ansi_colours",
8989 "ansi_term 0.12.1",
Cargo.toml+1−1
@@ -6,7 +6,7 @@ homepage = "https://github.com/sharkdp/bat"
66license = "MIT/Apache-2.0"
77name = "bat"
88repository = "https://github.com/sharkdp/bat"
9−version = "0.18.2"
9+version = "0.18.3"
1010exclude = ["assets/syntaxes/*", "assets/themes/*"]
1111build = "build.rs"
1212edition = '2018'
README.md+1−1
@@ -222,7 +222,7 @@ the most recent release of `bat`, download the latest `.deb` package from the
222222[release page](https://github.com/sharkdp/bat/releases) and install it via:
223223
224224```bash
225−sudo dpkg -i bat_0.18.2_amd64.deb # adapt version number and architecture
225+sudo dpkg -i bat_0.18.3_amd64.deb # adapt version number and architecture
226226```
227227
228228### On Alpine Linux
doc/README-ja.md+1−1
@@ -202,7 +202,7 @@ ln -s /usr/bin/batcat ~/.local/bin/bat
202202batの最新リリースを実行する場合、または Ubuntu/Debian の古いバージョンを使用している場合は、[release page](https://github.com/sharkdp/bat/releases) から最新の `.deb` パッケージをダウンロードし、
203203次の方法でインストールします:
204204```bash
205−sudo dpkg -i bat_0.18.2_amd64.deb # adapt version number and architecture
205+sudo dpkg -i bat_0.18.3_amd64.deb # adapt version number and architecture
206206```
207207
208208### On Alpine Linux
doc/README-ko.md+1−1
@@ -244,7 +244,7 @@ ln -s /usr/bin/batcat ~/.local/bin/bat
244244다음과 같이 `.deb` 패키지를 받아 설치하세요:
245245
246246```bash
247−sudo dpkg -i bat_0.18.2_amd64.deb # adapt version number and architecture
247+sudo dpkg -i bat_0.18.3_amd64.deb # adapt version number and architecture
248248```
249249
250250### Alpine Linux에서
doc/README-ru.md+1−1
@@ -185,7 +185,7 @@ ln -s /usr/bin/batcat ~/.local/bin/bat
185185[release page](https://github.com/sharkdp/bat/releases) и установить так:
186186
187187```bash
188−sudo dpkg -i bat_0.18.2_amd64.deb # измените архитектуру и версию
188+sudo dpkg -i bat_0.18.3_amd64.deb # измените архитектуру и версию
189189```
190190
191191### Alpine Linux