emenel/doomemacs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge pull request #1804 from flatwhatson/fix-rust

Browse source 
Fix package-installed-p hack for rustic
This commit is contained in:
Henrik Lissner 2019-09-20 14:50:15 -04:00 • committed by GitHub
commit 8c3b73f3da
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 9 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

16
modules/lang/rust/config.el
View file

@ -55,14 +55,16 @@
(add-hook 'rustic-mode-hook #'rainbow-delimiters-mode)
(defadvice! +rust--dont-install-packages-p (orig-fn &rest args)
:override #'rustic-setup-rls
(cl-letf (;; `rustic-setup-rls' uses `package-installed-p' unnecessarily, to
;; try to detect rls. This breaks because Doom lazy loads
;; package.el, and doesn't use package.el to begin with.
:around #'rustic-setup-rls
(cl-letf (;; `rustic-setup-rls' uses `package-installed-p' to determine if
;; lsp-mode/elgot are available. This breaks because Doom doesn't
;; use package.el to begin with (and lazy loads it).
((symbol-function #'package-installed-p)
(symbol-function #'ignore))
;; rustic really wants to manages its own dependencies. I wish it
;; wouldn't. Doom already does; we don't need its help.
(lambda (pkg)
(require pkg nil t)))
;; 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.
((symbol-function #'rustic-install-rls-client-p)
(lambda (&rest _)
(message "No RLS server running."))))