From 72c479bd0d91befe9b2a77636c6b2731163ffcd6 Mon Sep 17 00:00:00 2001 From: Aankhen Date: Mon, 26 Jun 2017 16:14:27 +0530 Subject: Add `rust-run-clippy' and `rust-buffer-project' with testing paraphernalia. --- rust-mode.el | 37 ++++++++++++++++++++++++++++++++++++- 1 file changed, 36 insertions(+), 1 deletion(-) (limited to 'rust-mode.el') diff --git a/rust-mode.el b/rust-mode.el index f3f799c..0e18138 100644 --- a/rust-mode.el +++ b/rust-mode.el @@ -144,6 +144,12 @@ function or trait. When nil, where will be aligned with fn or trait." :type 'string :group 'rust-mode) +(defcustom rust-always-locate-project-on-open nil + "Whether to run `cargo locate-project' every time `rust-mode' + is activated." + :type 'boolean + :group 'rust-mode) + (defface rust-unsafe-face '((t :inherit font-lock-warning-face)) "Face for the `unsafe' keyword." @@ -1411,7 +1417,12 @@ This is written mainly to be used as `end-of-defun-function' for Rust." (setq-local compile-command "cargo build") - (add-hook 'before-save-hook 'rust--before-save-hook nil t)) + (add-hook 'before-save-hook 'rust--before-save-hook nil t) + + (setq-local rust-buffer-project nil) + + (when rust-always-locate-project-on-open + (rust-update-buffer-project))) ;;;###autoload (add-to-list 'auto-mode-alist '("\\.rs\\'" . rust-mode)) @@ -1548,6 +1559,30 @@ visit the new file." (rename-file filename new-name 1) (set-visited-file-name new-name)))))) +(defun rust-run-clippy () + "Run `cargo clippy'." + (interactive) + (when (null rust-buffer-project) + (rust-update-buffer-project)) + (let* ((args (list "cargo" "clippy" (concat "--manifest-path=" rust-buffer-project))) + ;; set `compile-command' temporarily so `compile' doesn't + ;; clobber the existing value + (compile-command (mapconcat #'shell-quote-argument args " "))) + (compile compile-command))) + +(defun rust-update-buffer-project () + (setq-local rust-buffer-project (rust-buffer-project))) + +(defun rust-buffer-project () + "Get project root if possible." + (with-temp-buffer + (let ((ret (call-process "cargo" nil t nil "locate-project"))) + (when (/= ret 0) + (error "`cargo locate-project' returned %s status: %s" ret (buffer-string))) + (goto-char 0) + (let ((output (json-read))) + (cdr (assoc-string "root" output)))))) + (provide 'rust-mode) ;;; rust-mode.el ends here -- cgit v1.2.3 From c00c8a935249d1cbd8b31c7bfd9656f743188172 Mon Sep 17 00:00:00 2001 From: Aankhen Date: Mon, 26 Jun 2017 16:41:24 +0530 Subject: Require `json'. --- rust-mode.el | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'rust-mode.el') diff --git a/rust-mode.el b/rust-mode.el index 0e18138..3d002f1 100644 --- a/rust-mode.el +++ b/rust-mode.el @@ -16,7 +16,8 @@ (eval-when-compile (require 'rx) (require 'compile) - (require 'url-vars)) + (require 'url-vars) + (require 'json)) (defvar electric-pair-inhibit-predicate) (defvar electric-indent-chars) -- cgit v1.2.3 From 9afe9972ca97eaa1fdeae86a691b2c448552843c Mon Sep 17 00:00:00 2001 From: Aankhen Date: Mon, 26 Jun 2017 18:22:55 +0530 Subject: Declare `rust-buffer-project' and require `json' at runtime. --- rust-mode.el | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) (limited to 'rust-mode.el') diff --git a/rust-mode.el b/rust-mode.el index 3d002f1..a1d98b0 100644 --- a/rust-mode.el +++ b/rust-mode.el @@ -16,12 +16,16 @@ (eval-when-compile (require 'rx) (require 'compile) - (require 'url-vars) - (require 'json)) + (require 'url-vars)) + +(require 'json) (defvar electric-pair-inhibit-predicate) (defvar electric-indent-chars) +(defvar rust-buffer-project) +(make-variable-buffer-local 'rust-buffer-project) + ;; for GNU Emacs < 24.3 (eval-when-compile (unless (fboundp 'setq-local) -- cgit v1.2.3 From b4077f8be2163b71b33a12932ef1013874646a9c Mon Sep 17 00:00:00 2001 From: Aankhen Date: Mon, 26 Jun 2017 18:37:52 +0530 Subject: Add `rust-cargo-bin' custom variable. --- rust-mode.el | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) (limited to 'rust-mode.el') diff --git a/rust-mode.el b/rust-mode.el index a1d98b0..2c58545 100644 --- a/rust-mode.el +++ b/rust-mode.el @@ -149,6 +149,11 @@ function or trait. When nil, where will be aligned with fn or trait." :type 'string :group 'rust-mode) +(defcustom rust-cargo-bin "cargo" + "Path to cargo executable." + :type 'string + :group 'rust-mode) + (defcustom rust-always-locate-project-on-open nil "Whether to run `cargo locate-project' every time `rust-mode' is activated." @@ -1569,7 +1574,7 @@ visit the new file." (interactive) (when (null rust-buffer-project) (rust-update-buffer-project)) - (let* ((args (list "cargo" "clippy" (concat "--manifest-path=" rust-buffer-project))) + (let* ((args (list rust-cargo-bin "clippy" (concat "--manifest-path=" rust-buffer-project))) ;; set `compile-command' temporarily so `compile' doesn't ;; clobber the existing value (compile-command (mapconcat #'shell-quote-argument args " "))) @@ -1581,7 +1586,7 @@ visit the new file." (defun rust-buffer-project () "Get project root if possible." (with-temp-buffer - (let ((ret (call-process "cargo" nil t nil "locate-project"))) + (let ((ret (call-process rust-cargo-bin nil t nil "locate-project"))) (when (/= ret 0) (error "`cargo locate-project' returned %s status: %s" ret (buffer-string))) (goto-char 0) -- cgit v1.2.3