Skip to content

Commit 1a38bb4

Browse files
authored
Merge pull request #74 from SiberzK/fix-rustic-cargo-test
Fix RUSTIC-CARGO-TEST
2 parents e5c0271 + b88a7e3 commit 1a38bb4

File tree

2 files changed

+16
-10
lines changed

2 files changed

+16
-10
lines changed

rustic-cargo.el

Lines changed: 15 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -229,15 +229,21 @@ If ARG is not nil, use value as argument and store it in
229229
`rustic-popup-mode', always use the value of
230230
`rustic-test-arguments'."
231231
(interactive "P")
232-
(when arg
233-
(setq rustic-test-arguments
234-
(read-from-minibuffer "Cargo test arguments: "
235-
(rustic--populate-minibuffer
236-
(list (rustic-cargo-package-argument)
237-
rustic-test-arguments
238-
rustic-cargo-build-arguments
239-
rustic-default-test-arguments)))))
240-
(rustic-cargo-test-run rustic-test-arguments))
232+
(rustic-cargo-test-run
233+
(cond (arg
234+
(setq rustic-test-arguments
235+
(read-from-minibuffer "Cargo test arguments: "
236+
(rustic--populate-minibuffer
237+
(list (rustic-cargo-package-argument)
238+
rustic-test-arguments
239+
rustic-cargo-build-arguments
240+
rustic-default-test-arguments)))))
241+
(rustic-cargo-use-last-stored-arguments
242+
(if (> (length rustic-test-arguments) 0)
243+
rustic-test-arguments
244+
rustic-default-test-arguments))
245+
(t
246+
rustic-default-test-arguments))))
241247

242248
;;;###autoload
243249
(defun rustic-cargo-test-rerun ()

test/rustic-cargo-test.el

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -445,7 +445,7 @@ fn test() {
445445
(should (eq major-mode 'rustic-cargo-test-mode)))
446446
(should (string= (s-join " " (process-get proc 'command))
447447
(s-trim (concat (rustic-cargo-bin) " test "
448-
rustic-test-arguments))))))))
448+
rustic-default-test-arguments))))))))
449449

450450
(ert-deftest rustic-cargo-expand-test ()
451451
(let* ((string "fn main() {()}")

0 commit comments

Comments
 (0)