Merge pull request #449 from rust-lang/remote-crate-path

use rust-buffer-crate to get remote crate path
rust-lang · Jun 24, 2022 · 56e5c3a · 56e5c3a
2 parents af4aa18 3e73d67
commit 56e5c3a
Showing 1 changed file with 25 additions and 18 deletions.
diff --git a/rust-cargo.el b/rust-cargo.el
@@ -30,24 30,31 @@
 
 (defun rust-buffer-project ()
  "Get project root if possible."
- ;; Copy environment variables into the new buffer, since
- ;; with-temp-buffer will re-use the variables' defaults, even if
- ;; they have been changed in this variable using e.g. envrc-mode.
- ;; See https://github.com/purcell/envrc/issues/12.
- (let ((env process-environment)
- (path exec-path))
- (with-temp-buffer
- ;; Copy the entire environment just in case there's something we
- ;; don't know we need.
- (setq-local process-environment env)
- ;; Set PATH so we can find cargo.
- (setq-local exec-path path)
- (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)
- (let ((output (json-read)))
- (cdr (assoc-string "root" output)))))))
  (if (file-remote-p default-directory)
  (rust-buffer-crate)
  ;; Copy environment variables into the new buffer, since
  ;; with-temp-buffer will re-use the variables' defaults, even if
  ;; they have been changed in this variable using e.g. envrc-mode.
  ;; See https://github.com/purcell/envrc/issues/12.
  (let ((env process-environment)
  (path exec-path))
  (with-temp-buffer
  ;; Copy the entire environment just in case there's something we
  ;; don't know we need.
  (setq-local process-environment env)
  ;; Set PATH so we can find cargo.
  (setq-local exec-path path)
  (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)
  (let ((output (json-read)))
  (cdr (assoc-string "root" output))))))))
 
 (defun rust-buffer-crate ()
  "Try to locate Cargo.toml using `locate-dominating-file'."
  (let ((dir (locate-dominating-file default-directory "Cargo.toml")))
  (if dir dir default-directory)))
 
 (defun rust-update-buffer-project ()
  (setq-local rust-buffer-project (rust-buffer-project)))