Merge pull request #1060 from dtolnay/attrassign

Fix precedence of attrs on assignment expr in stmt position
dtolnay · Sep 3, 2021 · 97106b1 · 97106b1
2 parents a2701a0 + c09a2e5
commit 97106b1
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 6 deletions.
diff --git a/src/stmt.rs b/src/stmt.rs
@@ -274,8 +274,13 @@ pub mod parsing {
         let mut e = expr::parsing::expr_early(input)?;
 
         let mut attr_target = &mut e;
-        while let Expr::Binary(e) = attr_target {
-            attr_target = &mut e.left;
+        loop {
+            attr_target = match attr_target {
+                Expr::Assign(e) => &mut e.left,
+                Expr::AssignOp(e) => &mut e.left,
+                Expr::Binary(e) => &mut e.left,
+                _ => break,
+            };
         }
         attrs.extend(attr_target.replace_attrs(Vec::new()));
         attr_target.replace_attrs(attrs);

diff --git a/tests/repo/mod.rs b/tests/repo/mod.rs
@@ -26,10 +26,6 @@ static EXCLUDE: &[&str] = &[
     "src/test/ui/rfc-2632-const-trait-impl/trait-where-clause-run.rs",
     "src/test/ui/rfc-2632-const-trait-impl/trait-where-clause-self-referential.rs",
 
-    // TODO: precedence of attribute on assignment stmt
-    "src/tools/rustfmt/tests/source/attrib.rs",
-    "src/tools/rustfmt/tests/target/attrib.rs",
-
     // TODO: doc comment on match arm
     "src/tools/rustfmt/tests/source/match.rs",
     "src/tools/rustfmt/tests/target/match.rs",