From fc4ddb8f1f3f846bb87219fb0bb57937d86fd140 Mon Sep 17 00:00:00 2001 From: Andras Schmelczer Date: Sun, 17 Aug 2025 16:50:53 +0100 Subject: [PATCH] Try fix --- .github/workflows/check.yml | 3 +-- sync-server/rust-toolchain.toml | 2 +- sync-server/src/app_state/cursors.rs | 2 +- sync-server/src/server/device_id_header.rs | 2 +- 4 files changed, 4 insertions(+), 5 deletions(-) diff --git a/.github/workflows/check.yml b/.github/workflows/check.yml index 1fc8ac7b..27ce38d0 100644 --- a/.github/workflows/check.yml +++ b/.github/workflows/check.yml @@ -25,8 +25,7 @@ jobs: - name: Setup rust run: | - rustup install 1.89 - rustup default 1.89 + rustup update cargo install sqlx-cli cargo-machete cd sync-server sqlx database create --database-url sqlite://db.sqlite3 diff --git a/sync-server/rust-toolchain.toml b/sync-server/rust-toolchain.toml index ed32db00..da0d7d23 100644 --- a/sync-server/rust-toolchain.toml +++ b/sync-server/rust-toolchain.toml @@ -1,4 +1,4 @@ [toolchain] -channel = "1.89.0" +channel = "nightly" targets = [ "x86_64-unknown-linux-gnu", "x86_64-unknown-linux-musl" ] profile = "default" diff --git a/sync-server/src/app_state/cursors.rs b/sync-server/src/app_state/cursors.rs index 1e6509c7..1c572604 100644 --- a/sync-server/src/app_state/cursors.rs +++ b/sync-server/src/app_state/cursors.rs @@ -47,7 +47,7 @@ impl Cursors { all_device_cursors.retain(|c| &c.client_cursors.device_id != device_id); all_device_cursors.push(ClientCursorsWithTimeToLive::new(ClientCursors { user_name, - device_id: device_id.to_string(), + device_id: device_id.clone(), documents_with_cursors: document_to_cursors, })); diff --git a/sync-server/src/server/device_id_header.rs b/sync-server/src/server/device_id_header.rs index be36c8d8..4573e66c 100644 --- a/sync-server/src/server/device_id_header.rs +++ b/sync-server/src/server/device_id_header.rs @@ -26,7 +26,7 @@ impl Header for DeviceIdHeader { where E: Extend, { - let value = HeaderValue::from_static(Box::leak(self.0.to_string().into_boxed_str())); + let value = HeaderValue::from_static(Box::leak(self.0.clone().into_boxed_str())); values.extend(std::iter::once(value)); }