2 files changed, 13 insertions, 3 deletions

diff --git a/crates/ra_parser/src/grammar/expressions/atom.rs b/crates/ra_parser/src/grammar/expressions/atom.rs
index 6c7fdc2cd..457f42a26 100644
--- a/crates/ra_parser/src/grammar/expressions/atom.rs
+++ b/crates/ra_parser/src/grammar/expressions/atom.rs
@@ -54,6 +54,7 @@ pub(super) const ATOM_EXPR_FIRST: TokenSet =
         LIFETIME,
         ASYNC_KW,
         TRY_KW,
+        LOOP_KW
     ]);
 
 const EXPR_RECOVERY_SET: TokenSet = token_set![LET_KW];
diff --git a/crates/ra_parser/src/grammar/patterns.rs b/crates/ra_parser/src/grammar/patterns.rs
index a4ffd6960..aa9a6d18e 100644
--- a/crates/ra_parser/src/grammar/patterns.rs
+++ b/crates/ra_parser/src/grammar/patterns.rs
@@ -167,7 +167,7 @@ fn record_field_pat_list(p: &mut Parser) {
             // A trailing `..` is *not* treated as a DOT_DOT_PAT.
             T![.] if p.at(T![..]) => p.bump(T![..]),
 
-            IDENT if p.nth(1) == T![:] => record_field_pat(p),
+            IDENT | INT_NUMBER if p.nth(1) == T![:] => record_field_pat(p),
             T!['{'] => error_block(p, "expected ident"),
             T![box] => {
                 box_pat(p);
@@ -184,12 +184,21 @@ fn record_field_pat_list(p: &mut Parser) {
     m.complete(p, RECORD_FIELD_PAT_LIST);
 }
 
+// test record_field_pat
+// fn foo() {
+//     let S { 0: 1 } = ();
+//     let S { x: 1 } = ();
+// }
 fn record_field_pat(p: &mut Parser) {
-    assert!(p.at(IDENT));
+    assert!(p.at(IDENT) || p.at(INT_NUMBER));
     assert!(p.nth(1) == T![:]);
 
     let m = p.start();
-    name(p);
+
+    if !p.eat(INT_NUMBER) {
+        name(p)
+    }
+
     p.bump_any();
     pattern(p);
     m.complete(p, RECORD_FIELD_PAT);