Rust: Add support for lifetime-annotation and => operator. Fix #1339

components/prism-rust.js

@@ -22,10 +22,18 @@ Prism.languages.rust = {
 			greedy: true
 		},
 		{
-			pattern: /b?("|')(?:\\.|(?!\1)[^\\\r\n])*\1/,
+			pattern: /b?"(?:\\.|[^\\\r\n"])*"/,
 			greedy: true
 		}
 	],
+	'lifetime-annotation': {
+		pattern: /'[^\s>']+(?!')/,
+		alias: 'symbol'
+	},
+	'char': {
+		pattern: /'(?:\\.|[^\\\r\n'])*'/,
+		alias: 'string'
+	},
 	'keyword': /\b(?:abstract|alignof|as|be|box|break|const|continue|crate|do|else|enum|extern|false|final|fn|for|if|impl|in|let|loop|match|mod|move|mut|offsetof|once|override|priv|pub|pure|ref|return|sizeof|static|self|struct|super|true|trait|type|typeof|unsafe|unsized|use|virtual|where|while|yield)\b/,
 
 	'attribute': {
@@ -56,5 +64,5 @@ Prism.languages.rust = {
 		}
 	},
 	'punctuation': /[{}[\];(),:]|\.+|->/,
-	'operator': /[-+*\/%!^=]=?|@|&[&=]?|\|[|=]?|<<?=?|>>?=?/
+	'operator': /[-+*\/%!^]=?|=[=>]?|@|&[&=]?|\|[|=]?|<<?=?|>>?=?/
 };

tests/languages/rust/char_feature.test

@@ -0,0 +1,13 @@
+'a'
+'स'
+
+----------------------------------------------------
+
+[
+	["char", "'a'"],
+	["char", "'स'"]
+]
+
+----------------------------------------------------
+
+Checks for chars.

tests/languages/rust/issue1339.test

@@ -0,0 +1,49 @@
+const ALL_CARDS: &'static [&'static char] = &["2"]
+fn foo<'a> (first: &'a str, second: &'a str) => () { }
+
+----------------------------------------------------
+
+[
+	["keyword", "const"],
+	" ALL_CARDS",
+	["punctuation", ":"],
+	["operator", "&"],
+	["lifetime-annotation", "'static"],
+	["punctuation", "["],
+	["operator", "&"],
+	["lifetime-annotation", "'static"],
+	" char",
+	["punctuation", "]"],
+	["operator", "="],
+	["operator", "&"],
+	["punctuation", "["],
+	["string", "\"2\""],
+	["punctuation", "]"],
+	["keyword", "fn"],
+	" foo",
+	["operator", "<"],
+	["lifetime-annotation", "'a"],
+	["operator", ">"],
+	["punctuation", "("],
+	"first",
+	["punctuation", ":"],
+	["operator", "&"],
+	["lifetime-annotation", "'a"],
+	" str",
+	["punctuation", ","],
+	" second",
+	["punctuation", ":"],
+	["operator", "&"],
+	["lifetime-annotation", "'a"],
+	" str",
+	["punctuation", ")"],
+	["operator", "=>"],
+	["punctuation", "("],
+	["punctuation", ")"],
+	["punctuation", "{"],
+	["punctuation", "}"]
+]
+
+----------------------------------------------------
+
+Checks for lifetime annotations in real-world examples. See #1339.

tests/languages/rust/lifetime-annotation_feature.test

@@ -0,0 +1,15 @@
+'foo
+'a
+<'a>
+
+----------------------------------------------------
+
+[
+	["lifetime-annotation", "'foo"],
+	["lifetime-annotation", "'a"],
+	["operator", "<"], ["lifetime-annotation", "'a"], ["operator", ">"]
+]
+
+----------------------------------------------------
+
+Checks for lifetime annotations.

tests/languages/rust/operator_feature.test

@@ -5,7 +5,7 @@
 % %=
 ! !=
 ^ ^=
-= ==
+= == =>
 & && &=
 | || |=
 < << <= <<=
@@ -22,7 +22,7 @@
 	["operator", "%"], ["operator", "%="],
 	["operator", "!"], ["operator", "!="],
 	["operator", "^"], ["operator", "^="],
-	["operator", "="], ["operator", "=="],
+	["operator", "="], ["operator", "=="], ["operator", "=>"],
 	["operator", "&"], ["operator", "&&"], ["operator", "&="],
 	["operator", "|"], ["operator", "||"], ["operator", "|="],
 	["operator", "<"], ["operator", "<<"], ["operator", "<="], ["operator", "<<="],

tests/languages/rust/string_feature.test

@@ -1,12 +1,8 @@
 ""
 "fo\"obar"
-''
-'fo\'obar'
 
 b""
 b"fo\"obar"
-b''
-b'fo\'obar'
 
 r#""#
 r#"fo"obar"#
@@ -21,13 +17,9 @@ br###"foo#bar"###
 [
 	["string", "\"\""],
 	["string", "\"fo\\\"obar\""],
-	["string", "''"],
-	["string", "'fo\\'obar'"],
 
 	["string", "b\"\""],
 	["string", "b\"fo\\\"obar\""],
-	["string", "b''"],
-	["string", "b'fo\\'obar'"],
 
 	["string", "r#\"\"#"],
 	["string", "r#\"fo\"obar\"#"],