diff --git a/modules/lang/rust/README.org b/modules/lang/rust/README.org index 0abdb7be1..4b31c8c9a 100644 --- a/modules/lang/rust/README.org +++ b/modules/lang/rust/README.org @@ -78,7 +78,7 @@ You'll need [[https://github.com/rust-analyzer/rust-analyzer][rust-analyzer]] in #+BEGIN_SRC elisp ;; in $DOOMDIR/config.el -(setq lsp-rust-server 'rust-analyzer) +(setq rustic-lsp-server 'rust-analyzer) #+END_SRC ** Enabling elgot support for Rust diff --git a/modules/lang/rust/config.el b/modules/lang/rust/config.el index 1435d7c1a..0fb0bcc5e 100644 --- a/modules/lang/rust/config.el +++ b/modules/lang/rust/config.el @@ -21,15 +21,13 @@ ;; buffers, so we disable it, but only for evil users, because it ;; affects `forward-sexp' and its ilk. See ;; https://github.com/rust-lang/rust-mode/issues/288. - rustic-match-angle-brackets (not (featurep! :editor evil)) - ;; We use the superior default client provided by `lsp-mode', not the - ;; one rustic-mode sets up for us. - rustic-lsp-client nil) + rustic-match-angle-brackets (not (featurep! :editor evil))) (add-hook 'rustic-mode-hook #'rainbow-delimiters-mode) (if (featurep! +lsp) (add-hook 'rustic-mode-local-vars-hook #'lsp!) + (setq rustic-lsp-server nil) (after! rustic-flycheck (add-to-list 'flycheck-checkers 'rustic-clippy))) @@ -51,7 +49,8 @@ :desc "current test" "t" #'rustic-cargo-current-test)) ;; If lsp/elgot isn't available, it attempts to install lsp-mode via - ;; package.el. Doom manages its own dependencies so we disable that behavior. + ;; package.el. Doom manages its own dependencies through straight so disable + ;; this behavior to avoid package-not-initialized errors. (defadvice! +rust--dont-install-packages-p (&rest _) :override #'rustic-install-lsp-client-p (message "No LSP server running"))) diff --git a/modules/lang/rust/packages.el b/modules/lang/rust/packages.el index d20e289fe..3b640d7ca 100644 --- a/modules/lang/rust/packages.el +++ b/modules/lang/rust/packages.el @@ -1,6 +1,6 @@ ;; -*- no-byte-compile: t; -*- ;;; lang/rust/packages.el -(package! rustic :pin "da3820de18") +(package! rustic :pin "6dead0cdd4") (unless (featurep! +lsp) (package! racer :pin "a0bdf778f0"))