Merge #6965

bors[bot] · Veykril · web-flow · commit 9bb9fbab3ab6 · 2020-12-21T08:54:31.000Z
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> ``` LET_STMT@200..236 LET_KW@200..203 "let" WHITESPACE@203..204 " " IDENT_PAT@204..206 NAME@204..206 IDENT@204..206 "_a" WHITESPACE@206..207 " " EQ@207..208 "=" WHITESPACE@208..209 " " ARRAY_EXPR@209..235 L_BRACK@209..210 "[" LITERAL@210..211 INT_NUMBER@210..211 "0" COMMA@211..212 "," LITERAL@212..234 ATTR@212..233 POUND@212..213 "#" L_BRACK@213..214 "[" PATH@214..217 PATH_SEGMENT@214..217 NAME_REF@214..217 IDENT@214..217 "cfg" TOKEN_TREE@217..232 L_PAREN@217..218 "(" IDENT@218..225 "feature" WHITESPACE@225..226 " " EQ@226..227 "=" WHITESPACE@227..228 " " STRING@228..231 "\"L\"" R_PAREN@231..232 ")" R_BRACK@232..233 "]" INT_NUMBER@233..234 "0" R_BRACK@234..235 "]" SEMICOLON@235..236 ";" ``` </details> Co-authored-by: Lukas Wirth <lukastw97@gmail.com>
diff --git 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
@@ -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/inline/ok/0154_tuple_attrs.rast b/crates/syntax/test_data/parser/inline/ok/0154_tuple_attrs.rast
@@ -0,0 +1,50 @@
+SOURCE_FILE@0..43
+  CONST@0..42
+    CONST_KW@0..5 "const"
+    WHITESPACE@5..6 " "
+    NAME@6..7
+      IDENT@6..7 "A"
+    COLON@7..8 ":"
+    WHITESPACE@8..9 " "
+    TUPLE_TYPE@9..19
+      L_PAREN@9..10 "("
+      PATH_TYPE@10..13
+        PATH@10..13
+          PATH_SEGMENT@10..13
+            NAME_REF@10..13
+              IDENT@10..13 "i64"
+      COMMA@13..14 ","
+      WHITESPACE@14..15 " "
+      PATH_TYPE@15..18
+        PATH@15..18
+          PATH_SEGMENT@15..18
+            NAME_REF@15..18
+              IDENT@15..18 "i64"
+      R_PAREN@18..19 ")"
+    WHITESPACE@19..20 " "
+    EQ@20..21 "="
+    WHITESPACE@21..22 " "
+    TUPLE_EXPR@22..41
+      L_PAREN@22..23 "("
+      LITERAL@23..24
+        INT_NUMBER@23..24 "1"
+      COMMA@24..25 ","
+      WHITESPACE@25..26 " "
+      LITERAL@26..40
+        ATTR@26..38
+          POUND@26..27 "#"
+          L_BRACK@27..28 "["
+          PATH@28..31
+            PATH_SEGMENT@28..31
+              NAME_REF@28..31
+                IDENT@28..31 "cfg"
+          TOKEN_TREE@31..37
+            L_PAREN@31..32 "("
+            IDENT@32..36 "test"
+            R_PAREN@36..37 ")"
+          R_BRACK@37..38 "]"
+        WHITESPACE@38..39 " "
+        INT_NUMBER@39..40 "2"
+      R_PAREN@40..41 ")"
+    SEMICOLON@41..42 ";"
+  WHITESPACE@42..43 "\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
@@ -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
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] " "
Original file line number	Diff line number	Diff line change
`@@ -0,0 +1 @@`
	`1`	`+const A: (i64, i64) = (1, #[cfg(test)] 2);`