diff options
| author | brotzeit <brotzeitmacher@gmail.com> | 2022-08-25 15:03:54 +0200 |
|---|---|---|
| committer | brotzeit <brotzeitmacher@gmail.com> | 2022-08-25 15:05:49 +0200 |
| commit | c91d4ddad81ced33bfaf54581f7fc2dc95e32b40 (patch) | |
| tree | 236ce54544a20c9435c8835ae1ce6643be34e198 /rust-cargo.el | |
| parent | 49709dceb64897f7ecff4d53abfceb2f60eb83d4 (diff) | |
| download | rust-mode-c91d4ddad81ced33bfaf54581f7fc2dc95e32b40.tar.gz | |
rust-buffer-project: don't use rust-buffer-crate when file-remote-p
Diffstat (limited to 'rust-cargo.el')
| -rw-r--r-- | rust-cargo.el | 38 |
1 files changed, 18 insertions, 20 deletions
diff --git a/rust-cargo.el b/rust-cargo.el index 75f9c16..cfbcd81 100644 --- a/rust-cargo.el +++ b/rust-cargo.el @@ -30,26 +30,24 @@ (defun rust-buffer-project () "Get project root if possible." - (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 (process-file rust-cargo-bin nil (list (current-buffer) nil) nil "locate-project" "--workspace"))) - (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)))))))) + ;; 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 (process-file rust-cargo-bin nil (list (current-buffer) nil) nil "locate-project" "--workspace"))) + (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'." |
