Skip to content

Fix RUSTIC-CARGO-TEST #74

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Jan 12, 2025
Merged

Fix RUSTIC-CARGO-TEST #74

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
8ce8514
Fix RUSTIC-CARGO-TEST
mak-kirkland Jan 11, 2025
b88a7e3
Fix `rustic-cargo-test-test`
mak-kirkland Jan 12, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
24 changes: 15 additions & 9 deletions rustic-cargo.el
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 ()
Expand Down
2 changes: 1 addition & 1 deletion test/rustic-cargo-test.el
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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() {()}")
Expand Down
Loading