From 8ce851475aa334a34b50202e22f2425e81cfd51f Mon Sep 17 00:00:00 2001 From: Michael Kirkland Date: Sat, 11 Jan 2025 11:59:18 +0100 Subject: [PATCH 1/2] Fix RUSTIC-CARGO-TEST To only use the last stored arguments if RUSTIC-CARGO-USE-LAST-STORED-ARGUMENTS is non-nil. Otherwise once we run only a single test (e.g via RUSTIC-CARGO-CURRENT-TEST), then trying to run all tests will still only run the last current test. --- rustic-cargo.el | 24 +++++++++++++++--------- 1 file changed, 15 insertions(+), 9 deletions(-) diff --git a/rustic-cargo.el b/rustic-cargo.el index c35a2fd..2cf7927 100644 --- a/rustic-cargo.el +++ b/rustic-cargo.el @@ -229,15 +229,21 @@ If ARG is not nil, use value as argument and store it in `rustic-popup-mode', always use the value of `rustic-test-arguments'." (interactive "P") - (when arg - (setq rustic-test-arguments - (read-from-minibuffer "Cargo test arguments: " - (rustic--populate-minibuffer - (list (rustic-cargo-package-argument) - rustic-test-arguments - rustic-cargo-build-arguments - rustic-default-test-arguments))))) - (rustic-cargo-test-run rustic-test-arguments)) + (rustic-cargo-test-run + (cond (arg + (setq rustic-test-arguments + (read-from-minibuffer "Cargo test arguments: " + (rustic--populate-minibuffer + (list (rustic-cargo-package-argument) + rustic-test-arguments + rustic-cargo-build-arguments + rustic-default-test-arguments))))) + (rustic-cargo-use-last-stored-arguments + (if (> (length rustic-test-arguments) 0) + rustic-test-arguments + rustic-default-test-arguments)) + (t + rustic-default-test-arguments)))) ;;;###autoload (defun rustic-cargo-test-rerun () From b88a7e3956b04c8a241b91e68086df68646685ab Mon Sep 17 00:00:00 2001 From: Michael Kirkland Date: Sun, 12 Jan 2025 11:56:17 +0100 Subject: [PATCH 2/2] Fix `rustic-cargo-test-test` To use `rustic-default-test-arguments`. This accompanies commit 8ce851475aa334a34b50202e22f2425e81cfd51f, fixing behaviour where even if `rustic-cargo-use-last-stored-arguments` is set to NIL, running `rustic-cargo-test` would still use the last stored arguments. --- test/rustic-cargo-test.el | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test/rustic-cargo-test.el b/test/rustic-cargo-test.el index 8d3cd82..18158ae 100644 --- a/test/rustic-cargo-test.el +++ b/test/rustic-cargo-test.el @@ -445,7 +445,7 @@ fn test() { (should (eq major-mode 'rustic-cargo-test-mode))) (should (string= (s-join " " (process-get proc 'command)) (s-trim (concat (rustic-cargo-bin) " test " - rustic-test-arguments)))))))) + rustic-default-test-arguments)))))))) (ert-deftest rustic-cargo-expand-test () (let* ((string "fn main() {()}")