From 063ee2a2c01c7bc2a44413e0339c37ed94ff6317 Mon Sep 17 00:00:00 2001
From: Andras Schmelczer <andras@schmelczer.dev>
Date: Sun, 17 Aug 2025 22:41:48 +0100
Subject: [PATCH] Use non-nightly rust

---
 .github/workflows/check.yml                  | 5 ++---
 sync-server/Cargo.toml                       | 2 +-
 sync-server/rust-toolchain.toml              | 2 +-
 sync-server/rustfmt.toml                     | 8 --------
 sync-server/src/app_state/cursors.rs         | 4 +++-
 sync-server/src/app_state/database/models.rs | 4 +++-
 sync-server/src/server.rs                    | 8 ++++++--
 sync-server/src/server/device_id_header.rs   | 4 +++-
 sync-server/src/utils/normalize.rs           | 4 +++-
 9 files changed, 22 insertions(+), 19 deletions(-)
 delete mode 100644 sync-server/rustfmt.toml

diff --git a/.github/workflows/check.yml b/.github/workflows/check.yml
index fbc33fda..cb54ca89 100644
--- a/.github/workflows/check.yml
+++ b/.github/workflows/check.yml
@@ -25,9 +25,7 @@ jobs:
 
       - name: Setup rust
         run: |
-          rustup update
-          rustup install nightly && rustup default nightly
-          cargo install sqlx-cli
+          cargo install sqlx-cli cargo-machete
           cd sync-server
           sqlx database create --database-url sqlite://db.sqlite3
           sqlx migrate run --source src/app_state/database/migrations --database-url sqlite://db.sqlite3
@@ -37,6 +35,7 @@ jobs:
           cd sync-server
           cargo clippy --all-targets --all-features
           cargo fmt --all -- --check
+          cargo machete
 
       - name: Test sync-server
         run: |
diff --git a/sync-server/Cargo.toml b/sync-server/Cargo.toml
index 94539a48..cbbaa14c 100644
--- a/sync-server/Cargo.toml
+++ b/sync-server/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "sync_server"
-rust-version = "1.87.0"
+rust-version = "1.89.0"
 authors = ["Andras Schmelczer <andras@schmelczer.dev>"]
 edition = "2024"
 license = "MIT"
diff --git a/sync-server/rust-toolchain.toml b/sync-server/rust-toolchain.toml
index da0d7d23..ed32db00 100644
--- a/sync-server/rust-toolchain.toml
+++ b/sync-server/rust-toolchain.toml
@@ -1,4 +1,4 @@
 [toolchain]
-channel = "nightly"
+channel = "1.89.0"
 targets = [ "x86_64-unknown-linux-gnu", "x86_64-unknown-linux-musl" ]
 profile = "default"
diff --git a/sync-server/rustfmt.toml b/sync-server/rustfmt.toml
deleted file mode 100644
index 6640f544..00000000
--- a/sync-server/rustfmt.toml
+++ /dev/null
@@ -1,8 +0,0 @@
-imports_granularity = "crate"
-condense_wildcard_suffixes = true
-fn_single_line = true
-format_strings = true
-reorder_impl_items = true
-group_imports = "StdExternalCrate"
-use_field_init_shorthand = true
-wrap_comments=true
diff --git a/sync-server/src/app_state/cursors.rs b/sync-server/src/app_state/cursors.rs
index 1c572604..d083e1ac 100644
--- a/sync-server/src/app_state/cursors.rs
+++ b/sync-server/src/app_state/cursors.rs
@@ -126,5 +126,7 @@ impl ClientCursorsWithTimeToLive {
         }
     }
 
-    pub fn is_expired(&self, ttl: Duration) -> bool { self.last_updated.elapsed() > ttl }
+    pub fn is_expired(&self, ttl: Duration) -> bool {
+        self.last_updated.elapsed() > ttl
+    }
 }
diff --git a/sync-server/src/app_state/database/models.rs b/sync-server/src/app_state/database/models.rs
index 7796f627..24c0c370 100644
--- a/sync-server/src/app_state/database/models.rs
+++ b/sync-server/src/app_state/database/models.rs
@@ -23,7 +23,9 @@ pub struct StoredDocumentVersion {
 }
 
 impl PartialEq<Self> for StoredDocumentVersion {
-    fn eq(&self, other: &Self) -> bool { self.vault_update_id == other.vault_update_id }
+    fn eq(&self, other: &Self) -> bool {
+        self.vault_update_id == other.vault_update_id
+    }
 }
 
 #[derive(TS, Debug, Clone, Serialize)]
diff --git a/sync-server/src/server.rs b/sync-server/src/server.rs
index 3f659c97..cddcc1b5 100644
--- a/sync-server/src/server.rs
+++ b/sync-server/src/server.rs
@@ -179,6 +179,10 @@ async fn shutdown_signal() {
     }
 }
 
-async fn handle_404() -> impl IntoResponse { not_found_error(anyhow!("Page not found")) }
+async fn handle_404() -> impl IntoResponse {
+    not_found_error(anyhow!("Page not found"))
+}
 
-async fn handle_405() -> impl IntoResponse { client_error(anyhow!("Method not allowed")) }
+async fn handle_405() -> impl IntoResponse {
+    client_error(anyhow!("Method not allowed"))
+}
diff --git a/sync-server/src/server/device_id_header.rs b/sync-server/src/server/device_id_header.rs
index 4573e66c..af9d6413 100644
--- a/sync-server/src/server/device_id_header.rs
+++ b/sync-server/src/server/device_id_header.rs
@@ -6,7 +6,9 @@ pub struct DeviceIdHeader(pub String);
 pub static DEVICE_ID_HEADER_NAME: HeaderName = HeaderName::from_static("device-id");
 
 impl Header for DeviceIdHeader {
-    fn name() -> &'static HeaderName { &DEVICE_ID_HEADER_NAME }
+    fn name() -> &'static HeaderName {
+        &DEVICE_ID_HEADER_NAME
+    }
 
     fn decode<'i, I>(values: &mut I) -> Result<Self, headers::Error>
     where
diff --git a/sync-server/src/utils/normalize.rs b/sync-server/src/utils/normalize.rs
index adb83ac1..6553dd25 100644
--- a/sync-server/src/utils/normalize.rs
+++ b/sync-server/src/utils/normalize.rs
@@ -8,4 +8,6 @@ where
     Ok(normalize_string(&s))
 }
 
-pub fn normalize_string(s: &str) -> String { s.trim().to_lowercase() }
+pub fn normalize_string(s: &str) -> String {
+    s.trim().to_lowercase()
+}