|
7 | 7 | (require 'orary-braces)
|
8 | 8 | (require 'orary-functions)
|
9 | 9 |
|
10 |
| -(use-package cargo) ;; Build tool wrapper |
| 10 | +;; (use-package cargo) |
| 11 | +;; Build tool wrapper |
11 | 12 | ;; NOTE[rdonaldson|2023-04-29] I *think* LSP fully replaces racer.
|
12 | 13 | ;;
|
13 | 14 | ;; (use-package racer) ;; Symbol completion, introspection
|
|
77 | 78 | ;; The Business
|
78 | 79 | (use-package rustic
|
79 | 80 | :config
|
80 |
| - (setq cargo-process--command-clippy "clippy" |
81 |
| - ;; NOTE[rdonaldson|2023-04-23] Dear future Ross: you are gonna think |
| 81 | + (setq ;; NOTE[rdonaldson|2023-04-23] Dear future Ross: you are gonna think |
82 | 82 | ;; this is a good idea, but you are wrong. With LSP, there's some
|
83 | 83 | ;; interaction between LSP and rust-analyzer and format on save that
|
84 | 84 | ;; ruins *everything*. Don't turn this back on until you get that sorted
|
|
87 | 87 | ;; rust-format-on-save t
|
88 | 88 | lsp-rust-analyzer-cargo-watch-command "clippy"
|
89 | 89 | )
|
90 |
| - (add-hook 'rust-mode-hook |
| 90 | + (add-hook 'rustic-mode-hook |
91 | 91 | (lambda ()
|
92 | 92 | (cargo-minor-mode +1)
|
93 | 93 | (subword-mode +1)
|
94 |
| - (lsp) |
| 94 | + (lsp-deferred) |
95 | 95 | (flycheck-add-next-checker 'lsp 'rust-clippy)
|
96 | 96 | (setq comment-start "//")))
|
97 |
| - |
98 |
| - ;; NOTE[rdonaldson|2023-04-29] I think LSP fully replaces racer. |
99 |
| - ;; |
100 |
| - ;; (add-hook 'racer-mode-hook #'eldoc-mode) |
101 |
| - ;; (add-hook 'racer-mode-hook #'company-mode) |
102 | 97 |
|
103 |
| - :bind (:map rust-mode-map |
104 |
| - ("C-c C-c" . #'rust-compile) |
| 98 | + :bind (:map rustic-mode-map |
105 | 99 | ("<C-return>" . #'orary/rust-ret-dwim)
|
106 | 100 | ("C-o" . #'orary/braces-open-newline)
|
107 | 101 | ("-" . #'orary/rust-insert-arrow))
|
|
0 commit comments