From d7c382582d37a32adde0821b9afed3d0170aa926 Mon Sep 17 00:00:00 2001 From: Sibi Prabakaran Date: Sat, 24 Feb 2024 17:45:00 +0530 Subject: [PATCH 1/2] Update changelog --- Changelog.md | 4 ++++ 1 file changed, 4 insertions(+) create mode 100644 Changelog.md diff --git a/Changelog.md b/Changelog.md new file mode 100644 index 0000000..a506866 --- /dev/null +++ b/Changelog.md @@ -0,0 +1,4 @@ +# Unreleased + +- Add support for treesitter mode. +- Fix warnings resulting from rust-utils.el. [Fixes #509](https://github.com/rust-lang/rust-mode/issues/509). From 2f58eee672ac467d333cf336a38cda859e4fcfd2 Mon Sep 17 00:00:00 2001 From: Sibi Prabakaran Date: Sat, 24 Feb 2024 17:49:03 +0530 Subject: [PATCH 2/2] Fix warnings from rust-utils.el --- rust-utils.el | 38 +++++++++++++++++++------------------- 1 file changed, 19 insertions(+), 19 deletions(-) diff --git a/rust-utils.el b/rust-utils.el index cb55172..d93bd0a 100644 --- a/rust-utils.el +++ b/rust-utils.el @@ -41,22 +41,22 @@ visit the new file." if not. Move cursor to the end of macro." (when (rust-in-str) (up-list -1 t t)) - (setq safe-to-forward t) - (save-excursion - (condition-case nil - (forward-sexp) - (error (setq safe-to-forward nil) - nil))) - (cond - ((not safe-to-forward) - (rust-insert-dbg-alone)) - (t - (insert "(") - (forward-sexp) - (insert ")") - (backward-sexp) - (insert "dbg!") - (forward-sexp)))) + (let ((safe-to-forward t)) + (save-excursion + (condition-case nil + (forward-sexp) + (error (setq safe-to-forward nil) + nil))) + (cond + ((not safe-to-forward) + (rust-insert-dbg-alone)) + (t + (insert "(") + (forward-sexp) + (insert ")") + (backward-sexp) + (insert "dbg!") + (forward-sexp))))) (defun rust-insert-dbg-region () "Insert the dbg! macro around a region. Move cursor to the end of macro." @@ -77,9 +77,9 @@ if not. Move cursor to the end of macro." (defun rust-dbg-wrap-or-unwrap () "Either remove or add the dbg! macro." (interactive) - + (cond - + ;; region ((region-active-p) (rust-insert-dbg-region)) @@ -106,7 +106,7 @@ if not. Move cursor to the end of macro." (delete-pair)) (t (rust-insert-dbg-sexp))))) ) -) + ) (defun rust-toggle-mutability () "Toggles the mutability of the variable defined on the current line"