deploy: f0e8d44e6e

dev/src/uu_sort/sort.rs.html

@@ -1998,17 +1998,6 @@
 <a href="#1998" id="1998">1998</a>
 <a href="#1999" id="1999">1999</a>
 <a href="#2000" id="2000">2000</a>
-<a href="#2001" id="2001">2001</a>
-<a href="#2002" id="2002">2002</a>
-<a href="#2003" id="2003">2003</a>
-<a href="#2004" id="2004">2004</a>
-<a href="#2005" id="2005">2005</a>
-<a href="#2006" id="2006">2006</a>
-<a href="#2007" id="2007">2007</a>
-<a href="#2008" id="2008">2008</a>
-<a href="#2009" id="2009">2009</a>
-<a href="#2010" id="2010">2010</a>
-<a href="#2011" id="2011">2011</a>
 </pre><pre class="rust"><code><span class="comment">//  * This file is part of the uutils coreutils package.
 //  *
 //  * (c) Michael Yin &lt;mikeyin@mikeyin.org&gt;
@@ -2056,26 +2045,15 @@
 <span class="kw">use </span>unicode_width::UnicodeWidthStr;
 <span class="kw">use </span>uucore::display::Quotable;
 <span class="kw">use </span>uucore::error::{set_exit_code, strip_errno, UError, UResult, USimpleError, UUsageError};
-<span class="kw">use </span>uucore::format_usage;
 <span class="kw">use </span>uucore::parse_size::{ParseSizeError, Parser};
 <span class="kw">use </span>uucore::version_cmp::version_cmp;
+<span class="kw">use </span>uucore::{format_usage, help_about, help_section, help_usage};
 
 <span class="kw">use </span><span class="kw">crate</span>::tmp_dir::TmpDirWrapper;
 
-<span class="kw">const </span>ABOUT: <span class="kw-2">&amp;</span>str = <span class="string">&quot;\
-    Display sorted concatenation of all FILE(s). \
-    With no FILE, or when FILE is -, read standard input.&quot;</span>;
-<span class="kw">const </span>USAGE: <span class="kw-2">&amp;</span>str = <span class="string">&quot;{} [OPTION]... [FILE]...&quot;</span>;
-
-<span class="kw">const </span>LONG_HELP_KEYS: <span class="kw-2">&amp;</span>str = <span class="string">&quot;The key format is FIELD[.CHAR][OPTIONS][,FIELD[.CHAR]][OPTIONS].
-
-Fields by default are separated by the first whitespace after a non-whitespace character. Use -t to specify a custom separator.
-In the default case, whitespace is appended at the beginning of each field. Custom separators however are not included in fields.
-
-FIELD and CHAR both start at 1 (i.e. they are 1-indexed). If there is no end specified after a comma, the end will be the end of the line.
-If CHAR is set 0, it means the end of the field. CHAR defaults to 1 for the start position and to 0 for the end position.
-
-Valid options are: MbdfhnRrV. They override the global options for this key.&quot;</span>;
+<span class="kw">const </span>ABOUT: <span class="kw-2">&amp;</span>str = <span class="macro">help_about!</span>(<span class="string">&quot;sort.md&quot;</span>);
+<span class="kw">const </span>USAGE: <span class="kw-2">&amp;</span>str = <span class="macro">help_usage!</span>(<span class="string">&quot;sort.md&quot;</span>);
+<span class="kw">const </span>AFTER_HELP: <span class="kw-2">&amp;</span>str = <span class="macro">help_section!</span>(<span class="string">&quot;after help&quot;</span>, <span class="string">&quot;sort.md&quot;</span>);
 
 <span class="kw">mod </span>options {
     <span class="kw">pub mod </span>modes {
@@ -3303,7 +3281,7 @@ Valid options are: MbdfhnRrV. They override the global options for this key.&quo
     Command::new(uucore::util_name())
         .version(<span class="macro">crate_version!</span>())
         .about(ABOUT)
-        .after_help(LONG_HELP_KEYS)
+        .after_help(AFTER_HELP)
         .override_usage(format_usage(USAGE))
         .infer_long_args(<span class="bool-val">true</span>)
         .disable_help_flag(<span class="bool-val">true</span>)

dev/src/uu_timeout/timeout.rs.html

@@ -402,12 +402,12 @@
 </span><span class="kw">use </span>uucore::signals::enable_pipe_errors;
 
 <span class="kw">use </span>uucore::{
-    format_usage, show_error,
+    format_usage, help_about, help_usage, show_error,
     signals::{signal_by_name_or_value, signal_name_by_value},
 };
 
-<span class="kw">static </span>ABOUT: <span class="kw-2">&amp;</span>str = <span class="string">&quot;Start COMMAND, and kill it if still running after DURATION.&quot;</span>;
-<span class="kw">const </span>USAGE: <span class="kw-2">&amp;</span>str = <span class="string">&quot;{} [OPTION] DURATION COMMAND...&quot;</span>;
+<span class="kw">const </span>ABOUT: <span class="kw-2">&amp;</span>str = <span class="macro">help_about!</span>(<span class="string">&quot;timeout.md&quot;</span>);
+<span class="kw">const </span>USAGE: <span class="kw-2">&amp;</span>str = <span class="macro">help_usage!</span>(<span class="string">&quot;timeout.md&quot;</span>);
 
 <span class="kw">pub mod </span>options {
     <span class="kw">pub static </span>FOREGROUND: <span class="kw-2">&amp;</span>str = <span class="string">&quot;foreground&quot;</span>;

dev/src/uu_tr/tr.rs.html

@@ -167,8 +167,6 @@
 <a href="#167" id="167">167</a>
 <a href="#168" id="168">168</a>
 <a href="#169" id="169">169</a>
-<a href="#170" id="170">170</a>
-<a href="#171" id="171">171</a>
 </pre><pre class="rust"><code><span class="comment">//  * This file is part of the uutils coreutils package.
 //  *
 //  * For the full copyright and license information, please view the LICENSE
@@ -184,17 +182,15 @@
 <span class="kw">use </span>nom::AsBytes;
 <span class="kw">use </span>operation::{translate_input, Sequence, SqueezeOperation, TranslateOperation};
 <span class="kw">use </span>std::io::{stdin, stdout, BufReader, BufWriter};
-<span class="kw">use </span>uucore::{format_usage, show};
+<span class="kw">use </span>uucore::{format_usage, help_about, help_section, help_usage, show};
 
 <span class="kw">use </span><span class="kw">crate</span>::operation::DeleteOperation;
 <span class="kw">use </span>uucore::display::Quotable;
 <span class="kw">use </span>uucore::error::{UResult, USimpleError, UUsageError};
 
-<span class="kw">const </span>ABOUT: <span class="kw-2">&amp;</span>str = <span class="string">&quot;Translate or delete characters&quot;</span>;
-<span class="kw">const </span>USAGE: <span class="kw-2">&amp;</span>str = <span class="string">&quot;{} [OPTION]... SET1 [SET2]&quot;</span>;
-<span class="kw">const </span>LONG_USAGE: <span class="kw-2">&amp;</span>str = <span class="string">&quot;\
-    Translate, squeeze, and/or delete characters from standard input, \
-    writing to standard output.&quot;</span>;
+<span class="kw">const </span>ABOUT: <span class="kw-2">&amp;</span>str = <span class="macro">help_about!</span>(<span class="string">&quot;tr.md&quot;</span>);
+<span class="kw">const </span>AFTER_HELP: <span class="kw-2">&amp;</span>str = <span class="macro">help_section!</span>(<span class="string">&quot;after help&quot;</span>, <span class="string">&quot;tr.md&quot;</span>);
+<span class="kw">const </span>USAGE: <span class="kw-2">&amp;</span>str = <span class="macro">help_usage!</span>(<span class="string">&quot;tr.md&quot;</span>);
 
 <span class="kw">mod </span>options {
     <span class="kw">pub const </span>COMPLEMENT: <span class="kw-2">&amp;</span>str = <span class="string">&quot;complement&quot;</span>;
@@ -208,7 +204,7 @@
 </span><span class="kw">pub fn </span>uumain(args: <span class="kw">impl </span>uucore::Args) -&gt; UResult&lt;()&gt; {
     <span class="kw">let </span>args = args.collect_lossy();
 
-    <span class="kw">let </span>matches = uu_app().after_help(LONG_USAGE).try_get_matches_from(args)<span class="question-mark">?</span>;
+    <span class="kw">let </span>matches = uu_app().after_help(AFTER_HELP).try_get_matches_from(args)<span class="question-mark">?</span>;
 
     <span class="kw">let </span>delete_flag = matches.get_flag(options::DELETE);
     <span class="kw">let </span>complement_flag = matches.get_flag(options::COMPLEMENT);