Merge pull request #45 from MicahChalmer/backslash-and-double-quote-char-literals

Parse '\\' and '\"' as char literals

Author: nikomatsakis

rust-mode-tests.el

@@ -927,6 +927,22 @@ list of substrings of `STR' each followed by its face."
      "let" font-lock-keyword-face
      "'\\''" font-lock-string-face)))
 
+(ert-deftest font-lock-escaped-double-quote-character-literal ()
+  (rust-test-font-lock
+   "fn main() { let ch = '\\\"'; }"
+   '("fn" font-lock-keyword-face
+     "main" font-lock-function-name-face
+     "let" font-lock-keyword-face
+     "'\\\"'" font-lock-string-face)))
+
+(ert-deftest font-lock-escaped-backslash-character-literal ()
+  (rust-test-font-lock
+   "fn main() { let ch = '\\\\'; }"
+   '("fn" font-lock-keyword-face
+     "main" font-lock-function-name-face
+     "let" font-lock-keyword-face
+     "'\\\\'" font-lock-string-face)))
+
 (ert-deftest font-lock-raw-strings-no-hashes ()
   (rust-test-font-lock
    "r\"No hashes\";"

rust-mode.el

@@ -423,7 +423,7 @@
    ;; Handle single quoted character literals:
    (mapcar (lambda (re) (list re '(1 "\"") '(2 "\"")))
            '("\\('\\)[^']\\('\\)"
-             "\\('\\)\\\\['nrt]\\('\\)"
+             "\\('\\)\\\\['nrt\"\\]\\('\\)"
              "\\('\\)\\\\x[[:xdigit:]]\\{2\\}\\('\\)"
              "\\('\\)\\\\u[[:xdigit:]]\\{4\\}\\('\\)"
              "\\('\\)\\\\U[[:xdigit:]]\\{8\\}\\('\\)"))