From df8a84448e93ee27eac5ab8503c752c6646c9f78 Mon Sep 17 00:00:00 2001
From: Maciej Szlosarczyk <maciej@sosek.net>
Date: Sun, 9 Aug 2020 18:29:03 +0300
Subject: [PATCH] Reconfigure rust mode

---
 05lsp.el          |  3 +--
 init.el           |  2 +-
 languages/rust.el | 18 ++++++++++++++++--
 3 files changed, 18 insertions(+), 5 deletions(-)

diff --git a/05lsp.el b/05lsp.el
index 17e44ee..59588fc 100644
--- a/05lsp.el
+++ b/05lsp.el
@@ -8,14 +8,13 @@
   :defer t
   :requires (company)
   :config (setq-default lsp-file-watch-threshold 10000
-                        lsp-restart 'auto-restart
+                        lsp-restart 'interactive
                         lsp-prefer-capf t
                         lsp-server-trace t
                         read-process-output-max (* 1024 1024)
                         lsp-enable-file-watchers nil)
   :hook ((typescript-mode . lsp-deferred)
          (elixir-mode . lsp)
-         (rust-mode . lsp)
          (js2-mode . lsp-deferred)))
 
 (use-package lsp-ui
diff --git a/init.el b/init.el
index 9d63783..4aa09d9 100644
--- a/init.el
+++ b/init.el
@@ -59,7 +59,7 @@
  ;; If there is more than one, they won't work right.
  '(package-selected-packages
    (quote
-    (dante haskell-mode dune which-key erlang gitignore-mode yaml-mode nginx-mode ansible terraform-mode dockerfile-mode reason-mode merlin tuareg clj-refactor cider clojure-mode elixir-mode js2-mode web-mode enh-ruby-mode ruby-end rspec-mode planet-theme flatui-theme base16-theme smart-mode-line lsp-ui lsp-mode deft counsel-projectile flycheck company yasnippet-snippets yasnippet visual-regexp column-enforce-mode dash-at-point rainbow-mode rainbow-delimiters magit hydra counsel keyfreq exec-path-from-shell buffer-move use-package)))
+    (racer racer-mode flycheck-rust rust-mode dante haskell-mode dune which-key erlang gitignore-mode yaml-mode nginx-mode ansible terraform-mode dockerfile-mode reason-mode merlin tuareg clj-refactor cider clojure-mode elixir-mode js2-mode web-mode enh-ruby-mode ruby-end rspec-mode planet-theme flatui-theme base16-theme smart-mode-line lsp-ui lsp-mode deft counsel-projectile flycheck company yasnippet-snippets yasnippet visual-regexp column-enforce-mode dash-at-point rainbow-mode rainbow-delimiters magit hydra counsel keyfreq exec-path-from-shell buffer-move use-package)))
  '(safe-local-variable-values
    (quote
     ((haskell-process-use-ghci . t)
diff --git a/languages/rust.el b/languages/rust.el
index e6698c6..aaf2648 100644
--- a/languages/rust.el
+++ b/languages/rust.el
@@ -5,6 +5,20 @@
 (require '05prog-mode "$HOME/.emacs.d/05prog-mode.el")
 (require '05flycheck "$HOME/.emacs.d/05flycheck.el")
 
+(use-package rust-mode
+  :ensure t
+  :defer t)
+
+(use-package flycheck-rust
+  :ensure t
+  :defer t
+  :requires (rust-mode))
+
+(use-package racer
+  :ensure t
+  :defer t
+  :requires (rust-mode))
+
 (defun activate-rust-mode ()
   "All things for Rust mode."
   (interactive)
@@ -13,11 +27,11 @@
 
   ;; Company list override
   (add-to-list (make-local-variable 'company-backends)
-               '(company-capf company-yasnippet))
-  )
+               '(company-capf company-yasnippet)))
 
 (add-hook 'rust-mode-hook 'activate-rust-mode)
 (add-hook 'rust-mode-hook 'flycheck-rust-setup)
+(add-hook 'rust-mode-hook 'racer-mode)
 
 (provide 'languages/rust)
 ;;; rust.el ends here