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

Fix package-installed-p hack for rustic

Browse source
This commit is contained in:
Andrew Whatson 2019-09-20 21:49:44 +10:00
parent f03eb67314
commit 8e9d3fdc5d
1 changed files with 2 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -55,17 +55,12 @@
(add-hook 'rustic-mode-hook #'rainbow-delimiters-mode) (add-hook 'rustic-mode-hook #'rainbow-delimiters-mode)
(defadvice! +rust--dont-install-packages-p (orig-fn &rest args) (defadvice! +rust--dont-install-packages-p (orig-fn &rest args)
:override #'rustic-setup-rls :around #'rustic-setup-rls
(cl-letf (;; `rustic-setup-rls' uses `package-installed-p' unnecessarily, to (cl-letf (;; `rustic-setup-rls' uses `package-installed-p' unnecessarily, to
;; try to detect rls. This breaks because Doom lazy loads ;; try to detect rls. This breaks because Doom lazy loads
;; package.el, and doesn't use package.el to begin with. ;; package.el, and doesn't use package.el to begin with.
((symbol-function #'package-installed-p) ((symbol-function #'package-installed-p)
(symbol-function #'ignore)) (symbol-function #'identity)))
;; rustic really wants to manages its own dependencies. I wish it
;; wouldn't. Doom already does; we don't need its help.
((symbol-function #'rustic-install-rls-client-p)
(lambda (&rest _)
(message "No RLS server running."))))
(apply orig-fn args)))) (apply orig-fn args))))