Update tree sitter deps to 0.23 (#1091)

* Update tree-sitter to 0.23 * Use forked tree-sitter-toml * Fix clippy * Fixes
liuchengxu · Sep 22, 2024 · 3ca64d5 · 3ca64d5
1 parent 3e8d001
commit 3ca64d5
Show file tree

Hide file tree

Showing 7 changed files with 173 additions and 117 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/crates/maple_core/src/stdio_server/provider/hooks/on_move.rs b/crates/maple_core/src/stdio_server/provider/hooks/on_move.rs
@@ -445,18 +445,12 @@ impl<'a> CachedPreviewImpl<'a> {
                     self.max_line_width(),
                     max_fname_len,
                 )
-                .map_err(|e| {
-                    handle_io_error(&e);
-                    e
-                })?
+                .inspect_err(handle_io_error)?
             }
             _ => {
                 let (lines, abs_path) =
                     previewer::preview_file(path, self.preview_height, self.max_line_width())
-                        .map_err(|e| {
-                            handle_io_error(&e);
-                            e
-                        })?;
+                        .inspect_err(handle_io_error)?;
                 // cwd is shown via the popup title, no need to include it again.
                 let cwd_relative = abs_path.replacen(self.ctx.cwd.as_str(), ".", 1);
                 let mut lines = lines;

diff --git a/crates/maple_core/src/stdio_server/vim.rs b/crates/maple_core/src/stdio_server/vim.rs
@@ -49,7 +49,7 @@ static EXTENSION_TO_FILETYPE_MAP: OnceCell<HashMap<String, String>> = OnceCell::
 
 pub fn initialize_filetype_map(output: &str) -> HashMap<&str, &str> {
     let ext_map: HashMap<&str, &str> = output
-        .split(|x| x == '\n')
+        .split('\n')
         // Only process the normal cases.
         .filter(|s| s.contains("setf"))
         .filter_map(|s| {

diff --git a/crates/maple_core/src/tools/ctags/mod.rs b/crates/maple_core/src/tools/ctags/mod.rs
@@ -309,9 +309,8 @@ impl ProjectCtagsCommand {
     #[allow(unused)]
     fn create_cache(&self) -> Result<(usize, PathBuf)> {
         let mut total = 0usize;
-        let mut formatted_tags_iter = self.formatted_tags_iter()?.map(|x| {
+        let mut formatted_tags_iter = self.formatted_tags_iter()?.inspect(|_x| {
             total += 1;
-            x
         });
         let lines = formatted_tags_iter.join("\n");