From 26dd5ac15c85ee24fe2e0dcd219466b88f2f5d7b Mon Sep 17 00:00:00 2001
From: Brad Neuman <brad.neuman@bedrockrobotics.com>
Date: Mon, 13 May 2024 14:36:13 -0700
Subject: [PATCH 1/2] Adds a customization to default to workspace or local
 crate.

Adds rust-locate-project-in-workspace custom variable, which controls whether or not to locate the workspace
project using `--workspace` (the default) or not.

In cases where there is only one create, this should make no difference.

The default setting should match the existing behavior.

Github issue #545
---
 rust-cargo.el | 13 ++++++++++++-
 1 file changed, 12 insertions(+), 1 deletion(-)

diff --git a/rust-cargo.el b/rust-cargo.el
index bda23d8..613b861 100644
--- a/rust-cargo.el
+++ b/rust-cargo.el
@@ -19,6 +19,13 @@
   :type 'boolean
   :group 'rust-mode)
 
+(defcustom rust-locate-project-in-workspace t
+  "Whether to use `--workspace` with `cargo locate-project`. If t,
+ rust-mode will run commands for the entire workspace. If nil,
+ rust will search for the Cargo.toml in the local crated"
+  :type 'boolean
+  :group 'rust-mode)
+
 (defcustom rust-cargo-default-arguments ""
   "Default arguments when running common cargo commands."
   :type 'string
@@ -42,7 +49,11 @@
       (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")))
+      (let ((ret
+             (let ((args (list rust-cargo-bin nil (list (current-buffer) nil) nil "locate-project")))
+               (when rust-locate-project-in-workspace
+                 (setq args (append args (list "--workspace"))))
+                 (apply #'process-file args))))
         (when (/= ret 0)
           (error "`cargo locate-project' returned %s status: %s" ret (buffer-string)))
         (goto-char 0)

From ca4fafe0ddbaa1f0470524a7f0dc6d6587314254 Mon Sep 17 00:00:00 2001
From: Brad Neuman <brad.neuman@bedrockrobotics.com>
Date: Sun, 19 May 2024 16:25:49 -0700
Subject: [PATCH 2/2] Change implementation to use a list of default arguments

---
 rust-cargo.el | 20 +++++++++++---------
 1 file changed, 11 insertions(+), 9 deletions(-)

diff --git a/rust-cargo.el b/rust-cargo.el
index 613b861..e827d11 100644
--- a/rust-cargo.el
+++ b/rust-cargo.el
@@ -19,11 +19,11 @@
   :type 'boolean
   :group 'rust-mode)
 
-(defcustom rust-locate-project-in-workspace t
-  "Whether to use `--workspace` with `cargo locate-project`. If t,
- rust-mode will run commands for the entire workspace. If nil,
- rust will search for the Cargo.toml in the local crated"
-  :type 'boolean
+(defcustom rust-cargo-locate-default-arguments '("--workspace")
+  "Arguments for `cargo locate-project`. Remove `--workspace` if you
+would prefer to use the local crate Cargo.toml instead of the
+worksapce for commands like `cargo check`."
+  :type '(repeat string)
   :group 'rust-mode)
 
 (defcustom rust-cargo-default-arguments ""
@@ -50,10 +50,12 @@
       ;; Set PATH so we can find cargo.
       (setq-local exec-path path)
       (let ((ret
-             (let ((args (list rust-cargo-bin nil (list (current-buffer) nil) nil "locate-project")))
-               (when rust-locate-project-in-workspace
-                 (setq args (append args (list "--workspace"))))
-                 (apply #'process-file args))))
+             (let ((args
+                    (append
+                     (list rust-cargo-bin nil (list (current-buffer) nil) nil
+                           "locate-project")
+                     rust-cargo-locate-default-arguments)))
+               (apply #'process-file args))))
         (when (/= ret 0)
           (error "`cargo locate-project' returned %s status: %s" ret (buffer-string)))
         (goto-char 0)