summaryrefslogtreecommitdiffhomepage
path: root/custom/jao-custom-programming.el
diff options
context:
space:
mode:
Diffstat (limited to 'custom/jao-custom-programming.el')
-rw-r--r--custom/jao-custom-programming.el13
1 files changed, 6 insertions, 7 deletions
diff --git a/custom/jao-custom-programming.el b/custom/jao-custom-programming.el
index 3f17c1a..cbc7d4f 100644
--- a/custom/jao-custom-programming.el
+++ b/custom/jao-custom-programming.el
@@ -308,11 +308,9 @@
(use-package rust-mode
:ensure t
- :demand t
:hook (rust-mode . jao-rust-mode-hook)
- :init
- (setq rust-mode-treesitter-derive nil)
:config
+ (setq rust-mode-treesitter-derive t)
(use-package smartparens-rust :demand t)
(defun jao-rust-mode-hook ()
@@ -329,20 +327,21 @@
(use-package rustic
:ensure t
- :demand t
- :init
+ :after (rust-mode)
+ :config
(setq rustic-format-on-save nil
rustic-lsp-client 'eglot) ;; 'lsp-mode 'eglot nil
- :config
(jao-define-attached-buffer '(major-mode . rustic-compilation-mode) 25)
:custom
(rustic-cargo-use-last-stored-arguments nil)
(rustic-analyzer-command '("rust-analyzer"))
(rustic-cargo-test-runner 'nextest)
(rustic-cargo-nextest-exec-command '("nextest" "run" "--color=never" "--show-progress=none"))
- :bind (:map rustic-mode-map (("C-c d" . rustic-cargo-build-doc)
+ :bind (:map rustic-mode-map (("C-c d" . jao-rust-build-doc)
+ ("C-c t g" . jao-rust-goto-tests)
("C-c t w" . jao-rust-test-workspace)
("C-c t m" . jao-rust-test-module)
+ ("C-c t r" . jao-rust-retest)
("C-c t t" . jao-rust-test-current))))
(use-package rust-playground