Properly attach attributes to Param instead of parent ParamList

Veykril · Veykril · commit 4be9ed675ed2 · 2020-12-20T20:30:18.000+01:00
diff --git a/crates/parser/src/grammar/params.rs b/crates/parser/src/grammar/params.rs
@@ -47,20 +47,23 @@ fn list_(p: &mut Parser, flavor: Flavor) {
     if let FnDef = flavor {
         // test self_param_outer_attr
         // fn f(#[must_use] self) {}
+        let m = p.start();
         attributes::outer_attrs(p);
-        opt_self_param(p);
+        opt_self_param(p, m);
     }
 
     while !p.at(EOF) && !p.at(ket) {
         // test param_outer_arg
         // fn f(#[attr1] pat: Type) {}
+        let m = p.start();
         attributes::outer_attrs(p);
 
         if !p.at_ts(PARAM_FIRST) {
             p.error("expected value parameter");
+            m.abandon(p);
             break;
         }
-        let param = param(p, flavor);
+        let param = param(p, m, flavor);
         if !p.at(ket) {
             p.expect(T![,]);
         }
@@ -77,9 +80,8 @@ const PARAM_FIRST: TokenSet = patterns::PATTERN_FIRST.union(types::TYPE_FIRST);
 
 struct Variadic(bool);
 
-fn param(p: &mut Parser, flavor: Flavor) -> Variadic {
+fn param(p: &mut Parser, m: Marker, flavor: Flavor) -> Variadic {
     let mut res = Variadic(false);
-    let m = p.start();
     match flavor {
         // test param_list_vararg
         // extern "C" { fn printf(format: *const i8, ...) -> i32; }
@@ -151,10 +153,8 @@ fn variadic_param(p: &mut Parser) -> bool {
 //     fn d(&'a mut self, x: i32) {}
 //     fn e(mut self) {}
 // }
-fn opt_self_param(p: &mut Parser) {
-    let m;
+fn opt_self_param(p: &mut Parser, m: Marker) {
     if p.at(T![self]) || p.at(T![mut]) && p.nth(1) == T![self] {
-        m = p.start();
         p.eat(T![mut]);
         p.eat(T![self]);
         // test arb_self_types
@@ -174,9 +174,8 @@ fn opt_self_param(p: &mut Parser) {
             (T![&], T![mut], T![self], _) => 3,
             (T![&], LIFETIME_IDENT, T![self], _) => 3,
             (T![&], LIFETIME_IDENT, T![mut], T![self]) => 4,
-            _ => return,
+            _ => return m.abandon(p),
         };
-        m = p.start();
         p.bump_any();
         if p.at(LIFETIME_IDENT) {
             lifetime(p);
diff --git a/crates/syntax/test_data/parser/inline/ok/0138_self_param_outer_attr.rast b/crates/syntax/test_data/parser/inline/ok/0138_self_param_outer_attr.rast
@@ -6,16 +6,16 @@ SOURCE_FILE@0..26
       IDENT@3..4 "f"
     PARAM_LIST@4..22
       L_PAREN@4..5 "("
-      ATTR@5..16
-        POUND@5..6 "#"
-        L_BRACK@6..7 "["
-        PATH@7..15
-          PATH_SEGMENT@7..15
-            NAME_REF@7..15
-              IDENT@7..15 "must_use"
-        R_BRACK@15..16 "]"
-      WHITESPACE@16..17 " "
-      SELF_PARAM@17..21
+      SELF_PARAM@5..21
+        ATTR@5..16
+          POUND@5..6 "#"
+          L_BRACK@6..7 "["
+          PATH@7..15
+            PATH_SEGMENT@7..15
+              NAME_REF@7..15
+                IDENT@7..15 "must_use"
+          R_BRACK@15..16 "]"
+        WHITESPACE@16..17 " "
         SELF_KW@17..21 "self"
       R_PAREN@21..22 ")"
     WHITESPACE@22..23 " "
diff --git a/crates/syntax/test_data/parser/ok/0051_parameter_attrs.rast b/crates/syntax/test_data/parser/ok/0051_parameter_attrs.rast
@@ -107,16 +107,16 @@ SOURCE_FILE@0..519
                       IDENT@102..104 "i8"
           COMMA@104..105 ","
           WHITESPACE@105..106 " "
-          ATTR@106..113
-            POUND@106..107 "#"
-            L_BRACK@107..108 "["
-            PATH@108..112
-              PATH_SEGMENT@108..112
-                NAME_REF@108..112
-                  IDENT@108..112 "attr"
-            R_BRACK@112..113 "]"
-          WHITESPACE@113..114 " "
-          PARAM@114..117
+          PARAM@106..117
+            ATTR@106..113
+              POUND@106..107 "#"
+              L_BRACK@107..108 "["
+              PATH@108..112
+                PATH_SEGMENT@108..112
+                  NAME_REF@108..112
+                    IDENT@108..112 "attr"
+              R_BRACK@112..113 "]"
+            WHITESPACE@113..114 " "
             DOT3@114..117 "..."
           R_PAREN@117..118 ")"
         WHITESPACE@118..119 " "
@@ -153,16 +153,16 @@ SOURCE_FILE@0..519
                     IDENT@140..145 "FnMut"
                   PARAM_LIST@145..167
                     L_PAREN@145..146 "("
-                    ATTR@146..153
-                      POUND@146..147 "#"
-                      L_BRACK@147..148 "["
-                      PATH@148..152
-                        PATH_SEGMENT@148..152
-                          NAME_REF@148..152
-                            IDENT@148..152 "attr"
-                      R_BRACK@152..153 "]"
-                    WHITESPACE@153..154 " "
-                    PARAM@154..166
+                    PARAM@146..166
+                      ATTR@146..153
+                        POUND@146..147 "#"
+                        L_BRACK@147..148 "["
+                        PATH@148..152
+                          PATH_SEGMENT@148..152
+                            NAME_REF@148..152
+                              IDENT@148..152 "attr"
+                        R_BRACK@152..153 "]"
+                      WHITESPACE@153..154 " "
                       REF_TYPE@154..166
                         AMP@154..155 "&"
                         MUT_KW@155..158 "mut"
@@ -224,17 +224,17 @@ SOURCE_FILE@0..519
                     IDENT@208..211 "u64"
           COMMA@211..212 ","
           WHITESPACE@212..213 " "
-          ATTR@213..221
-            POUND@213..214 "#"
-            WHITESPACE@214..215 " "
-            L_BRACK@215..216 "["
-            PATH@216..220
-              PATH_SEGMENT@216..220
-                NAME_REF@216..220
-                  IDENT@216..220 "attr"
-            R_BRACK@220..221 "]"
-          WHITESPACE@221..222 " "
-          PARAM@222..232
+          PARAM@213..232
+            ATTR@213..221
+              POUND@213..214 "#"
+              WHITESPACE@214..215 " "
+              L_BRACK@215..216 "["
+              PATH@216..220
+                PATH_SEGMENT@216..220
+                  NAME_REF@216..220
+                    IDENT@216..220 "attr"
+              R_BRACK@220..221 "]"
+            WHITESPACE@221..222 " "
             IDENT_PAT@222..227
               MUT_KW@222..225 "mut"
               WHITESPACE@225..226 " "
@@ -271,16 +271,16 @@ SOURCE_FILE@0..519
           IDENT@255..256 "f"
         PARAM_LIST@256..274
           L_PAREN@256..257 "("
-          ATTR@257..268
-            POUND@257..258 "#"
-            L_BRACK@258..259 "["
-            PATH@259..267
-              PATH_SEGMENT@259..267
-                NAME_REF@259..267
-                  IDENT@259..267 "must_use"
-            R_BRACK@267..268 "]"
-          WHITESPACE@268..269 " "
-          SELF_PARAM@269..273
+          SELF_PARAM@257..273
+            ATTR@257..268
+              POUND@257..258 "#"
+              L_BRACK@258..259 "["
+              PATH@259..267
+                PATH_SEGMENT@259..267
+                  NAME_REF@259..267
+                    IDENT@259..267 "must_use"
+              R_BRACK@267..268 "]"
+            WHITESPACE@268..269 " "
             SELF_KW@269..273 "self"
           R_PAREN@273..274 ")"
         WHITESPACE@274..275 " "
@@ -295,16 +295,16 @@ SOURCE_FILE@0..519
           IDENT@286..288 "g1"
         PARAM_LIST@288..302
           L_PAREN@288..289 "("
-          ATTR@289..296
-            POUND@289..290 "#"
-            L_BRACK@290..291 "["
-            PATH@291..295
-              PATH_SEGMENT@291..295
-                NAME_REF@291..295
-                  IDENT@291..295 "attr"
-            R_BRACK@295..296 "]"
-          WHITESPACE@296..297 " "
-          SELF_PARAM@297..301
+          SELF_PARAM@289..301
+            ATTR@289..296
+              POUND@289..290 "#"
+              L_BRACK@290..291 "["
+              PATH@291..295
+                PATH_SEGMENT@291..295
+                  NAME_REF@291..295
+                    IDENT@291..295 "attr"
+              R_BRACK@295..296 "]"
+            WHITESPACE@296..297 " "
             SELF_KW@297..301 "self"
           R_PAREN@301..302 ")"
         WHITESPACE@302..303 " "
@@ -319,16 +319,16 @@ SOURCE_FILE@0..519
           IDENT@314..316 "g2"
         PARAM_LIST@316..331
           L_PAREN@316..317 "("
-          ATTR@317..324
-            POUND@317..318 "#"
-            L_BRACK@318..319 "["
-            PATH@319..323
-              PATH_SEGMENT@319..323
-                NAME_REF@319..323
-                  IDENT@319..323 "attr"
-            R_BRACK@323..324 "]"
-          WHITESPACE@324..325 " "
-          SELF_PARAM@325..330
+          SELF_PARAM@317..330
+            ATTR@317..324
+              POUND@317..318 "#"
+              L_BRACK@318..319 "["
+              PATH@319..323
+                PATH_SEGMENT@319..323
+                  NAME_REF@319..323
+                    IDENT@319..323 "attr"
+              R_BRACK@323..324 "]"
+            WHITESPACE@324..325 " "
             AMP@325..326 "&"
             SELF_KW@326..330 "self"
           R_PAREN@330..331 ")"
@@ -350,16 +350,16 @@ SOURCE_FILE@0..519
           R_ANGLE@348..349 ">"
         PARAM_LIST@349..368
           L_PAREN@349..350 "("
-          ATTR@350..357
-            POUND@350..351 "#"
-            L_BRACK@351..352 "["
-            PATH@352..356
-              PATH_SEGMENT@352..356
-                NAME_REF@352..356
-                  IDENT@352..356 "attr"
-            R_BRACK@356..357 "]"
-          WHITESPACE@357..358 " "
-          SELF_PARAM@358..367
+          SELF_PARAM@350..367
+            ATTR@350..357
+              POUND@350..351 "#"
+              L_BRACK@351..352 "["
+              PATH@352..356
+                PATH_SEGMENT@352..356
+                  NAME_REF@352..356
+                    IDENT@352..356 "attr"
+              R_BRACK@356..357 "]"
+            WHITESPACE@357..358 " "
             AMP@358..359 "&"
             MUT_KW@359..362 "mut"
             WHITESPACE@362..363 " "
@@ -383,16 +383,16 @@ SOURCE_FILE@0..519
           R_ANGLE@385..386 ">"
         PARAM_LIST@386..404
           L_PAREN@386..387 "("
-          ATTR@387..394
-            POUND@387..388 "#"
-            L_BRACK@388..389 "["
-            PATH@389..393
-              PATH_SEGMENT@389..393
-                NAME_REF@389..393
-                  IDENT@389..393 "attr"
-            R_BRACK@393..394 "]"
-          WHITESPACE@394..395 " "
-          SELF_PARAM@395..403
+          SELF_PARAM@387..403
+            ATTR@387..394
+              POUND@387..388 "#"
+              L_BRACK@388..389 "["
+              PATH@389..393
+                PATH_SEGMENT@389..393
+                  NAME_REF@389..393
+                    IDENT@389..393 "attr"
+              R_BRACK@393..394 "]"
+            WHITESPACE@394..395 " "
             AMP@395..396 "&"
             LIFETIME@396..398
               LIFETIME_IDENT@396..398 "\'a"
@@ -417,16 +417,16 @@ SOURCE_FILE@0..519
           R_ANGLE@421..422 ">"
         PARAM_LIST@422..444
           L_PAREN@422..423 "("
-          ATTR@423..430
-            POUND@423..424 "#"
-            L_BRACK@424..425 "["
-            PATH@425..429
-              PATH_SEGMENT@425..429
-                NAME_REF@425..429
-                  IDENT@425..429 "attr"
-            R_BRACK@429..430 "]"
-          WHITESPACE@430..431 " "
-          SELF_PARAM@431..443
+          SELF_PARAM@423..443
+            ATTR@423..430
+              POUND@423..424 "#"
+              L_BRACK@424..425 "["
+              PATH@425..429
+                PATH_SEGMENT@425..429
+                  NAME_REF@425..429
+                    IDENT@425..429 "attr"
+              R_BRACK@429..430 "]"
+            WHITESPACE@430..431 " "
             AMP@431..432 "&"
             LIFETIME@432..434
               LIFETIME_IDENT@432..434 "\'a"
@@ -447,16 +447,16 @@ SOURCE_FILE@0..519
           IDENT@456..457 "c"
         PARAM_LIST@457..477
           L_PAREN@457..458 "("
-          ATTR@458..465
-            POUND@458..459 "#"
-            L_BRACK@459..460 "["
-            PATH@460..464
-              PATH_SEGMENT@460..464
-                NAME_REF@460..464
-                  IDENT@460..464 "attr"
-            R_BRACK@464..465 "]"
-          WHITESPACE@465..466 " "
-          SELF_PARAM@466..476
+          SELF_PARAM@458..476
+            ATTR@458..465
+              POUND@458..459 "#"
+              L_BRACK@459..460 "["
+              PATH@460..464
+                PATH_SEGMENT@460..464
+                  NAME_REF@460..464
+                    IDENT@460..464 "attr"
+              R_BRACK@464..465 "]"
+            WHITESPACE@465..466 " "
             SELF_KW@466..470 "self"
             COLON@470..471 ":"
             WHITESPACE@471..472 " "
@@ -478,16 +478,16 @@ SOURCE_FILE@0..519
           IDENT@489..490 "d"
         PARAM_LIST@490..514
           L_PAREN@490..491 "("
-          ATTR@491..498
-            POUND@491..492 "#"
-            L_BRACK@492..493 "["
-            PATH@493..497
-              PATH_SEGMENT@493..497
-                NAME_REF@493..497
-                  IDENT@493..497 "attr"
-            R_BRACK@497..498 "]"
-          WHITESPACE@498..499 " "
-          SELF_PARAM@499..513
+          SELF_PARAM@491..513
+            ATTR@491..498
+              POUND@491..492 "#"
+              L_BRACK@492..493 "["
+              PATH@493..497
+                PATH_SEGMENT@493..497
+                  NAME_REF@493..497
+                    IDENT@493..497 "attr"
+              R_BRACK@497..498 "]"
+            WHITESPACE@498..499 " "
             SELF_KW@499..503 "self"
             COLON@503..504 ":"
             WHITESPACE@504..505 " "
diff --git a/crates/syntax/test_data/parser/ok/0063_variadic_fun.rast b/crates/syntax/test_data/parser/ok/0063_variadic_fun.rast

-Original file line number
+Diff line change
       [email protected] "f"
     [email protected]
       [email protected] "("
 -      ATTR@5..16
 -        POUND@5..6 "#"
 -        [email protected] "["
 -        [email protected]
 -          PATH_SEGMENT@7..15
 -            NAME_REF@7..15
 -              IDENT@7..15 "must_use"
 -        [email protected] "]"
 -      [email protected] " "
 -      [email protected]
 +      SELF_PARAM@5..21
 +        ATTR@5..16
 +          [email protected] "#"
 +          [email protected] "["
 +          PATH@7..15
 +            PATH_SEGMENT@7..15
 +              NAME_REF@7..15
 +                [email protected] "must_use"
 +          [email protected] "]"
 +        [email protected] " "
         [email protected] "self"
       [email protected] ")"
     [email protected] " "