Skip to content

Commit 7217513

Browse files
authored
Merge branch 'rust-lang:master' into master
2 parents b350adf + ae161dc commit 7217513

1 file changed

Lines changed: 4 additions & 2 deletions

File tree

rust-cargo.el

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,9 @@ worksapce for commands like `cargo check`."
6666
(goto-char 0)
6767
(let ((output (let ((json-object-type 'alist))
6868
(json-read))))
69-
(cdr (assoc-string "root" output)))))))
69+
(concat
70+
(file-remote-p default-directory)
71+
(cdr (assoc-string "root" output))))))))
7072

7173
(defun rust-buffer-crate ()
7274
"Try to locate Cargo.toml using `locate-dominating-file'."
@@ -148,7 +150,7 @@ If prefixed with `C-u`, pass additional arguments to the command (from a string
148150
(when (null rust-buffer-project)
149151
(rust-update-buffer-project))
150152
(let* ((args (append (list rust-cargo-bin "clippy"
151-
(concat "--manifest-path=" rust-buffer-project))
153+
(concat "--manifest-path=" (file-local-name rust-buffer-project)))
152154
rust-cargo-clippy-default-arguments))
153155
;; set `compile-command' temporarily so `compile' doesn't
154156
;; clobber the existing value

0 commit comments

Comments
 (0)