From f1da0080b69c8073ca42d91a62afd3dce19086a6 Mon Sep 17 00:00:00 2001 From: Julio Rincon Date: Mon, 11 Apr 2022 07:45:05 +1000 Subject: [PATCH] Fix #130 prevent Cargo metadata warnings from breaking everything --- cargo-process.el | 26 +++++++++++++++++++++----- 1 file changed, 21 insertions(+), 5 deletions(-) diff --git a/cargo-process.el b/cargo-process.el index f73f20d..1a1385f 100644 --- a/cargo-process.el +++ b/cargo-process.el @@ -336,12 +336,28 @@ If FILE-NAME is not a TRAMP file, return it unmodified." (nth 6 (tramp-dissect-file-name file-name)) file-name)) +(defun cargo-process--call-process-to-string (command &rest ARGS) + "Executes `command` and returns its output(std out) as string." + (let* ((err-file (make-temp-file "cargo-error")) + (output (with-output-to-string + (with-current-buffer + standard-output + (apply #'call-process command nil (list t err-file) nil ARGS)))) + (std-err (with-output-to-string + (with-current-buffer + standard-output + (insert-file-contents err-file))))) + (when (length std-err) + (message "cargo-stderr: %s" std-err)) + (delete-file err-file) + output)) + (defun cargo-process--workspace-root () "Find the workspace root using `cargo metadata`." (when (cargo-process--project-root) - (let* ((metadata-text (shell-command-to-string - (concat (shell-quote-argument cargo-process--custom-path-to-bin) - " metadata --format-version 1 --no-deps"))) + (let* ((metadata-text (cargo-process--call-process-to-string + cargo-process--custom-path-to-bin + "metadata" "--format-version" "1" "--no-deps")) (metadata-json (cargo-json-read-from-string metadata-text)) (tramp-prefix (cargo-process--tramp-file-name-prefix (cargo-process--project-root))) (workspace-root (concat tramp-prefix @@ -406,8 +422,8 @@ Returns the created process." (with-current-buffer (get-buffer-create "*rust errno*") (let ((buffer-read-only nil)) (erase-buffer) - (insert (shell-command-to-string - (concat cargo-process--rustc-cmd " --explain=" errno)))) + (insert (cargo-process--call-process-to-string + cargo-process--rustc-cmd "--explain" errno))) (markdown-view-mode) (setq-local markdown-fontify-code-blocks-natively t) (setq-local markdown-fontify-code-block-default-mode 'rust-mode)