From 03191c6f243fd8296bea257152f415e00ece2158 Mon Sep 17 00:00:00 2001
From: Erik Johnston <erik@matrix.org>
Date: Mon, 10 Jul 2023 11:26:57 +0100
Subject: [PATCH 1/2] Fix building rust with nightly

Also fix up a warning.
---
 Cargo.lock | 4 ++--
 Cargo.toml | 1 +
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 52f911277ebd..0319fd81536c 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -182,9 +182,9 @@ dependencies = [
 
 [[package]]
 name = "proc-macro2"
-version = "1.0.52"
+version = "1.0.64"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1d0e1ae9e836cc3beddd63db0df682593d7e2d3d891ae8c9083d2113e1744224"
+checksum = "78803b62cbf1f46fde80d7c0e803111524b9877184cfe7c3033659490ac7a7da"
 dependencies = [
  "unicode-ident",
 ]
diff --git a/Cargo.toml b/Cargo.toml
index de141bdee9d3..c636b3acda0e 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -3,3 +3,4 @@
 
 [workspace]
 members = ["rust"]
+resolver = "2"

From 1fe5a00aa64c79261005028dc9a60e8dfa1c8316 Mon Sep 17 00:00:00 2001
From: Erik Johnston <erik@matrix.org>
Date: Mon, 10 Jul 2023 11:29:28 +0100
Subject: [PATCH 2/2] Newsfile

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

diff --git a/changelog.d/15906.misc b/changelog.d/15906.misc
new file mode 100644
index 000000000000..b721b88d568d
--- /dev/null
+++ b/changelog.d/15906.misc
@@ -0,0 +1 @@
+Fix building rust with nightly rust compiler.