This commit is contained in:
sylvestre
2023-06-29 02:58:09 +00:00
parent 0745084956
commit fb3e768701
+7 -7
View File
@@ -389,7 +389,7 @@
<span class="kw">const </span>OPT_SEPARATOR: <span class="kw-2">&amp;</span>str = <span class="string">&quot;separator&quot;</span>;
<span class="kw">const </span>OPT_TERMINATOR: <span class="kw-2">&amp;</span>str = <span class="string">&quot;terminator&quot;</span>;
<span class="kw">const </span>OPT_WIDTHS: <span class="kw-2">&amp;</span>str = <span class="string">&quot;widths&quot;</span>;
<span class="kw">const </span>OPT_EQUAL_WIDTH: <span class="kw-2">&amp;</span>str = <span class="string">&quot;equal-width&quot;</span>;
<span class="kw">const </span>OPT_FORMAT: <span class="kw-2">&amp;</span>str = <span class="string">&quot;format&quot;</span>;
<span class="kw">const </span>ARG_NUMBERS: <span class="kw-2">&amp;</span>str = <span class="string">&quot;numbers&quot;</span>;
@@ -398,7 +398,7 @@
</span><span class="kw">struct </span>SeqOptions&lt;<span class="lifetime">&#39;a</span>&gt; {
separator: String,
terminator: String,
widths: bool,
equal_width: bool,
format: <span class="prelude-ty">Option</span>&lt;<span class="kw-2">&amp;</span><span class="lifetime">&#39;a </span>str&gt;,
}
@@ -432,7 +432,7 @@
.map(|s| s.as_str())
.unwrap_or(<span class="string">&quot;\n&quot;</span>)
.to_string(),
widths: matches.get_flag(OPT_WIDTHS),
equal_width: matches.get_flag(OPT_EQUAL_WIDTH),
format: matches.get_one::&lt;String&gt;(OPT_FORMAT).map(|s| s.as_str()),
};
@@ -481,7 +481,7 @@
(first, increment, last),
<span class="kw-2">&amp;</span>options.separator,
<span class="kw-2">&amp;</span>options.terminator,
options.widths,
options.equal_width,
padding,
options.format,
)
@@ -495,7 +495,7 @@
largest_dec,
<span class="kw-2">&amp;</span>options.separator,
<span class="kw-2">&amp;</span>options.terminator,
options.widths,
options.equal_width,
padding,
options.format,
),
@@ -528,9 +528,9 @@
.help(<span class="string">&quot;Terminator character (defaults to \\n)&quot;</span>),
)
.arg(
Arg::new(OPT_WIDTHS)
Arg::new(OPT_EQUAL_WIDTH)
.short(<span class="string">&#39;w&#39;</span>)
.long(<span class="string">&quot;widths&quot;</span>)
.long(<span class="string">&quot;equal-width&quot;</span>)
.help(<span class="string">&quot;Equalize widths of all numbers by padding with zeros&quot;</span>)
.action(ArgAction::SetTrue),
)