branch: elpa/rust-mode
commit b81c72330aa298b0e417d69f745d931121ae7f35
Author: Jonas Bernoulli <[email protected]>
Commit: Nathan Moreau <[email protected]>
Various cosmetic changes
---
rust-mode.el | 13 ++++++++-----
1 file changed, 8 insertions(+), 5 deletions(-)
diff --git a/rust-mode.el b/rust-mode.el
index 273dd86..ba19a13 100644
--- a/rust-mode.el
+++ b/rust-mode.el
@@ -409,8 +409,8 @@ Does not match type annotations of the form \"foo::<\"."
(,(concat (rust-re-grab
(concat (rust-re-word (regexp-opt
rust-builtin-formatting-macros))
"!"))
- (concat rust-formatting-macro-opening-re
- "\\(?:" rust-start-of-string-re) "\\)?")
+ rust-formatting-macro-opening-re
+ "\\(?:" rust-start-of-string-re "\\)?")
(1 'rust-builtin-formatting-macro-face)
(rust-string-interpolation-matcher
(rust-end-of-string)
@@ -419,8 +419,9 @@ Does not match type annotations of the form \"foo::<\"."
;; write! macro
(,(concat (rust-re-grab (concat (rust-re-word "write\\(ln\\)?") "!"))
- (concat rust-formatting-macro-opening-re
- "[[:space:]]*[^\"]+,[[:space:]]*"
rust-start-of-string-re))
+ rust-formatting-macro-opening-re
+ "[[:space:]]*[^\"]+,[[:space:]]*"
+ rust-start-of-string-re)
(1 'rust-builtin-formatting-macro-face)
(rust-string-interpolation-matcher
(rust-end-of-string)
@@ -440,7 +441,9 @@ Does not match type annotations of the form \"foo::<\"."
;; Type-inferred binding
(,(concat
"\\_<\\(?:let\\s-+ref\\|let\\|ref\\|for\\)\\s-+\\(?:mut\\s-+\\)?"
- (rust-re-grab rust-re-ident) "\\_>") 1
font-lock-variable-name-face)
+ (rust-re-grab rust-re-ident)
+ "\\_>")
+ 1 font-lock-variable-name-face)
;; Type names like `Foo::`, highlight excluding the ::
(,(rust-path-font-lock-matcher rust-re-uc-ident) 1 font-lock-type-face)
