Merge pull request #54 from dtolnay/bracket

Fix parsing of angle brackets in writedoc expr argument
dtolnay · Jan 29, 2023 · bdfa483 · bdfa483
2 parents a8f5edf + f9e455e
commit bdfa483
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 3 deletions.
diff --git a/src/expr.rs b/src/expr.rs
@@ -10,6 +10,7 @@ pub fn parse(input: &mut TokenIter) -> Result<Expr> {
     enum Lookbehind {
         JointColon,
         DoubleColon,
+        JointHyphen,
         Other,
     }
 
@@ -31,10 +32,11 @@ pub fn parse(input: &mut TokenIter) -> Result<Expr> {
                         angle_bracket_depth += 1;
                         Lookbehind::Other
                     }
-                    '>' if angle_bracket_depth > 0 => {
+                    '>' if angle_bracket_depth > 0 && lookbehind != Lookbehind::JointHyphen => {
                         angle_bracket_depth -= 1;
                         Lookbehind::Other
                     }
+                    '-' if spacing == Spacing::Joint => Lookbehind::JointHyphen,
                     _ => Lookbehind::Other,
                 };
             }

diff --git a/tests/test_writedoc.rs b/tests/test_writedoc.rs
@@ -42,13 +42,13 @@ fn test_angle_bracket_parsing() {
     const ZERO: usize = 0;
 
     struct Pair<A, B>(A, B);
-    impl Pair<(), ()> {
+    impl<A, B> Pair<A, B> {
         const ONE: usize = 1;
     }
 
     let mut s = String::new();
     let _ = writedoc! {
-        if ZERO < Pair::<(), ()>::ONE { &mut s } else { &mut s },
+        if ZERO < Pair::<fn() -> (), ()>::ONE { &mut s } else { &mut s },
         "writedoc",
     };