commit 1b69f6830344d3b517d29e45add5ef6418fc6ca5
author Gregory Katz <gregkatz@gmail.com> Tue Sep 27 21:06:09 2016 -0400
committer Gregory Katz <gregkatz@gmail.com> Tue Sep 27 21:06:09 2016 -0400
tree dbe92bc235296cca176e2a0e7c484310eede547a
parent e5f3568a7f1b4266c47c914b6e1ee7653b09a1e0

addressed review comments

src/expr.rs

diff --git a/src/expr.rs b/src/expr.rs
index 8214ef7..64e864d 100644
--- a/src/expr.rs
+++ b/src/expr.rs
@@ -337,6 +337,7 @@
 pub mod parsing {
     use super::*;
     use {Ident, Ty};
+    use generics::parsing::lifetime;
     use ident::parsing::ident;
     use lit::parsing::lit;
     use nom::multispace;
@@ -551,17 +552,12 @@
     ));
 
     named!(expr_loop -> Expr, do_parse!(
-        id: option!(
-            terminated!(
-                preceded!(
-                    punct!("'"),
-                    ident),
-                punct!(":"))) >>
-            punct!("loop") >>
+        lt: option!(terminated!(lifetime, punct!(":"))) >>
+        punct!("loop") >>
         loop_block: block >>
         (Expr::Loop(
             Box::new(loop_block),
-            id,
+            lt.map(|lt| lt.ident),
         ))
     ));
 

tests/test_expr.rs

diff --git a/tests/test_expr.rs b/tests/test_expr.rs
index 0459da7..587102f 100644
--- a/tests/test_expr.rs
+++ b/tests/test_expr.rs
@@ -37,7 +37,7 @@
 
     let raw = "' test : loop{(1, 5, 9, 11)}";
 
-    let expected = Expr::Loop(block, Some("test".into()));
+    let expected = Expr::Loop(block, Some("'test".into()));
 
     assert_eq!(expected, parse_expr(raw).unwrap());
 }