Skip to content

Commit 51a0913

Browse files
sylvestresylvestre
committed
deploy: c249eba 
1 parent ed1ed05 commit 51a0913

File tree

144 files changed

+265
-215
lines changed

Some content is hidden

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

144 files changed

+265
-215
lines changed

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

+12-2
Original file line numberDiff line numberDiff line change
@@ -174,6 +174,11 @@
174174
<span id="168">168</span>
175175
<span id="169">169</span>
176176
<span id="170">170</span>
177+
<span id="171">171</span>
178+
<span id="172">172</span>
179+
<span id="173">173</span>
180+
<span id="174">174</span>
181+
<span id="175">175</span>
177182
</pre><pre class="rust"><code><span class="comment">// This file is part of the uutils coreutils package.</span>
178183
<span class="comment">//</span>
179184
<span class="comment">// (c) Jimmy Lu &lt;jimmy.lu.2011@gmail.com&gt;</span>
@@ -236,8 +241,13 @@
236241
<span class="kw">let</span> <span class="ident">opt_multiple</span> <span class="op">=</span> <span class="ident">matches</span>.<span class="ident">contains_id</span>(<span class="ident">options::MULTIPLE</span>);
237242
<span class="kw">let</span> <span class="ident">opt_zero</span> <span class="op">=</span> <span class="ident">matches</span>.<span class="ident">contains_id</span>(<span class="ident">options::ZERO</span>);
238243
<span class="kw">let</span> <span class="ident">multiple_paths</span> <span class="op">=</span> <span class="ident">opt_suffix</span> <span class="op">|</span><span class="op">|</span> <span class="ident">opt_multiple</span>;
244+
<span class="kw">let</span> <span class="ident">name_args_count</span> <span class="op">=</span> <span class="ident">matches</span>
245+
.<span class="ident">get_many</span>::<span class="op">&lt;</span><span class="ident">String</span><span class="op">&gt;</span>(<span class="ident">options::NAME</span>)
246+
.<span class="ident">map</span>(<span class="op">|</span><span class="ident">n</span><span class="op">|</span> <span class="ident">n</span>.<span class="ident">len</span>())
247+
.<span class="ident">unwrap_or</span>(<span class="number">0</span>);
248+
239249
<span class="comment">// too many arguments</span>
240-
<span class="kw">if</span> <span class="op">!</span><span class="ident">multiple_paths</span> <span class="op">&amp;&amp;</span> <span class="ident">matches</span>.<span class="ident">occurrences_of</span>(<span class="ident">options::NAME</span>) <span class="op">&gt;</span> <span class="number">2</span> {
250+
<span class="kw">if</span> <span class="op">!</span><span class="ident">multiple_paths</span> <span class="op">&amp;&amp;</span> <span class="ident">name_args_count</span> <span class="op">&gt;</span> <span class="number">2</span> {
241251
<span class="kw">return</span> <span class="prelude-val">Err</span>(<span class="ident">UUsageError::new</span>(
242252
<span class="number">1</span>,
243253
<span class="macro">format!</span>(
@@ -254,7 +264,7 @@
254264

255265
<span class="kw">let</span> <span class="ident">suffix</span> <span class="op">=</span> <span class="kw">if</span> <span class="ident">opt_suffix</span> {
256266
<span class="ident">matches</span>.<span class="ident">value_of</span>(<span class="ident">options::SUFFIX</span>).<span class="ident">unwrap</span>()
257-
} <span class="kw">else</span> <span class="kw">if</span> <span class="op">!</span><span class="ident">opt_multiple</span> <span class="op">&amp;&amp;</span> <span class="ident">matches</span>.<span class="ident">occurrences_of</span>(<span class="ident">options::NAME</span>) <span class="op">&gt;</span> <span class="number">1</span> {
267+
} <span class="kw">else</span> <span class="kw">if</span> <span class="op">!</span><span class="ident">opt_multiple</span> <span class="op">&amp;&amp;</span> <span class="ident">name_args_count</span> <span class="op">&gt;</span> <span class="number">1</span> {
258268
<span class="ident">matches</span>
259269
.<span class="ident">get_many</span>::<span class="op">&lt;</span><span class="ident">String</span><span class="op">&gt;</span>(<span class="ident">options::NAME</span>)
260270
.<span class="ident">unwrap</span>()

‎dev/src/uu_chcon/chcon.rs.html

+8-6
Original file line numberDiff line numberDiff line change
@@ -795,10 +795,12 @@
795795
<span id="789">789</span>
796796
<span id="790">790</span>
797797
<span id="791">791</span>
798+
<span id="792">792</span>
798799
</pre><pre class="rust"><code><span class="comment">// spell-checker:ignore (vars) RFILE</span>
799800

800801
<span class="attribute">#![<span class="ident">allow</span>(<span class="ident">clippy::upper_case_acronyms</span>)]</span>
801802

803+
<span class="kw">use</span> <span class="ident">clap::builder::ValueParser</span>;
802804
<span class="kw">use</span> <span class="ident">uucore::error</span>::{<span class="ident">UResult</span>, <span class="ident">USimpleError</span>, <span class="ident">UUsageError</span>};
803805
<span class="kw">use</span> <span class="ident">uucore::format_usage</span>;
804806
<span class="kw">use</span> <span class="ident">uucore</span>::{<span class="ident">display::Quotable</span>, <span class="ident">show_error</span>, <span class="ident">show_warning</span>};
@@ -1000,7 +1002,7 @@
10001002
<span class="string">&quot;Use security context of RFILE, rather than specifying \
10011003
a CONTEXT value.&quot;</span>,
10021004
)
1003-
.<span class="ident">allow_invalid_utf8</span>(<span class="bool-val">true</span>),
1005+
.<span class="ident">value_parser</span>(<span class="ident">ValueParser::os_string</span>()),
10041006
)
10051007
.<span class="ident">arg</span>(
10061008
<span class="ident">Arg::new</span>(<span class="ident">options::USER</span>)
@@ -1010,7 +1012,7 @@
10101012
.<span class="ident">value_name</span>(<span class="string">&quot;USER&quot;</span>)
10111013
.<span class="ident">value_hint</span>(<span class="ident">clap::ValueHint::Username</span>)
10121014
.<span class="ident">help</span>(<span class="string">&quot;Set user USER in the target security context.&quot;</span>)
1013-
.<span class="ident">allow_invalid_utf8</span>(<span class="bool-val">true</span>),
1015+
.<span class="ident">value_parser</span>(<span class="ident">ValueParser::os_string</span>()),
10141016
)
10151017
.<span class="ident">arg</span>(
10161018
<span class="ident">Arg::new</span>(<span class="ident">options::ROLE</span>)
@@ -1019,7 +1021,7 @@
10191021
.<span class="ident">takes_value</span>(<span class="bool-val">true</span>)
10201022
.<span class="ident">value_name</span>(<span class="string">&quot;ROLE&quot;</span>)
10211023
.<span class="ident">help</span>(<span class="string">&quot;Set role ROLE in the target security context.&quot;</span>)
1022-
.<span class="ident">allow_invalid_utf8</span>(<span class="bool-val">true</span>),
1024+
.<span class="ident">value_parser</span>(<span class="ident">ValueParser::os_string</span>()),
10231025
)
10241026
.<span class="ident">arg</span>(
10251027
<span class="ident">Arg::new</span>(<span class="ident">options::TYPE</span>)
@@ -1028,7 +1030,7 @@
10281030
.<span class="ident">takes_value</span>(<span class="bool-val">true</span>)
10291031
.<span class="ident">value_name</span>(<span class="string">&quot;TYPE&quot;</span>)
10301032
.<span class="ident">help</span>(<span class="string">&quot;Set type TYPE in the target security context.&quot;</span>)
1031-
.<span class="ident">allow_invalid_utf8</span>(<span class="bool-val">true</span>),
1033+
.<span class="ident">value_parser</span>(<span class="ident">ValueParser::os_string</span>()),
10321034
)
10331035
.<span class="ident">arg</span>(
10341036
<span class="ident">Arg::new</span>(<span class="ident">options::RANGE</span>)
@@ -1037,7 +1039,7 @@
10371039
.<span class="ident">takes_value</span>(<span class="bool-val">true</span>)
10381040
.<span class="ident">value_name</span>(<span class="string">&quot;RANGE&quot;</span>)
10391041
.<span class="ident">help</span>(<span class="string">&quot;Set range RANGE in the target security context.&quot;</span>)
1040-
.<span class="ident">allow_invalid_utf8</span>(<span class="bool-val">true</span>),
1042+
.<span class="ident">value_parser</span>(<span class="ident">ValueParser::os_string</span>()),
10411043
)
10421044
.<span class="ident">arg</span>(
10431045
<span class="ident">Arg::new</span>(<span class="ident">options::RECURSIVE</span>)
@@ -1095,7 +1097,7 @@
10951097
.<span class="ident">multiple_occurrences</span>(<span class="bool-val">true</span>)
10961098
.<span class="ident">value_hint</span>(<span class="ident">clap::ValueHint::FilePath</span>)
10971099
.<span class="ident">min_values</span>(<span class="number">1</span>)
1098-
.<span class="ident">allow_invalid_utf8</span>(<span class="bool-val">true</span>),
1100+
.<span class="ident">value_parser</span>(<span class="ident">ValueParser::os_string</span>()),
10991101
)
11001102
}
11011103

‎dev/src/uu_df/columns.rs.html

+2-2
Original file line numberDiff line numberDiff line change
@@ -227,7 +227,7 @@
227227
<span class="comment">// * file that was distributed with this source code.</span>
228228
<span class="comment">// spell-checker:ignore itotal iused iavail ipcent pcent squashfs</span>
229229
<span class="kw">use</span> <span class="kw">crate</span>::{<span class="ident">OPT_INODES</span>, <span class="ident">OPT_OUTPUT</span>, <span class="ident">OPT_PRINT_TYPE</span>};
230-
<span class="kw">use</span> <span class="ident">clap::ArgMatches</span>;
230+
<span class="kw">use</span> <span class="ident">clap</span>::{<span class="ident">ArgMatches</span>, <span class="ident">ValueSource</span>};
231231

232232
<span class="doccomment">/// The columns in the output table produced by `df`.</span>
233233
<span class="doccomment">///</span>
@@ -300,7 +300,7 @@
300300
<span class="kw">match</span> (
301301
<span class="ident">matches</span>.<span class="ident">contains_id</span>(<span class="ident">OPT_PRINT_TYPE</span>),
302302
<span class="ident">matches</span>.<span class="ident">contains_id</span>(<span class="ident">OPT_INODES</span>),
303-
<span class="ident">matches</span>.<span class="ident">occurrences_of</span>(<span class="ident">OPT_OUTPUT</span>) <span class="op">&gt;</span> <span class="number">0</span>,
303+
<span class="ident">matches</span>.<span class="ident">value_source</span>(<span class="ident">OPT_OUTPUT</span>) <span class="op">==</span> <span class="prelude-val">Some</span>(<span class="ident">ValueSource::CommandLine</span>),
304304
) {
305305
(<span class="bool-val">false</span>, <span class="bool-val">false</span>, <span class="bool-val">false</span>) =&gt; <span class="prelude-val">Ok</span>(<span class="macro">vec!</span>[
306306
<span class="ident"><span class="self">Self</span>::Source</span>,

‎dev/src/uu_df/df.rs.html

+6-4
Original file line numberDiff line numberDiff line change
@@ -869,6 +869,7 @@
869869
<span id="863">863</span>
870870
<span id="864">864</span>
871871
<span id="865">865</span>
872+
<span id="866">866</span>
872873
</pre><pre class="rust"><code><span class="comment">// This file is part of the uutils coreutils package.</span>
873874
<span class="comment">//</span>
874875
<span class="comment">// (c) Fangxu Hu &lt;framlog@gmail.com&gt;</span>
@@ -883,6 +884,7 @@
883884
<span class="kw">mod</span> <span class="ident">table</span>;
884885

885886
<span class="kw">use</span> <span class="ident">blocks::HumanReadable</span>;
887+
<span class="kw">use</span> <span class="ident">clap::builder::ValueParser</span>;
886888
<span class="kw">use</span> <span class="ident">table::HeaderMode</span>;
887889
<span class="kw">use</span> <span class="ident">uucore::display::Quotable</span>;
888890
<span class="kw">use</span> <span class="ident">uucore::error::FromIo</span>;
@@ -891,7 +893,7 @@
891893
<span class="kw">use</span> <span class="ident">uucore::parse_size::ParseSizeError</span>;
892894
<span class="kw">use</span> <span class="ident">uucore</span>::{<span class="ident">format_usage</span>, <span class="ident">show</span>};
893895

894-
<span class="kw">use</span> <span class="ident">clap</span>::{<span class="ident">crate_version</span>, <span class="ident">Arg</span>, <span class="ident">ArgMatches</span>, <span class="ident">Command</span>};
896+
<span class="kw">use</span> <span class="ident">clap</span>::{<span class="ident">crate_version</span>, <span class="ident">Arg</span>, <span class="ident">ArgMatches</span>, <span class="ident">Command</span>, <span class="ident">ValueSource</span>};
895897

896898
<span class="kw">use</span> <span class="ident">std::error::Error</span>;
897899
<span class="kw">use</span> <span class="ident">std::fmt</span>;
@@ -1071,7 +1073,7 @@
10711073
<span class="ident">HeaderMode::PosixPortability</span>
10721074
<span class="comment">// contains_id() doesn&#39;t work here, it always returns true because OPT_OUTPUT has</span>
10731075
<span class="comment">// default values and hence is always present</span>
1074-
} <span class="kw">else</span> <span class="kw">if</span> <span class="ident">matches</span>.<span class="ident">occurrences_of</span>(<span class="ident">OPT_OUTPUT</span>) <span class="op">&gt;</span> <span class="number">0</span> {
1076+
} <span class="kw">else</span> <span class="kw">if</span> <span class="ident">matches</span>.<span class="ident">value_source</span>(<span class="ident">OPT_OUTPUT</span>) <span class="op">==</span> <span class="prelude-val">Some</span>(<span class="ident">ValueSource::CommandLine</span>) {
10751077
<span class="ident">HeaderMode::Output</span>
10761078
} <span class="kw">else</span> {
10771079
<span class="ident">HeaderMode::Default</span>
@@ -1456,7 +1458,7 @@
14561458
<span class="ident">Arg::new</span>(<span class="ident">OPT_TYPE</span>)
14571459
.<span class="ident">short</span>(<span class="string">&#39;t&#39;</span>)
14581460
.<span class="ident">long</span>(<span class="string">&quot;type&quot;</span>)
1459-
.<span class="ident">allow_invalid_utf8</span>(<span class="bool-val">true</span>)
1461+
.<span class="ident">value_parser</span>(<span class="ident">ValueParser::os_string</span>())
14601462
.<span class="ident">takes_value</span>(<span class="bool-val">true</span>)
14611463
.<span class="ident">value_name</span>(<span class="string">&quot;TYPE&quot;</span>)
14621464
.<span class="ident">multiple_occurrences</span>(<span class="bool-val">true</span>)
@@ -1473,7 +1475,7 @@
14731475
<span class="ident">Arg::new</span>(<span class="ident">OPT_EXCLUDE_TYPE</span>)
14741476
.<span class="ident">short</span>(<span class="string">&#39;x&#39;</span>)
14751477
.<span class="ident">long</span>(<span class="string">&quot;exclude-type&quot;</span>)
1476-
.<span class="ident">allow_invalid_utf8</span>(<span class="bool-val">true</span>)
1478+
.<span class="ident">value_parser</span>(<span class="ident">ValueParser::os_string</span>())
14771479
.<span class="ident">takes_value</span>(<span class="bool-val">true</span>)
14781480
.<span class="ident">value_name</span>(<span class="string">&quot;TYPE&quot;</span>)
14791481
.<span class="ident">use_value_delimiter</span>(<span class="bool-val">true</span>)

‎dev/src/uu_hashsum/hashsum.rs.html

+3-1
Original file line numberDiff line numberDiff line change
@@ -683,6 +683,7 @@
683683
<span id="677">677</span>
684684
<span id="678">678</span>
685685
<span id="679">679</span>
686+
<span id="680">680</span>
686687
</pre><pre class="rust"><code><span class="comment">// * This file is part of the uutils coreutils package.</span>
687688
<span class="comment">// *</span>
688689
<span class="comment">// * (c) Alex Lyon &lt;arcterus@mail.com&gt;</span>
@@ -705,6 +706,7 @@
705706
<span class="kw">use</span> <span class="ident"><span class="self">self</span>::digest::Digest</span>;
706707
<span class="kw">use</span> <span class="ident"><span class="self">self</span>::digest::DigestWriter</span>;
707708

709+
<span class="kw">use</span> <span class="ident">clap::builder::ValueParser</span>;
708710
<span class="kw">use</span> <span class="ident">clap</span>::{<span class="ident">Arg</span>, <span class="ident">ArgMatches</span>, <span class="ident">Command</span>};
709711
<span class="kw">use</span> <span class="ident">hex::encode</span>;
710712
<span class="kw">use</span> <span class="ident">md5::Md5</span>;
@@ -1077,7 +1079,7 @@
10771079
.<span class="ident">multiple_occurrences</span>(<span class="bool-val">true</span>)
10781080
.<span class="ident">value_name</span>(<span class="string">&quot;FILE&quot;</span>)
10791081
.<span class="ident">value_hint</span>(<span class="ident">clap::ValueHint::FilePath</span>)
1080-
.<span class="ident">allow_invalid_utf8</span>(<span class="bool-val">true</span>),
1082+
.<span class="ident">value_parser</span>(<span class="ident">ValueParser::os_string</span>()),
10811083
)
10821084
}
10831085

‎dev/src/uu_hostname/hostname.rs.html

+3-1
Original file line numberDiff line numberDiff line change
@@ -171,6 +171,7 @@
171171
<span id="165">165</span>
172172
<span id="166">166</span>
173173
<span id="167">167</span>
174+
<span id="168">168</span>
174175
</pre><pre class="rust"><code><span class="comment">// * This file is part of the uutils coreutils package.</span>
175176
<span class="comment">// *</span>
176177
<span class="comment">// * (c) Alan Andrade &lt;alan.andradec@gmail.com&gt;</span>
@@ -184,6 +185,7 @@
184185
<span class="kw">use</span> <span class="ident">std::str</span>;
185186
<span class="kw">use</span> <span class="ident">std</span>::{<span class="ident">collections::hash_set::HashSet</span>, <span class="ident">ffi::OsString</span>};
186187

188+
<span class="kw">use</span> <span class="ident">clap::builder::ValueParser</span>;
187189
<span class="kw">use</span> <span class="ident">clap</span>::{<span class="ident">crate_version</span>, <span class="ident">Arg</span>, <span class="ident">ArgMatches</span>, <span class="ident">Command</span>};
188190

189191
<span class="kw">use</span> <span class="ident">uucore</span>::{
@@ -280,7 +282,7 @@
280282
)
281283
.<span class="ident">arg</span>(
282284
<span class="ident">Arg::new</span>(<span class="ident">OPT_HOST</span>)
283-
.<span class="ident">allow_invalid_utf8</span>(<span class="bool-val">true</span>)
285+
.<span class="ident">value_parser</span>(<span class="ident">ValueParser::os_string</span>())
284286
.<span class="ident">value_hint</span>(<span class="ident">clap::ValueHint::Hostname</span>),
285287
)
286288
}

‎dev/src/uu_join/join.rs.html

+3-1
Original file line numberDiff line numberDiff line change
@@ -1002,6 +1002,7 @@
10021002
<span id="996">996</span>
10031003
<span id="997">997</span>
10041004
<span id="998">998</span>
1005+
<span id="999">999</span>
10051006
</pre><pre class="rust"><code><span class="comment">// * This file is part of the uutils coreutils package.</span>
10061007
<span class="comment">// *</span>
10071008
<span class="comment">// * (c) Konstantin Pospelov &lt;kupospelov@gmail.com&gt;</span>
@@ -1014,6 +1015,7 @@
10141015
<span class="attribute">#[<span class="ident">macro_use</span>]</span>
10151016
<span class="kw">extern</span> <span class="kw">crate</span> <span class="ident">uucore</span>;
10161017

1018+
<span class="kw">use</span> <span class="ident">clap::builder::ValueParser</span>;
10171019
<span class="kw">use</span> <span class="ident">clap</span>::{<span class="ident">crate_version</span>, <span class="ident">Arg</span>, <span class="ident">Command</span>};
10181020
<span class="kw">use</span> <span class="ident">memchr</span>::{<span class="ident">memchr3_iter</span>, <span class="ident">memchr_iter</span>};
10191021
<span class="kw">use</span> <span class="ident">std::cmp::Ordering</span>;
@@ -1766,7 +1768,7 @@
17661768
.<span class="ident">short</span>(<span class="string">&#39;t&#39;</span>)
17671769
.<span class="ident">takes_value</span>(<span class="bool-val">true</span>)
17681770
.<span class="ident">value_name</span>(<span class="string">&quot;CHAR&quot;</span>)
1769-
.<span class="ident">allow_invalid_utf8</span>(<span class="bool-val">true</span>)
1771+
.<span class="ident">value_parser</span>(<span class="ident">ValueParser::os_string</span>())
17701772
.<span class="ident">help</span>(<span class="string">&quot;use CHAR as input and output field separator&quot;</span>),
17711773
)
17721774
.<span class="ident">arg</span>(

0 commit comments

Comments
 (0)