Auto merge of #13168 - leonzchang:handlebars-v4, r=epage

chore(deps): update rust crate handlebars to `v4.5.0`

In the latest version of `handlebars`, rules for whitespace auto elimination is to check if the directive `{{# xxx}}`` and ``{{/ xxx}}` is holding a whole line, with leading and trailing whitespaces counted, and then remove the trailing NEWLINE (See [`template.rs`](https://github.com/sunng87/handlebars-rust/blob/9d7d5556287e31e4148841a56e0981b64a679fb6/src/template.rs#L568-L889)).

```md
{{#options}}
                              <--- this newline will be removed after a standalone block
{{#option "`-o` _outdir_"}}
                              <--- this newline will be removed
Some content

{{/option}}
                              <--- this newline will be removed
{{/options}}
                              <--- this newline will be removed
```

This PR changes includes (fixes #13162):
1. update `handlebars` crate to `v4.5.0`.
2. add extra NEWLINE to helper blocks `options`, `option` to align with the new strip rules, preserving the original behavior.
3. update doc(the rest handlebars expression) to align with the new strip rules..

Author: bors

Cargo.lock

@@ -48,7 +48,7 @@ git2-curl = "0.19.0"
 gix = { version = "0.56.0", default-features = false, features = ["blocking-http-transport-curl", "progress-tree", "revision"] }
 gix-features-for-configuration-only = { version = "0.35.0", package = "gix-features", features = [ "parallel" ] }
 glob = "0.3.1"
-handlebars = { version = "3.5.5", features = ["dir_source"] }
+handlebars = { version = "4.5.0", features = ["dir_source"] }
 hex = "0.4.3"
 hmac = "0.12.1"
 home = "0.5.5"

Cargo.toml

@@ -49,7 +49,6 @@ man page:
 - Other helpers include:
     - `{{lower value}}` Converts the given value to lowercase.
 
-
 ## OPTIONS
 
 <dl>

crates/mdman/doc/out/mdman.md

@@ -30,11 +30,11 @@ impl super::Formatter for MdFormatter {
     }
 
     fn render_options_start(&self) -> &'static str {
-        "<dl>"
+        "<dl>\n"
     }
 
     fn render_options_end(&self) -> &'static str {
-        "</dl>"
+        "</dl>\n"
     }
 
     fn render_option(&self, params: &[&str], block: &str, man_name: &str) -> Result<String, Error> {
@@ -67,7 +67,7 @@ impl super::Formatter for MdFormatter {
         let rendered_block = self.render_html(block)?;
         write!(
             result,
-            "<dd class=\"option-desc\">{}</dd>\n",
+            "<dd class=\"option-desc\">{}</dd>\n\n",
             unwrap_p(&rendered_block)
         )?;
         Ok(result)

crates/mdman/src/format/md.rs

@@ -26,11 +26,11 @@ impl super::Formatter for TextFormatter {
     fn render_options_start(&self) -> &'static str {
         // Tell pulldown_cmark to ignore this.
         // This will be stripped out later.
-        "<![CDATA["
+        "<![CDATA[\n"
     }
 
     fn render_options_end(&self) -> &'static str {
-        "]]>"
+        "]]>\n"
     }
 
     fn render_option(
@@ -46,7 +46,7 @@ impl super::Formatter for TextFormatter {
         let trimmed: Vec<_> = rendered_options.iter().map(|o| o.trim()).collect();
         // Wrap in HTML tags, they will be stripped out during rendering.
         Ok(format!(
-            "<dt>{}</dt>\n<dd>{}</dd>\n<br>\n",
+            "<dt>{}</dt>\n<dd>\n{}</dd>\n<br>\n",
             trimmed.join(", "),
             block
         ))

crates/mdman/src/format/text.rs

@@ -32,6 +32,7 @@ Shortcut unknown: [shortcut unknown]
 
 {{> links-include}}
 
+
 ## OPTIONS
 
 {{#options}}

crates/mdman/tests/compare/links.md

@@ -46,6 +46,7 @@ A named argument.
 
 {{> options-common}}
 
+
 ## EXAMPLES
 
 1. An example

crates/mdman/tests/compare/options.md

@@ -2,6 +2,7 @@
 
 {{*set foo="Bar"}}
 
+
 {{foo}}
 
 {{lower foo}}

crates/mdman/tests/compare/vars.md

@@ -24,6 +24,7 @@ See <https://doc.rust-lang.org/rustc/index.html> for documentation on rustc
 flags.
 
 {{> description-one-target }}
+
 To pass flags to all compiler processes spawned by Cargo, use the `RUSTFLAGS`
 [environment variable](../reference/environment-variables.html) or the
 `build.rustflags` [config value](../reference/config.html).

src/doc/man/cargo-rustc.md

@@ -24,6 +24,7 @@ See <https://doc.rust-lang.org/rustdoc/index.html> for documentation on rustdoc
 flags.
 
 {{> description-one-target }}
+
 To pass flags to all rustdoc processes spawned by Cargo, use the
 `RUSTDOCFLAGS` [environment variable](../reference/environment-variables.html)
 or the `build.rustdocflags` [config value](../reference/config.html).