Lint

sync-server/config-e2e.yml

@@ -9,24 +9,24 @@ server:
   max_clients_per_vault: 256
   response_timeout: 30m
   mergeable_file_extensions:
-  - md
-  - txt
+    - md
+    - txt
 users:
   user_configs:
-  - name: admin
-    token: test-token-change-me
-    vault_access:
-      type: allow_access_to_all
-  - name: other-admin
-    token: test-token-change-me2
-    vault_access:
-      type: allow_access_to_all
-  - name: test
-    token: other-test-token
-    vault_access:
-      type: allow_list
-      allowed:
-      - default
+    - name: admin
+      token: test-token-change-me
+      vault_access:
+        type: allow_access_to_all
+    - name: other-admin
+      token: test-token-change-me2
+      vault_access:
+        type: allow_access_to_all
+    - name: test
+      token: other-test-token
+      vault_access:
+        type: allow_list
+        allowed:
+          - default
 logging:
   log_directory: logs
   log_rotation: 7days

sync-server/src/server/update_document.rs

@@ -249,7 +249,7 @@ pub async fn merge_with_stored_version(
     };
 
     // We can only update the relative path if we're the first one to do so
-    let new_relative_path = if parent_document_path == &latest_version.relative_path
+    let new_relative_path = if parent_document_path == latest_version.relative_path
         && latest_version.relative_path != sanitized_relative_path
     {
         let new_path = find_first_available_path(

sync-server/src/utils/find_first_available_path.rs

@@ -1,7 +1,7 @@
 use crate::app_state::database::models::VaultId;
 use crate::{app_state::database::Transaction, utils::dedup_paths::dedup_paths};
 use anyhow::Result;
-use log::{debug, info};
+use log::info;
 
 pub async fn find_first_available_path(
     vault_id: &VaultId,