Merge #6965

6965: Properly attach attributes to Param instead of parent ParamList r=matklad a=Veykril

Fixes #2783, fixes #2781

The problem with `let _a = [0,#[cfg(feature = "L")]0];` has already been fixed some time ago it seems:
<details>
  <summary>Syntax Tree for the const item</summary>

```
  [email protected]
    [email protected] "let"
    [email protected] " "
    [email protected]
      [email protected]
        [email protected] "_a"
    [email protected] " "
    [email protected] "="
    [email protected] " "
    [email protected]
      [email protected] "["
      [email protected]
        [email protected] "0"
      [email protected] ","
      [email protected]
        [email protected]
          [email protected] "#"
          [email protected] "["
          [email protected]
            [email protected]
              [email protected]
                [email protected] "cfg"
          [email protected]
            [email protected] "("
            [email protected] "feature"
            [email protected] " "
            [email protected] "="
            [email protected] " "
            [email protected] "\"L\""
            [email protected] ")"
          [email protected] "]"
        [email protected] "0"
      [email protected] "]"
    [email protected] ";"
```
</details>

Co-authored-by: Lukas Wirth <[email protected]>

7 files changed, 199 insertions, 147 deletions

diff --git a/crates/parser/src/grammar/expressions/atom.rs b/crates/parser/src/grammar/expressions/atom.rs
index 18b63feb7..e897d5a52 100644
--- a/crates/parser/src/grammar/expressions/atom.rs
+++ b/crates/parser/src/grammar/expressions/atom.rs
@@ -156,11 +156,13 @@ fn tuple_expr(p: &mut Parser) -> CompletedMarker {
     let mut saw_expr = false;
     while !p.at(EOF) && !p.at(T![')']) {
         saw_expr = true;
-        if !p.at_ts(EXPR_FIRST) {
-            p.error("expected expression");
+
+        // test tuple_attrs
+        // const A: (i64, i64) = (1, #[cfg(test)] 2);
+        if !expr_with_attrs(p) {
             break;
         }
-        expr(p);
+
         if !p.at(T![')']) {
             saw_comma = true;
             p.expect(T![,]);
diff --git a/crates/parser/src/grammar/params.rs b/crates/parser/src/grammar/params.rs
index 3ee4e4fca..2d006a1d5 100644
--- 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
index 6403ff8d5..d3219f0b2 100644
--- 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 @@ [email protected]
       [email protected] "f"
     [email protected]
       [email protected] "("
-      ATT[email protected]6
-        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 "["
+          [email protected]
+            PATH_SEGMENT@7..15
+              NAME_REF@7..15
+                IDENT@7..15 "must_use"
+          R_BRACK@15..16 "]"
+        WHITESPACE@16..17 " "
         [email protected] "self"
       [email protected] ")"
     [email protected] " "
diff --git a/crates/syntax/test_data/parser/inline/ok/0154_tuple_attrs.rast b/crates/syntax/test_data/parser/inline/ok/0154_tuple_attrs.rast
new file mode 100644
index 000000000..d34b21abe
--- /dev/null
+++ b/crates/syntax/test_data/parser/inline/ok/0154_tuple_attrs.rast
@@ -0,0 +1,50 @@
+[email protected]
+  [email protected]
+    [email protected] "const"
+    [email protected] " "
+    [email protected]
+      [email protected] "A"
+    [email protected] ":"
+    [email protected] " "
+    [email protected]
+      [email protected] "("
+      [email protected]
+        [email protected]
+          [email protected]
+            [email protected]
+              [email protected] "i64"
+      [email protected] ","
+      [email protected] " "
+      [email protected]
+        [email protected]
+          [email protected]
+            [email protected]
+              [email protected] "i64"
+      [email protected] ")"
+    [email protected] " "
+    [email protected] "="
+    [email protected] " "
+    [email protected]
+      [email protected] "("
+      [email protected]
+        [email protected] "1"
+      [email protected] ","
+      [email protected] " "
+      [email protected]
+        [email protected]
+          [email protected] "#"
+          [email protected] "["
+          [email protected]
+            [email protected]
+              [email protected]
+                [email protected] "cfg"
+          [email protected]
+            [email protected] "("
+            [email protected] "test"
+            [email protected] ")"
+          [email protected] "]"
+        [email protected] " "
+        [email protected] "2"
+      [email protected] ")"
+    [email protected] ";"
+  [email protected] "\n"
diff --git a/crates/syntax/test_data/parser/inline/ok/0154_tuple_attrs.rs b/crates/syntax/test_data/parser/inline/ok/0154_tuple_attrs.rs
new file mode 100644
index 000000000..f84b7ab31
--- /dev/null
+++ b/crates/syntax/test_data/parser/inline/ok/0154_tuple_attrs.rs
@@ -0,0 +1 @@
+const A: (i64, i64) = (1, #[cfg(test)] 2);
diff --git a/crates/syntax/test_data/parser/ok/0051_parameter_attrs.rast b/crates/syntax/test_data/parser/ok/0051_parameter_attrs.rast
index 8974f9e40..3fed11838 100644
--- 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 @@ [email protected]
                       [email protected] "i8"
           [email protected] ","
           [email protected] " "
-          ATT[email protected]3
-            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 "["
+              [email protected]
+                PATH_SEGMENT@108..112
+                  NAME_REF@108..112
+                    IDENT@108..112 "attr"
+              R_BRACK@112..113 "]"
+            WHITESPACE@113..114 " "
             [email protected] "..."
           [email protected] ")"
         [email protected] " "
@@ -153,16 +153,16 @@ [email protected]
                     [email protected] "FnMut"
                   [email protected]
                     [email protected] "("
-                    ATT[email protected]53
-                      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 "["
+                        [email protected]
+                          PATH_SEGMENT@148..152
+                            NAME_REF@148..152
+                              IDENT@148..152 "attr"
+                        R_BRACK@152..153 "]"
+                      WHITESPACE@153..154 " "
                       [email protected]
                         [email protected] "&"
                         [email protected] "mut"
@@ -224,17 +224,17 @@ [email protected]
                     [email protected] "u64"
           [email protected] ","
           [email protected] " "
-          ATT[email protected]1
-            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 "["
+              [email protected]
+                PATH_SEGMENT@216..220
+                  NAME_REF@216..220
+                    IDENT@216..220 "attr"
+              R_BRACK@220..221 "]"
+            WHITESPACE@221..222 " "
             [email protected]
               [email protected] "mut"
               [email protected] " "
@@ -271,16 +271,16 @@ [email protected]
           [email protected] "f"
         [email protected]
           [email protected] "("
-          ATT[email protected]68
-            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 "["
+              [email protected]
+                PATH_SEGMENT@259..267
+                  NAME_REF@259..267
+                    IDENT@259..267 "must_use"
+              R_BRACK@267..268 "]"
+            WHITESPACE@268..269 " "
             [email protected] "self"
           [email protected] ")"
         [email protected] " "
@@ -295,16 +295,16 @@ [email protected]
           [email protected] "g1"
         [email protected]
           [email protected] "("
-          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 "["
+              [email protected]
+                PATH_SEGMENT@291..295
+                  NAME_REF@291..295
+                    IDENT@291..295 "attr"
+              R_BRACK@295..296 "]"
+            WHITESPACE@296..297 " "
             [email protected] "self"
           [email protected] ")"
         [email protected] " "
@@ -319,16 +319,16 @@ [email protected]
           [email protected] "g2"
         [email protected]
           [email protected] "("
-          ATT[email protected]24
-            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 "["
+              [email protected]
+                PATH_SEGMENT@319..323
+                  NAME_REF@319..323
+                    IDENT@319..323 "attr"
+              R_BRACK@323..324 "]"
+            WHITESPACE@324..325 " "
             [email protected] "&"
             [email protected] "self"
           [email protected] ")"
@@ -350,16 +350,16 @@ [email protected]
           [email protected] ">"
         [email protected]
           [email protected] "("
-          ATT[email protected]57
-            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 "["
+              [email protected]
+                PATH_SEGMENT@352..356
+                  NAME_REF@352..356
+                    IDENT@352..356 "attr"
+              R_BRACK@356..357 "]"
+            WHITESPACE@357..358 " "
             [email protected] "&"
             [email protected] "mut"
             [email protected] " "
@@ -383,16 +383,16 @@ [email protected]
           [email protected] ">"
         [email protected]
           [email protected] "("
-          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 "["
+              [email protected]
+                PATH_SEGMENT@389..393
+                  NAME_REF@389..393
+                    IDENT@389..393 "attr"
+              R_BRACK@393..394 "]"
+            WHITESPACE@394..395 " "
             [email protected] "&"
             [email protected]
               [email protected] "\'a"
@@ -417,16 +417,16 @@ [email protected]
           [email protected] ">"
         [email protected]
           [email protected] "("
-          ATT[email protected]0
-            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 "["
+              [email protected]
+                PATH_SEGMENT@425..429
+                  NAME_REF@425..429
+                    IDENT@425..429 "attr"
+              R_BRACK@429..430 "]"
+            WHITESPACE@430..431 " "
             [email protected] "&"
             [email protected]
               [email protected] "\'a"
@@ -447,16 +447,16 @@ [email protected]
           [email protected] "c"
         [email protected]
           [email protected] "("
-          ATT[email protected]5
-            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 "["
+              [email protected]
+                PATH_SEGMENT@460..464
+                  NAME_REF@460..464
+                    IDENT@460..464 "attr"
+              R_BRACK@464..465 "]"
+            WHITESPACE@465..466 " "
             [email protected] "self"
             [email protected] ":"
             [email protected] " "
@@ -478,16 +478,16 @@ [email protected]
           [email protected] "d"
         [email protected]
           [email protected] "("
-          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 "["
+              [email protected]
+                PATH_SEGMENT@493..497
+                  NAME_REF@493..497
+                    IDENT@493..497 "attr"
+              R_BRACK@497..498 "]"
+            WHITESPACE@498..499 " "
             [email protected] "self"
             [email protected] ":"
             [email protected] " "
diff --git a/crates/syntax/test_data/parser/ok/0063_variadic_fun.rast b/crates/syntax/test_data/parser/ok/0063_variadic_fun.rast
index 4009b3ff8..f7c094898 100644
--- a/crates/syntax/test_data/parser/ok/0063_variadic_fun.rast
+++ b/crates/syntax/test_data/parser/ok/0063_variadic_fun.rast
@@ -92,20 +92,20 @@ [email protected]
                       [email protected] "u8"
           [email protected] ","
           [email protected] " "
-          ATT[email protected]5
-            POUND@92..93 "#"
-            L_BRACK@93..94 "["
-            PATH@94..97
-              PATH_SEGMENT@94..97
-                NAME_REF@94..97
-                  IDENT@94..97 "cfg"
-            TOKEN_TREE@97..104
-              L_PAREN@97..98 "("
-              IDENT@98..103 "never"
-              R_PAREN@103..104 ")"
-            R_BRACK@104..105 "]"
-          WHITESPACE@105..106 " "
-          PARAM@106..120
+          PARAM@92..120
+            ATTR@92..105
+              POUND@92..93 "#"
+              L_BRACK@93..94 "["
+              [email protected]
+                PATH_SEGMENT@94..97
+                  NAME_REF@94..97
+                    IDENT@94..97 "cfg"
+              TOKEN_TREE@97..104
+                L_PAREN@97..98 "("
+                IDENT@98..103 "never"
+                R_PAREN@103..104 ")"
+              R_BRACK@104..105 "]"
+            WHITESPACE@105..106 " "
             [email protected]
               [email protected] "["
               [email protected]