From 3fefb15fef29a76419bc15830daf0cd9d7abc0b1 Mon Sep 17 00:00:00 2001 From: Erik Johnston Date: Mon, 22 Jan 2024 11:11:52 +0000 Subject: [PATCH] Bump minimum Rust version to 1.65.0 (#16818) The ecosystem e.g. regex crate, have bumped up their MSRV to 1.65.0, which was released Nov 2022. In line with our policy, let's bump to match. --- .github/workflows/tests.yml | 18 +++++++++--------- changelog.d/16818.misc | 1 + docs/upgrade.md | 8 ++++++++ rust/Cargo.toml | 2 +- 4 files changed, 19 insertions(+), 10 deletions(-) create mode 100644 changelog.d/16818.misc diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index f89c895935..15b3b23597 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -81,7 +81,7 @@ jobs: steps: - uses: actions/checkout@v4 - name: Install Rust - uses: dtolnay/rust-toolchain@1.61.0 + uses: dtolnay/rust-toolchain@1.65.0 - uses: Swatinem/rust-cache@v2 - uses: matrix-org/setup-python-poetry@v1 with: @@ -148,7 +148,7 @@ jobs: uses: actions/checkout@v4 - name: Install Rust - uses: dtolnay/rust-toolchain@1.61.0 + uses: dtolnay/rust-toolchain@1.65.0 - uses: Swatinem/rust-cache@v2 - name: Setup Poetry @@ -208,7 +208,7 @@ jobs: with: ref: ${{ github.event.pull_request.head.sha }} - name: Install Rust - uses: dtolnay/rust-toolchain@1.61.0 + uses: dtolnay/rust-toolchain@1.65.0 - uses: Swatinem/rust-cache@v2 - uses: matrix-org/setup-python-poetry@v1 with: @@ -225,7 +225,7 @@ jobs: - uses: actions/checkout@v4 - name: Install Rust - uses: dtolnay/rust-toolchain@1.61.0 + uses: dtolnay/rust-toolchain@1.65.0 with: components: clippy - uses: Swatinem/rust-cache@v2 @@ -344,7 +344,7 @@ jobs: postgres:${{ matrix.job.postgres-version }} - name: Install Rust - uses: dtolnay/rust-toolchain@1.61.0 + uses: dtolnay/rust-toolchain@1.65.0 - uses: Swatinem/rust-cache@v2 - uses: matrix-org/setup-python-poetry@v1 @@ -386,7 +386,7 @@ jobs: - uses: actions/checkout@v4 - name: Install Rust - uses: dtolnay/rust-toolchain@1.61.0 + uses: dtolnay/rust-toolchain@1.65.0 - uses: Swatinem/rust-cache@v2 # There aren't wheels for some of the older deps, so we need to install @@ -498,7 +498,7 @@ jobs: run: cat sytest-blacklist .ci/worker-blacklist > synapse-blacklist-with-workers - name: Install Rust - uses: dtolnay/rust-toolchain@1.61.0 + uses: dtolnay/rust-toolchain@1.65.0 - uses: Swatinem/rust-cache@v2 - name: Run SyTest @@ -642,7 +642,7 @@ jobs: path: synapse - name: Install Rust - uses: dtolnay/rust-toolchain@1.61.0 + uses: dtolnay/rust-toolchain@1.65.0 - uses: Swatinem/rust-cache@v2 - name: Prepare Complement's Prerequisites @@ -674,7 +674,7 @@ jobs: - uses: actions/checkout@v4 - name: Install Rust - uses: dtolnay/rust-toolchain@1.61.0 + uses: dtolnay/rust-toolchain@1.65.0 - uses: Swatinem/rust-cache@v2 - run: cargo test diff --git a/changelog.d/16818.misc b/changelog.d/16818.misc new file mode 100644 index 0000000000..0a5ed6dccb --- /dev/null +++ b/changelog.d/16818.misc @@ -0,0 +1 @@ +Bump minimum supported Rust version to 1.61.0. diff --git a/docs/upgrade.md b/docs/upgrade.md index 8fc146566f..7f67ef8806 100644 --- a/docs/upgrade.md +++ b/docs/upgrade.md @@ -97,6 +97,14 @@ v1.61.0. +# Upgrading to v1.100.0 + +## Minimum supported Rust version +The minimum supported Rust version has been increased from v1.61.0 to v1.65.0. +Users building from source will need to ensure their `rustc` version is up to +date. + + # Upgrading to v1.93.0 ## Minimum supported Rust version diff --git a/rust/Cargo.toml b/rust/Cargo.toml index cf70a879f6..d89def1843 100644 --- a/rust/Cargo.toml +++ b/rust/Cargo.toml @@ -7,7 +7,7 @@ name = "synapse" version = "0.1.0" edition = "2021" -rust-version = "1.61.0" +rust-version = "1.65.0" [lib] name = "synapse"