From 66504d1144c9620db378a43e1a982d807a0e6e63 Mon Sep 17 00:00:00 2001 From: Eric Eastwood Date: Thu, 17 Jul 2025 15:20:42 -0500 Subject: [PATCH] Fix dirty `Cargo.lock` changes appearing after install (`base64`) (#18689) Normal install results in `Cargo.lock` changes constantly popping up for me as I navigate my branches. This was probably caused by some Depdendabot PR updating the `Cargo.toml` without `Cargo.lock` or something. ``` poetry install --extras all ``` In another PR, I've also added CI to ensure we don't leave `Cargo.lock` changes behind to avoid this annoyance in the future -> https://github.com/element-hq/synapse/pull/18693 --- changelog.d/18689.misc | 1 + rust/Cargo.toml | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) create mode 100644 changelog.d/18689.misc diff --git a/changelog.d/18689.misc b/changelog.d/18689.misc new file mode 100644 index 0000000000..51f0586e19 --- /dev/null +++ b/changelog.d/18689.misc @@ -0,0 +1 @@ +Fix dirty `Cargo.lock` changes appearing after install (`base64`). diff --git a/rust/Cargo.toml b/rust/Cargo.toml index 4f5ebb68b7..ab87de33ab 100644 --- a/rust/Cargo.toml +++ b/rust/Cargo.toml @@ -23,7 +23,7 @@ name = "synapse.synapse_rust" [dependencies] anyhow = "1.0.63" -base64 = "0.21.7" +base64 = "0.22.1" bytes = "1.6.0" headers = "0.4.0" http = "1.1.0"