From bf0a797a36f00a4119e69bc4672708367a560691 Mon Sep 17 00:00:00 2001 From: Henrik Lissner Date: Sun, 1 Dec 2019 22:57:13 -0500 Subject: [PATCH] lang/rust: rustic-format-on-save -> rustic-format-trigger The former is deprecated for the latter. --- modules/lang/rust/config.el | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/modules/lang/rust/config.el b/modules/lang/rust/config.el index b11bab2ee..4ef184795 100644 --- a/modules/lang/rust/config.el +++ b/modules/lang/rust/config.el @@ -11,24 +11,24 @@ :mode ("\\.rs$" . rustic-mode) :commands rustic-run-cargo-command rustic-cargo-outdated :preface - (setq rustic-rls-pkg (if (featurep! +lsp) 'lsp-mode)) + (setq rustic-rls-pkg (if (featurep! +lsp) 'lsp-mode) + ;; `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). This is already handled + ;; by the :tools lsp module, so... + rustic-lsp-setup-p nil) :config (set-docsets! 'rustic-mode "Rust") (setq rustic-indent-method-chain t rustic-flycheck-setup-mode-line-p nil ;; use :editor format instead - rustic-format-on-save nil + rustic-format-trigger nil ;; REVIEW `rust-ordinary-lt-gt-p' is terribly expensive in large rust ;; 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)) - ;; `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). This is already handled - ;; by the :tools lsp module, so... - rustic-lsp-setup-p nil) + rustic-match-angle-brackets (not (featurep! :editor evil))) (add-hook 'rustic-mode-hook #'rainbow-delimiters-mode)