fix: fixes a bug when parsing multiple {n} newlines inside help strings

clap-rs · Jul 17, 2015 · 6d214b5 · 6d214b5
1 parent f2dd2cb
commit 6d214b5
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 3 deletions.
diff --git a/Cargo.toml b/Cargo.toml
@@ -1,7 +1,7 @@
 [package]
 
 name = "clap"
-version = "1.1.1"
+version = "1.1.2"
 authors = ["Kevin K. <kbknapp@gmail.com>"]
 exclude = ["examples/*", "clap-tests/*"]
 description = "A simple to use, efficient, and full featured  Command Line Argument Parser"

diff --git a/src/macros.rs b/src/macros.rs
@@ -42,10 +42,14 @@ macro_rules! print_opt_help {
         if let Some(h) = $opt.help {
             if h.contains("{n}") {
                 let mut hel = h.split("{n}");
+                if let Some(part) = hel.next() {
+                    print!("{}", part);
+                }
                 while let Some(part) = hel.next() {
-                    print!("{}\n", part);
+                    print!("\n");
                     $me.print_spaces($spc);
-                    print!("{}", hel.next().unwrap_or(""));
+                    print!("{}", part);
+                    // print!("{}", hel.next().unwrap_or(""));
                 }
             } else {
                 print!("{}", h);