From 6774f265b4761302cab84405a181d437e69b89c0 Mon Sep 17 00:00:00 2001
From: Erik Johnston <erik@matrix.org>
Date: Mon, 10 Jul 2023 16:24:04 +0100
Subject: [PATCH] Fix building rust with nightly (#15906)

Also fix up a warning.
---
 Cargo.toml             | 1 +
 changelog.d/15906.misc | 1 +
 2 files changed, 2 insertions(+)
 create mode 100644 changelog.d/15906.misc

diff --git a/Cargo.toml b/Cargo.toml
index de141bdee..c636b3acd 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -3,3 +3,4 @@
 
 [workspace]
 members = ["rust"]
+resolver = "2"
diff --git a/changelog.d/15906.misc b/changelog.d/15906.misc
new file mode 100644
index 000000000..b721b88d5
--- /dev/null
+++ b/changelog.d/15906.misc
@@ -0,0 +1 @@
+Fix building rust with nightly rust compiler.