summary refs log tree commit diff
diff options
context:
space:
mode:
authorFranck Cuny <franck@fcuny.net>2022-10-17 19:09:40 -0700
committerFranck Cuny <franck@fcuny.net>2022-10-17 19:09:40 -0700
commit5a954c759fd56c06211a70da6021ae0225f9f5c2 (patch)
treef9954e995970ca52c2d846373121c053a6961aa3
parentRevert "ref(rust): delete the module" (diff)
downloademacs.d-5a954c759fd56c06211a70da6021ae0225f9f5c2.tar.gz
ref(rust): use eglot for lsp
Change-Id: I060a37e7baee14cf6051dcb5390b9b986e5d6968
-rw-r--r--emacs/custom/my-lang-rust.el10
-rw-r--r--emacs/init.el1
2 files changed, 2 insertions, 9 deletions
diff --git a/emacs/custom/my-lang-rust.el b/emacs/custom/my-lang-rust.el
index e6374a7..b0d3904 100644
--- a/emacs/custom/my-lang-rust.el
+++ b/emacs/custom/my-lang-rust.el
@@ -6,19 +6,11 @@
 ;;; Code:
 
 (require 'rustic)
-(require 'lsp-rust)
-
-(setq lsp-rust-analyzer-cargo-watch-enable t)
-(setq lsp-rust-analyzer-proc-macro-enable t)
-(setq lsp-rust-full-docs t)
-(setq lsp-rust-server 'rust-analyzer)
 
 (setq rustic-format-on-save t)
-(setq rustic-lsp-client 'lsp-mode)
+(setq rustic-lsp-client 'eglot)
 (setq rustic-lsp-server 'rust-analyzer)
 
-(add-hook 'rusti-mode-hook #'lsp-deferred)
-
 (provide 'my-lang-rust)
 
 ;;; my-lang-rust.el ends here
diff --git a/emacs/init.el b/emacs/init.el
index def8ac1..0b7f992 100644
--- a/emacs/init.el
+++ b/emacs/init.el
@@ -56,6 +56,7 @@
 (require 'my-lang-go)
 (require 'my-lang-nix)
 (require 'my-lang-python)
+(require 'my-lang-rust)
 
 (require 'my-buffers)
 (require 'my-git-extra)