Merge pull request #514 from dtolnay/rawlifetime

Reject 'prefix#lifetime

Author: dtolnay

src/parse.rs

@@ -871,7 +871,10 @@ fn digits(mut input: Cursor) -> Result<Cursor, Reject> {
 fn punct(input: Cursor) -> PResult<Punct> {
     let (rest, ch) = punct_char(input)?;
     if ch == '\'' {
-        if ident_any(rest)?.0.starts_with_char('\'') {
+        let (after_lifetime, _ident) = ident_any(rest)?;
+        if after_lifetime.starts_with_char('\'')
+            || (after_lifetime.starts_with_char('#') && !rest.starts_with("r#"))
+        {
             Err(Reject)
         } else {
             Ok((rest, Punct::new('\'', Spacing::Joint)))

tests/test.rs

@@ -453,6 +453,81 @@ fn source_text() {
     assert_eq!("a", second.span().source_text().unwrap());
 }
 
+#[test]
+fn lifetimes() {
+    let mut tokens = "'a 'static 'struct 'r#gen 'r#prefix#lifetime"
+        .parse::<TokenStream>()
+        .unwrap()
+        .into_iter();
+    assert!(match tokens.next() {
+        Some(TokenTree::Punct(punct)) => {
+            punct.as_char() == '\'' && punct.spacing() == Spacing::Joint
+        }
+        _ => false,
+    });
+    assert!(match tokens.next() {
+        Some(TokenTree::Ident(ident)) => ident == "a",
+        _ => false,
+    });
+    assert!(match tokens.next() {
+        Some(TokenTree::Punct(punct)) => {
+            punct.as_char() == '\'' && punct.spacing() == Spacing::Joint
+        }
+        _ => false,
+    });
+    assert!(match tokens.next() {
+        Some(TokenTree::Ident(ident)) => ident == "static",
+        _ => false,
+    });
+    assert!(match tokens.next() {
+        Some(TokenTree::Punct(punct)) => {
+            punct.as_char() == '\'' && punct.spacing() == Spacing::Joint
+        }
+        _ => false,
+    });
+    assert!(match tokens.next() {
+        Some(TokenTree::Ident(ident)) => ident == "struct",
+        _ => false,
+    });
+    assert!(match tokens.next() {
+        Some(TokenTree::Punct(punct)) => {
+            punct.as_char() == '\'' && punct.spacing() == Spacing::Joint
+        }
+        _ => false,
+    });
+    assert!(match tokens.next() {
+        Some(TokenTree::Ident(ident)) => ident == "r#gen",
+        _ => false,
+    });
+    assert!(match tokens.next() {
+        Some(TokenTree::Punct(punct)) => {
+            punct.as_char() == '\'' && punct.spacing() == Spacing::Joint
+        }
+        _ => false,
+    });
+    assert!(match tokens.next() {
+        Some(TokenTree::Ident(ident)) => ident == "r#prefix",
+        _ => false,
+    });
+    assert!(match tokens.next() {
+        Some(TokenTree::Punct(punct)) => {
+            punct.as_char() == '#' && punct.spacing() == Spacing::Alone
+        }
+        _ => false,
+    });
+    assert!(match tokens.next() {
+        Some(TokenTree::Ident(ident)) => ident == "lifetime",
+        _ => false,
+    });
+
+    "' a".parse::<TokenStream>().unwrap_err();
+    "' r#gen".parse::<TokenStream>().unwrap_err();
+    "' prefix#lifetime".parse::<TokenStream>().unwrap_err();
+    "'prefix#lifetime".parse::<TokenStream>().unwrap_err();
+    "'aa'bb".parse::<TokenStream>().unwrap_err();
+    "'r#gen'a".parse::<TokenStream>().unwrap_err();
+}
+
 #[test]
 fn roundtrip() {
     fn roundtrip(p: &str) {