Skip to content

Commit a771685

Browse files
sylvestresylvestre
committed
deploy: 055173b 
1 parent 6159501 commit a771685

File tree

585 files changed

+1869
-2259
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

585 files changed

+1869
-2259
lines changed

‎dev/search-index.js

Lines changed: 2 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎dev/source-files.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -114,7 +114,7 @@ sourcesIndex["uu_cp"] = {"name":"","files":["cp.rs"]};
114114
sourcesIndex["uu_csplit"] = {"name":"","files":["csplit.rs","csplit_error.rs","patterns.rs","split_name.rs"]};
115115
sourcesIndex["uu_cut"] = {"name":"","files":["cut.rs","searcher.rs"]};
116116
sourcesIndex["uu_date"] = {"name":"","files":["date.rs"]};
117-
sourcesIndex["uu_dd"] = {"name":"","files":["conversion_tables.rs","datastructures.rs","dd.rs","parseargs.rs","progress.rs"]};
117+
sourcesIndex["uu_dd"] = {"name":"","files":["blocks.rs","conversion_tables.rs","datastructures.rs","dd.rs","parseargs.rs","progress.rs"]};
118118
sourcesIndex["uu_df"] = {"name":"","files":["df.rs","table.rs"]};
119119
sourcesIndex["uu_dircolors"] = {"name":"","files":["colors.rs","dircolors.rs"]};
120120
sourcesIndex["uu_dirname"] = {"name":"","files":["dirname.rs"]};

‎dev/src/uu_base32/base32.rs.html

Lines changed: 3 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -48,9 +48,6 @@
4848
<span id="47">47</span>
4949
<span id="48">48</span>
5050
<span id="49">49</span>
51-
<span id="50">50</span>
52-
<span id="51">51</span>
53-
<span id="52">52</span>
5451
</pre><pre class="rust"><code><span class="comment">// This file is part of the uutils coreutils package.</span>
5552
<span class="comment">//</span>
5653
<span class="comment">// (c) Jian Zeng &lt;anonymousknight96@gmail.com&gt;</span>
@@ -75,16 +72,13 @@
7572
encoded stream.
7673
&quot;</span>;
7774

78-
<span class="kw">fn</span> <span class="ident">usage</span>() -&gt; <span class="ident">String</span> {
79-
<span class="macro">format!</span>(<span class="string">&quot;{0} [OPTION]... [FILE]&quot;</span>, <span class="ident">uucore::execution_phrase</span>())
80-
}
75+
<span class="kw">const</span> <span class="ident">USAGE</span>: <span class="kw-2">&amp;</span><span class="ident">str</span> <span class="op">=</span> <span class="string">&quot;{} [OPTION]... [FILE]&quot;</span>;
8176

8277
<span class="attribute">#[<span class="ident">uucore::main</span>]</span>
8378
<span class="kw">pub</span> <span class="kw">fn</span> <span class="ident">uumain</span>(<span class="ident">args</span>: <span class="kw">impl</span> <span class="ident">uucore::Args</span>) -&gt; <span class="ident">UResult</span><span class="op">&lt;</span>()<span class="op">&gt;</span> {
8479
<span class="kw">let</span> <span class="ident">format</span> <span class="op">=</span> <span class="ident">Format::Base32</span>;
85-
<span class="kw">let</span> <span class="ident">usage</span> <span class="op">=</span> <span class="ident">usage</span>();
8680

87-
<span class="kw">let</span> <span class="ident">config</span>: <span class="ident">base_common::Config</span> <span class="op">=</span> <span class="ident">base_common::parse_base_cmd_args</span>(<span class="ident">args</span>, <span class="ident">ABOUT</span>, <span class="kw-2">&amp;</span><span class="ident">usage</span>)<span class="question-mark">?</span>;
81+
<span class="kw">let</span> <span class="ident">config</span>: <span class="ident">base_common::Config</span> <span class="op">=</span> <span class="ident">base_common::parse_base_cmd_args</span>(<span class="ident">args</span>, <span class="ident">ABOUT</span>, <span class="ident">USAGE</span>)<span class="question-mark">?</span>;
8882

8983
<span class="comment">// Create a reference to stdin so we can return a locked stdin from</span>
9084
<span class="comment">// parse_base_cmd_args</span>
@@ -101,7 +95,7 @@
10195
}
10296

10397
<span class="kw">pub</span> <span class="kw">fn</span> <span class="ident">uu_app</span><span class="op">&lt;</span><span class="lifetime">&#39;a</span><span class="op">&gt;</span>() -&gt; <span class="ident">App</span><span class="op">&lt;</span><span class="lifetime">&#39;a</span><span class="op">&gt;</span> {
104-
<span class="ident">base_common::base_app</span>(<span class="ident">ABOUT</span>)
98+
<span class="ident">base_common::base_app</span>(<span class="ident">ABOUT</span>, <span class="ident">USAGE</span>)
10599
}
106100
</code></pre></div>
107101
</section><section id="search" class="content hidden"></section><div id="rustdoc-vars" data-root-path="../../" data-current-crate="uu_base32" data-search-index-js="../../search-index.js" data-search-js="../../search.js"></div>

‎dev/src/uu_base32/base_common.rs.html

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -177,6 +177,7 @@
177177
<span id="176">176</span>
178178
<span id="177">177</span>
179179
<span id="178">178</span>
180+
<span id="179">179</span>
180181
</pre><pre class="rust"><code><span class="comment">// This file is part of the uutils coreutils package.</span>
181182
<span class="comment">//</span>
182183
<span class="comment">// (c) Jordy Dickinson &lt;jordy.dickinson@gmail.com&gt;</span>
@@ -191,7 +192,7 @@
191192
<span class="kw">use</span> <span class="ident">uucore::display::Quotable</span>;
192193
<span class="kw">use</span> <span class="ident">uucore::encoding</span>::{<span class="ident">wrap_print</span>, <span class="ident">Data</span>, <span class="ident">Format</span>};
193194
<span class="kw">use</span> <span class="ident">uucore::error</span>::{<span class="ident">FromIo</span>, <span class="ident">UResult</span>, <span class="ident">USimpleError</span>, <span class="ident">UUsageError</span>};
194-
<span class="kw">use</span> <span class="ident">uucore::InvalidEncodingHandling</span>;
195+
<span class="kw">use</span> <span class="ident">uucore</span>::{<span class="ident">format_usage</span>, <span class="ident">InvalidEncodingHandling</span>};
195196

196197
<span class="kw">use</span> <span class="ident">std::fs::File</span>;
197198
<span class="kw">use</span> <span class="ident">std::io</span>::{<span class="ident">BufReader</span>, <span class="ident">Stdin</span>};
@@ -265,17 +266,18 @@
265266
}
266267

267268
<span class="kw">pub</span> <span class="kw">fn</span> <span class="ident">parse_base_cmd_args</span>(<span class="ident">args</span>: <span class="kw">impl</span> <span class="ident">uucore::Args</span>, <span class="ident">about</span>: <span class="kw-2">&amp;</span><span class="ident">str</span>, <span class="ident">usage</span>: <span class="kw-2">&amp;</span><span class="ident">str</span>) -&gt; <span class="ident">UResult</span><span class="op">&lt;</span><span class="ident">Config</span><span class="op">&gt;</span> {
268-
<span class="kw">let</span> <span class="ident">app</span> <span class="op">=</span> <span class="ident">base_app</span>(<span class="ident">about</span>).<span class="ident">override_usage</span>(<span class="ident">usage</span>);
269+
<span class="kw">let</span> <span class="ident">app</span> <span class="op">=</span> <span class="ident">base_app</span>(<span class="ident">about</span>, <span class="ident">usage</span>);
269270
<span class="kw">let</span> <span class="ident">arg_list</span> <span class="op">=</span> <span class="ident">args</span>
270271
.<span class="ident">collect_str</span>(<span class="ident">InvalidEncodingHandling::ConvertLossy</span>)
271272
.<span class="ident">accept_any</span>();
272273
<span class="ident">Config::from</span>(<span class="kw-2">&amp;</span><span class="ident">app</span>.<span class="ident">get_matches_from</span>(<span class="ident">arg_list</span>))
273274
}
274275

275-
<span class="kw">pub</span> <span class="kw">fn</span> <span class="ident">base_app</span>(<span class="ident">about</span>: <span class="kw-2">&amp;</span><span class="ident">str</span>) -&gt; <span class="ident">App</span> {
276+
<span class="kw">pub</span> <span class="kw">fn</span> <span class="ident">base_app</span><span class="op">&lt;</span><span class="lifetime">&#39;a</span><span class="op">&gt;</span>(<span class="ident">about</span>: <span class="kw-2">&amp;</span><span class="lifetime">&#39;a</span> <span class="ident">str</span>, <span class="ident">usage</span>: <span class="kw-2">&amp;</span><span class="lifetime">&#39;a</span> <span class="ident">str</span>) -&gt; <span class="ident">App</span><span class="op">&lt;</span><span class="lifetime">&#39;a</span><span class="op">&gt;</span> {
276277
<span class="ident">App::new</span>(<span class="ident">uucore::util_name</span>())
277278
.<span class="ident">version</span>(<span class="macro">crate_version!</span>())
278279
.<span class="ident">about</span>(<span class="ident">about</span>)
280+
.<span class="ident">override_usage</span>(<span class="ident">format_usage</span>(<span class="ident">usage</span>))
279281
.<span class="ident">setting</span>(<span class="ident">AppSettings::InferLongArgs</span>)
280282
<span class="comment">// Format arguments.</span>
281283
.<span class="ident">arg</span>(

‎dev/src/uu_base64/base64.rs.html

Lines changed: 2 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -45,9 +45,6 @@
4545
<span id="44">44</span>
4646
<span id="45">45</span>
4747
<span id="46">46</span>
48-
<span id="47">47</span>
49-
<span id="48">48</span>
50-
<span id="49">49</span>
5148
</pre><pre class="rust"><code><span class="comment">// This file is part of the uutils coreutils package.</span>
5249
<span class="comment">//</span>
5350
<span class="comment">// (c) Jordy Dickinson &lt;jordy.dickinson@gmail.com&gt;</span>
@@ -73,16 +70,13 @@
7370
encoded stream.
7471
&quot;</span>;
7572

76-
<span class="kw">fn</span> <span class="ident">usage</span>() -&gt; <span class="ident">String</span> {
77-
<span class="macro">format!</span>(<span class="string">&quot;{0} [OPTION]... [FILE]&quot;</span>, <span class="ident">uucore::execution_phrase</span>())
78-
}
73+
<span class="kw">const</span> <span class="ident">USAGE</span>: <span class="kw-2">&amp;</span><span class="ident">str</span> <span class="op">=</span> <span class="string">&quot;{0} [OPTION]... [FILE]&quot;</span>;
7974

8075
<span class="attribute">#[<span class="ident">uucore::main</span>]</span>
8176
<span class="kw">pub</span> <span class="kw">fn</span> <span class="ident">uumain</span>(<span class="ident">args</span>: <span class="kw">impl</span> <span class="ident">uucore::Args</span>) -&gt; <span class="ident">UResult</span><span class="op">&lt;</span>()<span class="op">&gt;</span> {
8277
<span class="kw">let</span> <span class="ident">format</span> <span class="op">=</span> <span class="ident">Format::Base64</span>;
83-
<span class="kw">let</span> <span class="ident">usage</span> <span class="op">=</span> <span class="ident">usage</span>();
8478

85-
<span class="kw">let</span> <span class="ident">config</span>: <span class="ident">base_common::Config</span> <span class="op">=</span> <span class="ident">base_common::parse_base_cmd_args</span>(<span class="ident">args</span>, <span class="ident">ABOUT</span>, <span class="kw-2">&amp;</span><span class="ident">usage</span>)<span class="question-mark">?</span>;
79+
<span class="kw">let</span> <span class="ident">config</span>: <span class="ident">base_common::Config</span> <span class="op">=</span> <span class="ident">base_common::parse_base_cmd_args</span>(<span class="ident">args</span>, <span class="ident">ABOUT</span>, <span class="ident">USAGE</span>)<span class="question-mark">?</span>;
8680

8781
<span class="comment">// Create a reference to stdin so we can return a locked stdin from</span>
8882
<span class="comment">// parse_base_cmd_args</span>

‎dev/src/uu_basename/basename.rs.html

Lines changed: 5 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -145,11 +145,6 @@
145145
<span id="144">144</span>
146146
<span id="145">145</span>
147147
<span id="146">146</span>
148-
<span id="147">147</span>
149-
<span id="148">148</span>
150-
<span id="149">149</span>
151-
<span id="150">150</span>
152-
<span id="151">151</span>
153148
</pre><pre class="rust"><code><span class="comment">// This file is part of the uutils coreutils package.</span>
154149
<span class="comment">//</span>
155150
<span class="comment">// (c) Jimmy Lu &lt;jimmy.lu.2011@gmail.com&gt;</span>
@@ -163,18 +158,13 @@
163158
<span class="kw">use</span> <span class="ident">std::path</span>::{<span class="ident">is_separator</span>, <span class="ident">PathBuf</span>};
164159
<span class="kw">use</span> <span class="ident">uucore::display::Quotable</span>;
165160
<span class="kw">use</span> <span class="ident">uucore::error</span>::{<span class="ident">UResult</span>, <span class="ident">UUsageError</span>};
166-
<span class="kw">use</span> <span class="ident">uucore::InvalidEncodingHandling</span>;
161+
<span class="kw">use</span> <span class="ident">uucore</span>::{<span class="ident">format_usage</span>, <span class="ident">InvalidEncodingHandling</span>};
167162

168163
<span class="kw">static</span> <span class="ident">SUMMARY</span>: <span class="kw-2">&amp;</span><span class="ident">str</span> <span class="op">=</span> <span class="string">&quot;Print NAME with any leading directory components removed
169164
If specified, also remove a trailing SUFFIX&quot;</span>;
170165

171-
<span class="kw">fn</span> <span class="ident">usage</span>() -&gt; <span class="ident">String</span> {
172-
<span class="macro">format!</span>(
173-
<span class="string">&quot;{0} NAME [SUFFIX]
174-
{0} OPTION... NAME...&quot;</span>,
175-
<span class="ident">uucore::execution_phrase</span>()
176-
)
177-
}
166+
<span class="kw">const</span> <span class="ident">USAGE</span>: <span class="kw-2">&amp;</span><span class="ident">str</span> <span class="op">=</span> <span class="string">&quot;{} NAME [SUFFIX]
167+
{} OPTION... NAME...&quot;</span>;
178168

179169
<span class="kw">pub</span> <span class="kw">mod</span> <span class="ident">options</span> {
180170
<span class="kw">pub</span> <span class="kw">static</span> <span class="ident">MULTIPLE</span>: <span class="kw-2">&amp;</span><span class="ident">str</span> <span class="op">=</span> <span class="string">&quot;multiple&quot;</span>;
@@ -188,11 +178,10 @@
188178
<span class="kw">let</span> <span class="ident">args</span> <span class="op">=</span> <span class="ident">args</span>
189179
.<span class="ident">collect_str</span>(<span class="ident">InvalidEncodingHandling::ConvertLossy</span>)
190180
.<span class="ident">accept_any</span>();
191-
<span class="kw">let</span> <span class="ident">usage</span> <span class="op">=</span> <span class="ident">usage</span>();
192181
<span class="comment">//</span>
193182
<span class="comment">// Argument parsing</span>
194183
<span class="comment">//</span>
195-
<span class="kw">let</span> <span class="ident">matches</span> <span class="op">=</span> <span class="ident">uu_app</span>().<span class="ident">override_usage</span>(<span class="kw-2">&amp;</span><span class="ident">usage</span>[..]).<span class="ident">get_matches_from</span>(<span class="ident">args</span>);
184+
<span class="kw">let</span> <span class="ident">matches</span> <span class="op">=</span> <span class="ident">uu_app</span>().<span class="ident">get_matches_from</span>(<span class="ident">args</span>);
196185

197186
<span class="comment">// too few arguments</span>
198187
<span class="kw">if</span> <span class="op">!</span><span class="ident">matches</span>.<span class="ident">is_present</span>(<span class="ident">options::NAME</span>) {
@@ -249,6 +238,7 @@
249238
<span class="ident">App::new</span>(<span class="ident">uucore::util_name</span>())
250239
.<span class="ident">version</span>(<span class="macro">crate_version!</span>())
251240
.<span class="ident">about</span>(<span class="ident">SUMMARY</span>)
241+
.<span class="ident">override_usage</span>(<span class="ident">format_usage</span>(<span class="ident">USAGE</span>))
252242
.<span class="ident">setting</span>(<span class="ident">AppSettings::InferLongArgs</span>)
253243
.<span class="ident">arg</span>(
254244
<span class="ident">Arg::new</span>(<span class="ident">options::MULTIPLE</span>)

‎dev/src/uu_basenc/basenc.rs.html

Lines changed: 3 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -79,9 +79,6 @@
7979
<span id="78">78</span>
8080
<span id="79">79</span>
8181
<span id="80">80</span>
82-
<span id="81">81</span>
83-
<span id="82">82</span>
84-
<span id="83">83</span>
8582
</pre><pre class="rust"><code><span class="comment">// This file is part of the uutils coreutils package.</span>
8683
<span class="comment">//</span>
8784
<span class="comment">// (c) Jordy Dickinson &lt;jordy.dickinson@gmail.com&gt;</span>
@@ -122,21 +119,18 @@
122119
(<span class="string">&quot;z85&quot;</span>, <span class="ident">Format::Z85</span>),
123120
];
124121

125-
<span class="kw">fn</span> <span class="ident">usage</span>() -&gt; <span class="ident">String</span> {
126-
<span class="macro">format!</span>(<span class="string">&quot;{0} [OPTION]... [FILE]&quot;</span>, <span class="ident">uucore::execution_phrase</span>())
127-
}
122+
<span class="kw">const</span> <span class="ident">USAGE</span>: <span class="kw-2">&amp;</span><span class="ident">str</span> <span class="op">=</span> <span class="string">&quot;{} [OPTION]... [FILE]&quot;</span>;
128123

129124
<span class="kw">pub</span> <span class="kw">fn</span> <span class="ident">uu_app</span><span class="op">&lt;</span><span class="lifetime">&#39;a</span><span class="op">&gt;</span>() -&gt; <span class="ident">App</span><span class="op">&lt;</span><span class="lifetime">&#39;a</span><span class="op">&gt;</span> {
130-
<span class="kw">let</span> <span class="kw-2">mut</span> <span class="ident">app</span> <span class="op">=</span> <span class="ident">base_common::base_app</span>(<span class="ident">ABOUT</span>);
125+
<span class="kw">let</span> <span class="kw-2">mut</span> <span class="ident">app</span> <span class="op">=</span> <span class="ident">base_common::base_app</span>(<span class="ident">ABOUT</span>, <span class="ident">USAGE</span>);
131126
<span class="kw">for</span> <span class="ident">encoding</span> <span class="kw">in</span> <span class="ident">ENCODINGS</span> {
132127
<span class="ident">app</span> <span class="op">=</span> <span class="ident">app</span>.<span class="ident">arg</span>(<span class="ident">Arg::new</span>(<span class="ident">encoding</span>.<span class="number">0</span>).<span class="ident">long</span>(<span class="ident">encoding</span>.<span class="number">0</span>));
133128
}
134129
<span class="ident">app</span>
135130
}
136131

137132
<span class="kw">fn</span> <span class="ident">parse_cmd_args</span>(<span class="ident">args</span>: <span class="kw">impl</span> <span class="ident">uucore::Args</span>) -&gt; <span class="ident">UResult</span><span class="op">&lt;</span>(<span class="ident">Config</span>, <span class="ident">Format</span>)<span class="op">&gt;</span> {
138-
<span class="kw">let</span> <span class="ident">usage</span> <span class="op">=</span> <span class="ident">usage</span>();
139-
<span class="kw">let</span> <span class="ident">matches</span> <span class="op">=</span> <span class="ident">uu_app</span>().<span class="ident">override_usage</span>(<span class="kw-2">&amp;</span><span class="ident">usage</span>[..]).<span class="ident">get_matches_from</span>(
133+
<span class="kw">let</span> <span class="ident">matches</span> <span class="op">=</span> <span class="ident">uu_app</span>().<span class="ident">get_matches_from</span>(
140134
<span class="ident">args</span>.<span class="ident">collect_str</span>(<span class="ident">InvalidEncodingHandling::ConvertLossy</span>)
141135
.<span class="ident">accept_any</span>(),
142136
);

0 commit comments

Comments
 (0)