Fix tree format parsing for bare }

Author: ehuss

src/cargo/ops/tree/format/parse.rs

@@ -79,7 +79,7 @@ impl<'a> Parser<'a> {
     fn text(&mut self, start: usize) -> RawChunk<'a> {
         while let Some(&(pos, ch)) = self.it.peek() {
             match ch {
-                '{' | '}' | ')' => return RawChunk::Text(&self.s[start..pos]),
+                '{' | '}' => return RawChunk::Text(&self.s[start..pos]),
                 _ => {
                     self.it.next();
                 }
@@ -110,7 +110,11 @@ impl<'a> Iterator for Parser<'a> {
             }
             Some(&(_, '}')) => {
                 self.it.next();
-                Some(RawChunk::Error("unexpected '}'"))
+                if self.consume('}') {
+                    Some(RawChunk::Text("}"))
+                } else {
+                    Some(RawChunk::Error("unexpected '}'"))
+                }
             }
             Some(&(i, _)) => Some(self.text(i)),
             None => None,

tests/testsuite/tree.rs

@@ -903,6 +903,10 @@ Caused by:
         .with_status(101)
         .run();
 
+    p.cargo("tree --format {p}-{{hello}}")
+        .with_stdout("foo v0.1.0 ([..]/foo)-{hello}")
+        .run();
+
     p.cargo("tree --format")
         .arg("{p} {l} {r}")
         .with_stdout("foo v0.1.0 ([..]/foo) MIT https://github.com/rust-lang/cargo")