Skip to content
This repository was archived by the owner on Apr 26, 2024. It is now read-only.

Commit ba97b39

Browse files
authored
Bump minimum supported Rust version (#15768)
Important crates such as `log` and `regex` have bumped theirs to 1.60.0 as well.
1 parent 0b10436 commit ba97b39

File tree

4 files changed

+19
-10
lines changed

4 files changed

+19
-10
lines changed

.github/workflows/tests.yml

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ jobs:
3535
steps:
3636
- uses: actions/checkout@v3
3737
- name: Install Rust
38-
uses: dtolnay/rust-toolchain@1.58.1
38+
uses: dtolnay/rust-toolchain@1.60.0
3939
- uses: Swatinem/rust-cache@v2
4040
- uses: matrix-org/setup-python-poetry@v1
4141
with:
@@ -93,7 +93,7 @@ jobs:
9393
uses: actions/checkout@v3
9494

9595
- name: Install Rust
96-
uses: dtolnay/rust-toolchain@1.58.1
96+
uses: dtolnay/rust-toolchain@1.60.0
9797
- uses: Swatinem/rust-cache@v2
9898

9999
- name: Setup Poetry
@@ -150,7 +150,7 @@ jobs:
150150
with:
151151
ref: ${{ github.event.pull_request.head.sha }}
152152
- name: Install Rust
153-
uses: dtolnay/rust-toolchain@1.58.1
153+
uses: dtolnay/rust-toolchain@1.60.0
154154
- uses: Swatinem/rust-cache@v2
155155
- uses: matrix-org/setup-python-poetry@v1
156156
with:
@@ -167,7 +167,7 @@ jobs:
167167
- uses: actions/checkout@v3
168168

169169
- name: Install Rust
170-
uses: dtolnay/rust-toolchain@1.58.1
170+
uses: dtolnay/rust-toolchain@1.60.0
171171
with:
172172
components: clippy
173173
- uses: Swatinem/rust-cache@v2
@@ -268,7 +268,7 @@ jobs:
268268
postgres:${{ matrix.job.postgres-version }}
269269
270270
- name: Install Rust
271-
uses: dtolnay/rust-toolchain@1.58.1
271+
uses: dtolnay/rust-toolchain@1.60.0
272272
- uses: Swatinem/rust-cache@v2
273273

274274
- uses: matrix-org/setup-python-poetry@v1
@@ -308,7 +308,7 @@ jobs:
308308
- uses: actions/checkout@v3
309309

310310
- name: Install Rust
311-
uses: dtolnay/rust-toolchain@1.58.1
311+
uses: dtolnay/rust-toolchain@1.60.0
312312
- uses: Swatinem/rust-cache@v2
313313

314314
# There aren't wheels for some of the older deps, so we need to install
@@ -416,7 +416,7 @@ jobs:
416416
run: cat sytest-blacklist .ci/worker-blacklist > synapse-blacklist-with-workers
417417

418418
- name: Install Rust
419-
uses: dtolnay/rust-toolchain@1.58.1
419+
uses: dtolnay/rust-toolchain@1.60.0
420420
- uses: Swatinem/rust-cache@v2
421421

422422
- name: Run SyTest
@@ -556,7 +556,7 @@ jobs:
556556
path: synapse
557557

558558
- name: Install Rust
559-
uses: dtolnay/rust-toolchain@1.58.1
559+
uses: dtolnay/rust-toolchain@1.60.0
560560
- uses: Swatinem/rust-cache@v2
561561

562562
- uses: actions/setup-go@v4
@@ -584,7 +584,7 @@ jobs:
584584
- uses: actions/checkout@v3
585585

586586
- name: Install Rust
587-
uses: dtolnay/rust-toolchain@1.58.1
587+
uses: dtolnay/rust-toolchain@1.60.0
588588
- uses: Swatinem/rust-cache@v2
589589

590590
- run: cargo test

changelog.d/15768.misc

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
Bump minimum supported Rust version to 1.60.0.

docs/upgrade.md

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -87,6 +87,14 @@ process, for example:
8787
wget https://packages.matrix.org/debian/pool/main/m/matrix-synapse-py3/matrix-synapse-py3_1.3.0+stretch1_amd64.deb
8888
dpkg -i matrix-synapse-py3_1.3.0+stretch1_amd64.deb
8989
```
90+
# Upgrading to v1.86.0
91+
92+
## Minimum supported Rust version
93+
94+
The minimum supported Rust version has been increased from v1.58.1 to v1.60.0.
95+
Users building from source will need to ensure their `rustc` version is up to
96+
date.
97+
9098
9199
# Upgrading to v1.85.0
92100

rust/Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ name = "synapse"
77
version = "0.1.0"
88

99
edition = "2021"
10-
rust-version = "1.58.1"
10+
rust-version = "1.60.0"
1111

1212
[lib]
1313
name = "synapse"

0 commit comments

Comments
 (0)