Bump to brotzeit/rustic@c7cab3f
My rust advice can be simplified thanks to brotzeit/rustic#87 being merged.
This commit is contained in:
parent
fe0c5e135d
commit
c5d6e6267c
2 changed files with 6 additions and 16 deletions
|
@ -48,21 +48,11 @@
|
||||||
:desc "all" "a" #'rustic-cargo-test
|
:desc "all" "a" #'rustic-cargo-test
|
||||||
:desc "current test" "t" #'rustic-cargo-current-test))
|
:desc "current test" "t" #'rustic-cargo-current-test))
|
||||||
|
|
||||||
(defadvice! +rust--dont-install-packages-p (orig-fn &rest args)
|
;; If lsp/elgot isn't available, it attempts to install lsp-mode via
|
||||||
:around #'rustic-setup-lsp
|
;; package.el. Doom manages its own dependencies so we disable that behavior.
|
||||||
(cl-letf (;; `rustic-setup-lsp' uses `package-installed-p' to determine if
|
(defadvice! +rust--dont-install-packages-p (&rest _)
|
||||||
;; lsp-mode/elgot are available. This breaks because Doom doesn't
|
:override #'rustic-install-lsp-client-p
|
||||||
;; use package.el to begin with (and lazy loads it).
|
(message "No LSP server running")))
|
||||||
((symbol-function #'package-installed-p)
|
|
||||||
(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-lsp-client-p)
|
|
||||||
(lambda (&rest _)
|
|
||||||
(message "No LSP server running"))))
|
|
||||||
(apply orig-fn args))))
|
|
||||||
|
|
||||||
|
|
||||||
(use-package! racer
|
(use-package! racer
|
||||||
|
|
|
@ -1,6 +1,6 @@
|
||||||
;; -*- no-byte-compile: t; -*-
|
;; -*- no-byte-compile: t; -*-
|
||||||
;;; lang/rust/packages.el
|
;;; lang/rust/packages.el
|
||||||
|
|
||||||
(package! rustic :pin "a6b8cd8db8")
|
(package! rustic :pin "c7cab3fbe6")
|
||||||
(unless (featurep! +lsp)
|
(unless (featurep! +lsp)
|
||||||
(package! racer :pin "a0bdf778f0"))
|
(package! racer :pin "a0bdf778f0"))
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue