feat: Bump rust edition to 2024 and dependencies (#58)

Author: asharkhan3101

Cargo.lock

@@ -2,7 +2,7 @@
 name = "protols"
 description = "Language server for proto3 files"
 version = "0.10.0"
-edition = "2021"
+edition = "2024"
 license = "MIT"
 homepage = "https://github.com/coder3101/protols"
 repository = "https://github.com/coder3101/protols"
@@ -16,10 +16,10 @@ async-lsp = { version = "0.2.0", features = ["tokio"] }
 futures = "0.3.30"
 tokio = { version = "1.38.0", features = ["time", "full"] }
 tokio-util = { version = "0.7.11", features = ["compat"] }
-tower = "0.4.13"
+tower = "0.5.2"
 tracing = "0.1.40"
 tracing-subscriber = "0.3.18"
-tree-sitter = "0.24.3"
+tree-sitter = "0.25.2"
 tracing-appender = "0.2.3"
 tree-sitter-proto = "0.2.0"
 walkdir = "2.5.0"

Cargo.toml

@@ -104,7 +104,7 @@ mod test {
     use insta::assert_yaml_snapshot;
     use tempfile::tempdir;
 
-    use super::{WorkspaceProtoConfigs, CONFIG_FILE_NAMES};
+    use super::{CONFIG_FILE_NAMES, WorkspaceProtoConfigs};
 
     #[test]
     fn test_get_for_workspace() {

src/config/workspace.rs

@@ -10,7 +10,7 @@ use std::{
 use async_lsp::lsp_types::{Position, Range, TextEdit};
 use hard_xml::XmlRead;
 use serde::Serialize;
-use tempfile::{tempdir, TempDir};
+use tempfile::{TempDir, tempdir};
 
 use super::ProtoFormatter;
 

src/formatter/clang.rs

@@ -177,12 +177,13 @@ mod test {
         assert!(parsed.is_some());
         let tree = parsed.unwrap();
 
-        let rename_fn = |nt: &str, pos: &Position| {
-            if let Some(k) = tree.rename_tree(pos, nt, contents) {
+        let rename_fn = |nt: &str, pos: &Position| match tree.rename_tree(pos, nt, contents) {
+            Some(k) => {
                 let mut v = tree.rename_field(&k.1, &k.2, contents);
                 v.extend(k.0);
                 v
-            } else {
+            }
+            _ => {
                 vec![]
             }
         };
@@ -213,12 +214,13 @@ mod test {
         assert!(parsed.is_some());
         let tree = parsed.unwrap();
 
-        let reference_fn = |pos: &Position| {
-            if let Some(k) = tree.reference_tree(pos, contents) {
+        let reference_fn = |pos: &Position| match tree.reference_tree(pos, contents) {
+            Some(k) => {
                 let mut v = tree.reference_field(&k.1, contents);
                 v.extend(k.0);
                 v
-            } else {
+            }
+            _ => {
                 vec![]
             }
         };

src/parser/rename.rs

@@ -1,7 +1,7 @@
 use async_lsp::{
+    ClientSocket, LanguageClient,
     lsp_types::{NumberOrString, ProgressParams, ProgressParamsValue},
     router::Router,
-    ClientSocket, LanguageClient,
 };
 use std::{
     ops::ControlFlow,

src/server.rs

@@ -98,10 +98,12 @@ mod test {
         );
 
         assert_eq!(loc.len(), 1);
-        assert!(loc[0]
-            .uri
-            .to_file_path()
-            .unwrap()
-            .ends_with(ipath[0].join("c.proto")))
+        assert!(
+            loc[0]
+                .uri
+                .to_file_path()
+                .unwrap()
+                .ends_with(ipath[0].join("c.proto"))
+        )
     }
 }

src/workspace/definition.rs

@@ -597,10 +597,9 @@ impl ProtoLanguageState {
         let v = match hv {
             Hoverables::FieldType(field) => {
                 // Type is a builtin
-                if let Some(docs) = BUITIN_DOCS.get(field.as_str()) {
-                    docs.to_string()
-                } else {
-                    String::new()
+                match BUITIN_DOCS.get(field.as_str()) {
+                    Some(docs) => docs.to_string(),
+                    _ => String::new(),
                 }
             }
             Hoverables::ImportPath(path) => {

src/workspace/hover.rs

@@ -51,11 +51,7 @@ impl ProtoLanguageState {
                 v.extend(tree.reference_field(&old, content.as_str()));
                 v
             });
-        if r.is_empty() {
-            None
-        } else {
-            Some(r)
-        }
+        if r.is_empty() { None } else { Some(r) }
     }
 }