summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rwxr-xr-xbin/rustfmt-20184
-rw-r--r--emacs.d/init.el10
2 files changed, 12 insertions, 2 deletions
diff --git a/bin/rustfmt-2018 b/bin/rustfmt-2018
new file mode 100755
index 0000000..ec52655
--- /dev/null
+++ b/bin/rustfmt-2018
@@ -0,0 +1,4 @@
+#!/bin/sh
+
+set -eu
+rustfmt --edition 2018 "$@"
diff --git a/emacs.d/init.el b/emacs.d/init.el
index e4c09be..475b4e7 100644
--- a/emacs.d/init.el
+++ b/emacs.d/init.el
@@ -68,11 +68,12 @@
(use-package rust-mode
:config
- (setq-default rust-format-on-save t))
+ (setq-default rust-format-on-save t)
+ (setq-default rust-rustfmt-bin "~/liw-dot-files/bin/rustfmt-2018"))
(use-package flycheck
:config
- (setq-default flycheck-disabled-checkers '(ptyhon-pylint)))
+ (setq-default flycheck-disabled-checkers '(python-pylint)))
(use-package flycheck-rust)
@@ -121,6 +122,11 @@
(add-hook 'prog-mode-hook 'hl-line-mode)
+;; Key bindings
+
+(global-set-key (kbd "<f5>") 'compile)
+(global-set-key (kbd "C-<f5>") 'recompile)
+
(when (display-graphic-p)
(global-unset-key "\C-x\C-c")
(global-unset-key "\C-z")