2 files changed, 30 insertions, 2 deletions

diff --git a/Cargo.toml b/Cargo.toml
index 31a0560d9..e5620b1b7 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -10,5 +10,24 @@ debug = 0
 incremental = true
 debug = 0 # set this to 1 or 2 to get more useful backtraces in debugger
 
+# ideally, we would use `build-override` here, but some crates are also
+# needed at run-time and we end up compiling them twice
+[profile.release.package.proc-macro2]
+opt-level = 0
+[profile.release.package.quote]
+opt-level = 0
+[profile.release.package.syn]
+opt-level = 0
+[profile.release.package.serde_derive]
+opt-level = 0
+[profile.release.package.chalk-derive]
+opt-level = 0
+[profile.release.package.chalk-macros]
+opt-level = 0
+[profile.release.package.salsa-macros]
+opt-level = 0
+[profile.release.package.xtask]
+opt-level = 0
+
 [patch.'crates-io']
 # rowan = { path = "../rowan" }
diff --git a/editors/emacs/rust-analyzer.el b/editors/emacs/rust-analyzer.el
index 06db4f15f..9b426fcae 100644
--- a/editors/emacs/rust-analyzer.el
+++ b/editors/emacs/rust-analyzer.el
@@ -38,7 +38,9 @@
 
 (defconst rust-analyzer--action-handlers
   '(("rust-analyzer.applySourceChange" .
-     (lambda (p) (rust-analyzer--apply-source-change-command p)))))
+     (lambda (p) (rust-analyzer--apply-source-change-command p)))
+    ("rust-analyzer.selectAndApplySourceChange" .
+     (lambda (p) (rust-analyzer--select-and-apply-source-change-command p)))))
 
 (defun rust-analyzer--uri-filename (text-document)
   (lsp--uri-to-path (gethash "uri" text-document)))
@@ -71,6 +73,12 @@
   (let ((data (-> p (ht-get "arguments") (lsp-seq-first))))
     (rust-analyzer--apply-source-change data)))
 
+(defun rust-analyzer--select-and-apply-source-change-command (p)
+  (let* ((options (-> p (ht-get "arguments") (lsp-seq-first)))
+         (chosen-option (lsp--completing-read "Select option:" options
+                                              (-lambda ((&hash "label")) label))))
+    (rust-analyzer--apply-source-change chosen-option)))
+
 (lsp-register-client
  (make-lsp-client
   :new-connection (lsp-stdio-connection (lambda () rust-analyzer-command))
@@ -143,7 +151,8 @@
 
 (defun rust-analyzer-run (runnable)
   (interactive (list (rust-analyzer--select-runnable)))
-  (-let (((&hash "env" "bin" "args" "label") runnable))
+  (-let* (((&hash "env" "bin" "args" "label") runnable)
+          (compilation-environment (-map (-lambda ((k v)) (concat k "=" v)) (ht-items env))))
     (compilation-start
      (string-join (append (list bin) args '()) " ")
      ;; cargo-process-mode is nice, but try to work without it...