Merge pull request #5 from emacs-rustic/rerun-fix

Correctly handle directory on rerun

rustic-cargo.el

@@ -195,7 +195,8 @@ If ARG is not nil, use value as argument and store it in
 (defun rustic-cargo-test-rerun ()
   "Run 'cargo test' with `rustic-test-arguments'."
   (interactive)
-  (rustic-cargo-test-run rustic-test-arguments))
+  (let ((default-directory (or rustic-compilation-directory default-directory)))
+    (rustic-cargo-test-run rustic-test-arguments)))
 
 ;;;###autoload
 (defun rustic-cargo-current-test ()
@@ -619,7 +620,8 @@ When calling this function from `rustic-popup-mode', always use the value of
 (defun rustic-cargo-run-rerun ()
   "Run 'cargo run' with `rustic-run-arguments'."
   (interactive)
-  (rustic-cargo-run-command rustic-run-arguments))
+  (let ((default-directory (or rustic-compilation-directory default-directory)))
+    (rustic-cargo-run-command rustic-run-arguments)))
 
 (defun rustic--get-run-arguments ()
   "Helper utility for getting arguments related to 'examples' directory."

rustic-compile.el

@@ -209,6 +209,9 @@ Error matching regexes from compile.el are removed."
 
 ;;; Compilation Process
 
+(defvar-local rustic-compilation-directory nil
+  "original directory for rust compilation process.")
+
 (defvar rustic-compilation-process-name "rustic-compilation-process"
   "Process name for rust compilation processes.")
 
@@ -251,6 +254,7 @@ Set environment variables for rust process."
       (erase-buffer)
       (setq default-directory dir)
       (funcall mode)
+      (setq-local rustic-compilation-directory dir)
       (unless no-mode-line
         (setq mode-line-process
               '((:propertize ":%s" face compilation-mode-line-run)