From 5484f189932087e2d31eb94d69c38ae395a32461 Mon Sep 17 00:00:00 2001
From: Erik Johnston <erik@matrix.org>
Date: Wed, 21 Sep 2022 10:02:44 +0100
Subject: [PATCH 1/2] Lower minimum rustc version to 1.58.1

---
 .github/workflows/tests.yml | 12 ++++++------
 rust/Cargo.toml             |  2 +-
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
index 91a080cca0e3..9fe61930a55a 100644
--- a/.github/workflows/tests.yml
+++ b/.github/workflows/tests.yml
@@ -94,7 +94,7 @@ jobs:
       - name: Install Rust
         uses: actions-rs/toolchain@v1
         with:
-            toolchain: 1.61.0
+            toolchain: 1.58.1
             override: true
             components: clippy
       - uses: Swatinem/rust-cache@v2
@@ -112,7 +112,7 @@ jobs:
       - name: Install Rust
         uses: actions-rs/toolchain@v1
         with:
-            toolchain: 1.61.0
+            toolchain: 1.58.1
             override: true
             components: rustfmt
       - uses: Swatinem/rust-cache@v2
@@ -204,7 +204,7 @@ jobs:
       - name: Install Rust
         uses: actions-rs/toolchain@v1
         with:
-            toolchain: 1.61.0
+            toolchain: 1.58.1
             override: true
       - uses: Swatinem/rust-cache@v2
 
@@ -320,7 +320,7 @@ jobs:
       - name: Install Rust
         uses: actions-rs/toolchain@v1
         with:
-            toolchain: 1.61.0
+            toolchain: 1.58.1
             override: true
       - uses: Swatinem/rust-cache@v2
 
@@ -452,7 +452,7 @@ jobs:
       - name: Install Rust
         uses: actions-rs/toolchain@v1
         with:
-            toolchain: 1.61.0
+            toolchain: 1.58.1
             override: true
       - uses: Swatinem/rust-cache@v2
 
@@ -478,7 +478,7 @@ jobs:
       - name: Install Rust
         uses: actions-rs/toolchain@v1
         with:
-            toolchain: 1.61.0
+            toolchain: 1.58.1
             override: true
       - uses: Swatinem/rust-cache@v2
 
diff --git a/rust/Cargo.toml b/rust/Cargo.toml
index deddf3cec262..657f78c0b1e0 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.58.1"
 
 [lib]
 name = "synapse"

From 1e2ee998c7f7302326b4f9986575946e6413b3d4 Mon Sep 17 00:00:00 2001
From: Erik Johnston <erik@matrix.org>
Date: Wed, 21 Sep 2022 10:05:09 +0100
Subject: [PATCH 2/2] Newsfile

---
 changelog.d/13857.misc | 1 +
 1 file changed, 1 insertion(+)
 create mode 100644 changelog.d/13857.misc

diff --git a/changelog.d/13857.misc b/changelog.d/13857.misc
new file mode 100644
index 000000000000..9bff3e245b1e
--- /dev/null
+++ b/changelog.d/13857.misc
@@ -0,0 +1 @@
+Lower minimum supported rustc version to 1.58.1.