From fb632c747d953d615575850477d4662802be320f Mon Sep 17 00:00:00 2001
From: Avi Dessauer <avi.the.coder@gmail.com>
Date: Wed, 3 Jun 2020 15:21:47 -0400
Subject: Parse default unsafe & default const

---
 crates/ra_parser/src/grammar/items.rs              | 26 ++++++++++++++++-
 .../parser/inline/err/0010_wrong_order_fns.rast    | 34 +++++++++++++---------
 2 files changed, 45 insertions(+), 15 deletions(-)

(limited to 'crates')

diff --git a/crates/ra_parser/src/grammar/items.rs b/crates/ra_parser/src/grammar/items.rs
index 67a924de5..41f8bb0b6 100644
--- a/crates/ra_parser/src/grammar/items.rs
+++ b/crates/ra_parser/src/grammar/items.rs
@@ -118,7 +118,15 @@ pub(super) fn maybe_item(p: &mut Parser, m: Marker, flavor: ItemFlavor) -> Resul
         && p.at_contextual_kw("default")
         && (match p.nth(1) {
             T![impl] => true,
-            T![fn] | T![type] => {
+            T![unsafe] => {
+                if T![impl] == p.nth(2) {
+                    p.bump_remap(T![default]);
+                    p.bump_remap(T![unsafe]);
+                    has_mods = true;
+                }
+                false
+            }
+            T![fn] | T![type] | T![const] => {
                 if let ItemFlavor::Mod = flavor {
                     true
                 } else {
@@ -187,6 +195,9 @@ pub(super) fn maybe_item(p: &mut Parser, m: Marker, flavor: ItemFlavor) -> Resul
         // test default_impl
         // default impl Foo {}
 
+        // test default_unsafe_impl
+        // default unsafe impl Foo {}
+
         // test_err default_fn_type
         // trait T {
         //     default type T = Bar;
@@ -199,6 +210,19 @@ pub(super) fn maybe_item(p: &mut Parser, m: Marker, flavor: ItemFlavor) -> Resul
         //     default fn foo() {}
         // }
 
+        // test_err default_const
+        // trait T {
+        //   default const f: u8 = 0;
+        // }
+
+        // test default_const
+        // impl T for Foo {
+        //   default const f: u8 = 0;
+        // }
+        T![const] => {
+            consts::const_def(p, m);
+        }
+
         // test unsafe_default_impl
         // unsafe default impl Foo {}
         T![impl] => {
diff --git a/crates/ra_syntax/test_data/parser/inline/err/0010_wrong_order_fns.rast b/crates/ra_syntax/test_data/parser/inline/err/0010_wrong_order_fns.rast
index 9be441110..53f7ebaf9 100644
--- a/crates/ra_syntax/test_data/parser/inline/err/0010_wrong_order_fns.rast
+++ b/crates/ra_syntax/test_data/parser/inline/err/0010_wrong_order_fns.rast
@@ -17,23 +17,29 @@ SOURCE_FILE@0..50
       L_CURLY@22..23 "{"
       R_CURLY@23..24 "}"
   WHITESPACE@24..25 "\n"
-  ERROR@25..31
+  CONST_DEF@25..46
     UNSAFE_KW@25..31 "unsafe"
-  WHITESPACE@31..32 " "
-  FN_DEF@32..49
+    WHITESPACE@31..32 " "
     CONST_KW@32..37 "const"
     WHITESPACE@37..38 " "
-    FN_KW@38..40 "fn"
+    ERROR@38..40
+      FN_KW@38..40 "fn"
     WHITESPACE@40..41 " "
-    NAME@41..44
-      IDENT@41..44 "bar"
-    PARAM_LIST@44..46
-      L_PAREN@44..45 "("
-      R_PAREN@45..46 ")"
-    WHITESPACE@46..47 " "
-    BLOCK_EXPR@47..49
-      L_CURLY@47..48 "{"
-      R_CURLY@48..49 "}"
+    PATH_TYPE@41..46
+      PATH@41..46
+        PATH_SEGMENT@41..46
+          NAME_REF@41..44
+            IDENT@41..44 "bar"
+          PARAM_LIST@44..46
+            L_PAREN@44..45 "("
+            R_PAREN@45..46 ")"
+  WHITESPACE@46..47 " "
+  ERROR@47..49
+    L_CURLY@47..48 "{"
+    R_CURLY@48..49 "}"
   WHITESPACE@49..50 "\n"
 error 6..6: expected existential, fn, trait or impl
-error 31..31: expected existential, fn, trait or impl
+error 38..38: expected a name
+error 40..40: expected COLON
+error 46..46: expected SEMICOLON
+error 47..47: expected an item
-- 
cgit v1.2.3