Merge #4803

bors[bot] · Avi-D-coder · matklad · web-flow · commit 6f0cc91c8839 · 2020-06-09T08:56:28.000Z
4803: Parse default unsafe fn r=matklad a=Avi-D-coder



Co-authored-by: Avi Dessauer &lt;avi.the.coder@gmail.com&gt;
Co-authored-by: Aleksey Kladov &lt;aleksey.kladov@gmail.com&gt;
diff --git a/crates/ra_parser/src/grammar/items.rs b/crates/ra_parser/src/grammar/items.rs
@@ -121,7 +121,12 @@ pub(super) fn maybe_item(p: &mut Parser, m: Marker, flavor: ItemFlavor) -> Resul
             T![unsafe] => {
                 // test default_unsafe_impl
                 // default unsafe impl Foo {}
-                if p.nth(2) == T![impl] {
+
+                // test default_unsafe_fn
+                // impl T for Foo {
+                //     default unsafe fn foo() {}
+                // }
+                if p.nth(2) == T![impl] || p.nth(2) == T![fn] {
                     p.bump_remap(T![default]);
                     p.bump(T![unsafe]);
                     has_mods = true;
diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0163_default_unsafe_fn.rast b/crates/ra_syntax/test_data/parser/inline/ok/0163_default_unsafe_fn.rast
@@ -0,0 +1,40 @@
+SOURCE_FILE@0..50
+  IMPL_DEF@0..49
+    IMPL_KW@0..4 "impl"
+    WHITESPACE@4..5 " "
+    PATH_TYPE@5..6
+      PATH@5..6
+        PATH_SEGMENT@5..6
+          NAME_REF@5..6
+            IDENT@5..6 "T"
+    WHITESPACE@6..7 " "
+    FOR_KW@7..10 "for"
+    WHITESPACE@10..11 " "
+    PATH_TYPE@11..14
+      PATH@11..14
+        PATH_SEGMENT@11..14
+          NAME_REF@11..14
+            IDENT@11..14 "Foo"
+    WHITESPACE@14..15 " "
+    ITEM_LIST@15..49
+      L_CURLY@15..16 "{"
+      WHITESPACE@16..21 "\n    "
+      FN_DEF@21..47
+        DEFAULT_KW@21..28 "default"
+        WHITESPACE@28..29 " "
+        UNSAFE_KW@29..35 "unsafe"
+        WHITESPACE@35..36 " "
+        FN_KW@36..38 "fn"
+        WHITESPACE@38..39 " "
+        NAME@39..42
+          IDENT@39..42 "foo"
+        PARAM_LIST@42..44
+          L_PAREN@42..43 "("
+          R_PAREN@43..44 ")"
+        WHITESPACE@44..45 " "
+        BLOCK_EXPR@45..47
+          L_CURLY@45..46 "{"
+          R_CURLY@46..47 "}"
+      WHITESPACE@47..48 "\n"
+      R_CURLY@48..49 "}"
+  WHITESPACE@49..50 "\n"
diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0163_default_unsafe_fn.rs b/crates/ra_syntax/test_data/parser/inline/ok/0163_default_unsafe_fn.rs
@@ -0,0 +1,3 @@
+impl T for Foo {
+    default unsafe fn foo() {}
+}

-Original file line number
+Diff line change
@@ @@ -0,0 +1,40 @@ @@
 +[email protected]
 +  [email protected]
 +    [email protected] "impl"
 +    [email protected] " "
 +    [email protected]
 +      [email protected]
 +        [email protected]
 +          [email protected]
 +            [email protected] "T"
 +    [email protected] " "
 +    [email protected] "for"
 +    [email protected] " "
 +    [email protected]
 +      [email protected]
 +        [email protected]
 +          [email protected]
 +            [email protected] "Foo"
 +    [email protected] " "
 +    [email protected]
 +      [email protected] "{"
 +      [email protected] "\n    "
 +      [email protected]
 +        [email protected] "default"
 +        [email protected] " "
 +        [email protected] "unsafe"
 +        [email protected] " "
 +        [email protected] "fn"
 +        [email protected] " "
 +        [email protected]
 +          [email protected] "foo"
 +        [email protected]
 +          [email protected] "("
 +          [email protected] ")"
 +        [email protected] " "
 +        [email protected]
 +          [email protected] "{"
 +          [email protected] "}"
 +      [email protected] "\n"
 +      [email protected] "}"
 +  [email protected] "\n"
Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,3 @@`
	`1`	`+impl T for Foo {`
	`2`	`+ default unsafe fn foo() {}`
	`3`	`+}`