Fix a few rust-analyzer customs (#3401)

emacs-lsp · Mar 12, 2022 · 3d2b852 · 3d2b852
1 parent 82433e6
commit 3d2b852
Showing 1 changed file with 11 additions and 7 deletions.
diff --git a/clients/lsp-rust.el b/clients/lsp-rust.el
@@ -188,12 +188,6 @@ the latest build duration."
   :group 'lsp-rust-rls
   :package-version '(lsp-mode . "6.1"))
 
-(defcustom lsp-rust-analyzer-cargo-target nil
-  "Compilation target (target triple)."
-  :type 'string
-  :group 'lsp-rust-rls
-  :package-version '(lsp-mode . "8.0.0"))
-
 (defcustom lsp-rust-no-default-features nil
   "Do not enable default Cargo features."
   :type 'boolean
@@ -378,6 +372,14 @@ PARAMS progress report notification data."
   :group 'lsp-rust-analyzer
   :package-version '(lsp-mode . "6.2.2"))
 
+(defcustom lsp-rust-analyzer-cargo-target nil
+  "Compilation target (target triple)."
+  :type '(choice
+          (string :tag "Target")
+          (const :tag "None" nil))
+  :group 'lsp-rust-analyzer
+  :package-version '(lsp-mode . "8.0.0"))
+
 (defcustom lsp-rust-analyzer-cargo-watch-enable t
   "Enable Cargo watch."
   :type 'boolean
@@ -616,7 +618,9 @@ https://rust-analyzer.github.io/manual.html#auto-import.
 
 (defcustom lsp-rust-analyzer-rustc-source nil
   "Path to the Cargo.toml of the rust compiler workspace."
-  :type 'string
+  :type '(choice
+          (file :tag "Path")
+          (const :tag "None" nil))
   :group 'lsp-rust-analyzer
   :package-version '(lsp-mode . "8.0.0"))