summary refs log tree commit diff
diff options
context:
space:
mode:
authorErik Johnston <erik@matrix.org>2023-07-10 16:24:04 +0100
committerGitHub <noreply@github.com>2023-07-10 16:24:04 +0100
commit6774f265b4761302cab84405a181d437e69b89c0 (patch)
tree45fe7b3f4cfd5a0359926f19a44fc5726659300c
parentPlaceholder changelog (diff)
downloadsynapse-6774f265b4761302cab84405a181d437e69b89c0.tar.xz
Fix building rust with nightly (#15906)
Also fix up a warning.
-rw-r--r--Cargo.toml1
-rw-r--r--changelog.d/15906.misc1
2 files changed, 2 insertions, 0 deletions
diff --git a/Cargo.toml b/Cargo.toml
index de141bdee9..c636b3acda 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 0000000000..b721b88d56
--- /dev/null
+++ b/changelog.d/15906.misc
@@ -0,0 +1 @@
+Fix building rust with nightly rust compiler.