Skip to content

Commit 0758b4f

Browse files
authored
Update dependencies and move MSRV to 1.63 (#635)
1 parent 1ce7991 commit 0758b4f

File tree

20 files changed

+163
-187
lines changed

20 files changed

+163
-187
lines changed

.github/workflows/tests.yml

+6-6
Original file line numberDiff line numberDiff line change
@@ -36,14 +36,14 @@ jobs:
3636
run: make test
3737

3838
test-32bit:
39-
name: Check on 1.61.0 (32bit)
39+
name: Check on 1.63.0 (32bit)
4040
runs-on: ubuntu-latest
4141

4242
steps:
4343
- uses: actions/checkout@v4
4444
- uses: dtolnay/rust-toolchain@master
4545
with:
46-
toolchain: 1.61.0
46+
toolchain: 1.63.0
4747
targets: armv5te-unknown-linux-gnueabi
4848
- uses: Swatinem/rust-cache@v2
4949
- name: Install Cross Deps
@@ -56,29 +56,29 @@ jobs:
5656
run: cargo check --all-features -p minijinja --target armv5te-unknown-linux-gnueabi
5757

5858
test-fuel-feature:
59-
name: Check on 1.61.0 (fuel feature)
59+
name: Check on 1.63.0 (fuel feature)
6060
runs-on: ubuntu-latest
6161

6262
steps:
6363
- uses: actions/checkout@v4
6464
- uses: dtolnay/rust-toolchain@master
6565
with:
66-
toolchain: 1.61.0
66+
toolchain: 1.63.0
6767
- uses: Swatinem/rust-cache@v2
6868
- name: Restore Cargo.lock
6969
run: cp Cargo.lock.msrv Cargo.lock
7070
- name: Check
7171
run: cargo check --no-default-features -p minijinja --features fuel
7272

7373
test-stable:
74-
name: Test on 1.61.0
74+
name: Test on 1.63.0
7575
runs-on: ubuntu-latest
7676

7777
steps:
7878
- uses: actions/checkout@v4
7979
- uses: dtolnay/rust-toolchain@master
8080
with:
81-
toolchain: 1.61.0
81+
toolchain: 1.63.0
8282
- uses: Swatinem/rust-cache@v2
8383
- name: Restore Cargo.lock
8484
run: cp Cargo.lock.msrv Cargo.lock

CHANGELOG.md

+1
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,7 @@ All notable changes to MiniJinja are documented here.
2828
(that means also shell completion and ini). #633
2929
- `minijinja-cli` now does not convert INI files to lowercase anymore. This was
3030
an unintended behavior. #633
31+
- Moved up MSRV to 1.63.0 due to indexmap.
3132

3233
## 2.4.0
3334

CONTRIBUTING.md

+5-9
Original file line numberDiff line numberDiff line change
@@ -24,18 +24,18 @@ the old 1.x versions see head over to the `minijinja-1.x` branch:
2424
[`minijinja-1.x`](https://github.com/mitsuhiko/minijinja/tree/minijinja-1.x)
2525

2626
## Rust toolchain
27-
MiniJinja targets [Rust 1.61.0](https://blog.rust-lang.org/2022/05/19/Rust-1.61.0.html) as it's MSRV (Minimum Supported Rust Version).
27+
MiniJinja targets [Rust 1.63.0](https://blog.rust-lang.org/2022/08/11/Rust-1.63.0.html) as it's MSRV (Minimum Supported Rust Version).
2828

2929
If you use nightly Rust, you might be using features that aren't supported yet by stable.
3030

3131
Using [rustup](https://rustup.rs/) is a straight forward way to manage your installed toolchains, you have a couple of options
32-
to run `1.61.0` locally in the MiniJinja project:
32+
to run `1.63.0` locally in the MiniJinja project:
3333

3434
1. You can also create a [rust-toolchain.toml](https://rust-lang.github.io/rustup/concepts/toolchains.html) file in the root directory:
3535

3636
```toml
3737
[toolchain]
38-
channel = "1.61.0"
38+
channel = "1.63.0"
3939
```
4040

4141
Then running `rustup update` will ensure you have the latest stable toolchain.
@@ -44,14 +44,10 @@ Then running `rustup update` will ensure you have the latest stable toolchain.
4444
set the MiniJinja directory to use the stable toolchain:
4545

4646
```sh
47-
rustup override set 1.61.0
47+
rustup override set 1.63.0
4848
```
4949

50-
To verify you are on 1.61.0, you can use `rustc --version`:
51-
52-
```sh
53-
rustc 1.61.0 (fe5b13d68 2022-05-18)
54-
```
50+
To verify you are on 1.63.0, you can use `rustc --version`.
5551

5652
You can also use `rustup toolchain list`, which will show the installed and currently used toolchain.
5753

Cargo.lock

+8-24
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)