Skip to content

Commit 77e6d03

Browse files
committed
deploy: c249eba
1 parent 86dd26c commit 77e6d03

File tree

111 files changed

+209
-149
lines changed

Some content is hidden

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

111 files changed

+209
-149
lines changed

dev/src/uu_arch/arch.rs.html

+1-1
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@
5454

5555
<span class="attribute">#[<span class="ident">uucore::main</span>]</span>
5656
<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> {
57-
<span class="ident">uu_app</span>().<span class="ident">get_matches_from</span>(<span class="ident">args</span>);
57+
<span class="ident">uu_app</span>().<span class="ident">try_get_matches_from</span>(<span class="ident">args</span>)<span class="question-mark">?</span>;
5858

5959
<span class="kw">let</span> <span class="ident">uts</span> <span class="op">=</span> <span class="ident">PlatformInfo::new</span>().<span class="ident">map_err_context</span>(<span class="op">|</span><span class="op">|</span> <span class="string">&quot;cannot get system name&quot;</span>.<span class="ident">to_string</span>())<span class="question-mark">?</span>;
6060
<span class="macro">println!</span>(<span class="string">&quot;{}&quot;</span>, <span class="ident">uts</span>.<span class="ident">machine</span>().<span class="ident">trim</span>());

dev/src/uu_basename/basename.rs.html

+1-1
Original file line numberDiff line numberDiff line change
@@ -230,7 +230,7 @@
230230
<span class="comment">//</span>
231231
<span class="comment">// Argument parsing</span>
232232
<span class="comment">//</span>
233-
<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>);
233+
<span class="kw">let</span> <span class="ident">matches</span> <span class="op">=</span> <span class="ident">uu_app</span>().<span class="ident">try_get_matches_from</span>(<span class="ident">args</span>)<span class="question-mark">?</span>;
234234

235235
<span class="comment">// too few arguments</span>
236236
<span class="kw">if</span> <span class="op">!</span><span class="ident">matches</span>.<span class="ident">contains_id</span>(<span class="ident">options::NAME</span>) {

dev/src/uu_chmod/chmod.rs.html

+5-1
Original file line numberDiff line numberDiff line change
@@ -385,6 +385,8 @@
385385
<span id="379">379</span>
386386
<span id="380">380</span>
387387
<span id="381">381</span>
388+
<span id="382">382</span>
389+
<span id="383">383</span>
388390
</pre><pre class="rust"><code><span class="comment">// This file is part of the uutils coreutils package.</span>
389391
<span class="comment">//</span>
390392
<span class="comment">// (c) Alex Lyon &lt;arcterus@mail.com&gt;</span>
@@ -441,7 +443,9 @@
441443

442444
<span class="kw">let</span> <span class="ident">after_help</span> <span class="op">=</span> <span class="ident">get_long_usage</span>();
443445

444-
<span class="kw">let</span> <span class="ident">matches</span> <span class="op">=</span> <span class="ident">uu_app</span>().<span class="ident">after_help</span>(<span class="kw-2">&amp;</span><span class="ident">after_help</span>[..]).<span class="ident">get_matches_from</span>(<span class="ident">args</span>);
446+
<span class="kw">let</span> <span class="ident">matches</span> <span class="op">=</span> <span class="ident">uu_app</span>()
447+
.<span class="ident">after_help</span>(<span class="kw-2">&amp;</span><span class="ident">after_help</span>[..])
448+
.<span class="ident">try_get_matches_from</span>(<span class="ident">args</span>)<span class="question-mark">?</span>;
445449

446450
<span class="kw">let</span> <span class="ident">changes</span> <span class="op">=</span> <span class="ident">matches</span>.<span class="ident">contains_id</span>(<span class="ident">options::CHANGES</span>);
447451
<span class="kw">let</span> <span class="ident">quiet</span> <span class="op">=</span> <span class="ident">matches</span>.<span class="ident">contains_id</span>(<span class="ident">options::QUIET</span>);

dev/src/uu_chroot/chroot.rs.html

+2-2
Original file line numberDiff line numberDiff line change
@@ -266,7 +266,7 @@
266266
<span class="kw">use</span> <span class="ident">std::io::Error</span>;
267267
<span class="kw">use</span> <span class="ident">std::path::Path</span>;
268268
<span class="kw">use</span> <span class="ident">std::process</span>;
269-
<span class="kw">use</span> <span class="ident">uucore::error</span>::{<span class="ident">set_exit_code</span>, <span class="ident">UResult</span>};
269+
<span class="kw">use</span> <span class="ident">uucore::error</span>::{<span class="ident">set_exit_code</span>, <span class="ident">UClapError</span>, <span class="ident">UResult</span>};
270270
<span class="kw">use</span> <span class="ident">uucore::libc</span>::{<span class="self">self</span>, <span class="ident">chroot</span>, <span class="ident">setgid</span>, <span class="ident">setgroups</span>, <span class="ident">setuid</span>};
271271
<span class="kw">use</span> <span class="ident">uucore</span>::{<span class="ident">entries</span>, <span class="ident">format_usage</span>};
272272

@@ -286,7 +286,7 @@
286286
<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> {
287287
<span class="kw">let</span> <span class="ident">args</span> <span class="op">=</span> <span class="ident">args</span>.<span class="ident">collect_lossy</span>();
288288

289-
<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>);
289+
<span class="kw">let</span> <span class="ident">matches</span> <span class="op">=</span> <span class="ident">uu_app</span>().<span class="ident">try_get_matches_from</span>(<span class="ident">args</span>).<span class="ident">with_exit_code</span>(<span class="number">125</span>)<span class="question-mark">?</span>;
290290

291291
<span class="kw">let</span> <span class="ident">default_shell</span>: <span class="kw-2">&amp;</span><span class="lifetime">&#39;static</span> <span class="ident">str</span> <span class="op">=</span> <span class="string">&quot;/bin/sh&quot;</span>;
292292
<span class="kw">let</span> <span class="ident">default_option</span>: <span class="kw-2">&amp;</span><span class="lifetime">&#39;static</span> <span class="ident">str</span> <span class="op">=</span> <span class="string">&quot;-i&quot;</span>;

dev/src/uu_cksum/cksum.rs.html

+1-1
Original file line numberDiff line numberDiff line change
@@ -274,7 +274,7 @@
274274
<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> {
275275
<span class="kw">let</span> <span class="ident">args</span> <span class="op">=</span> <span class="ident">args</span>.<span class="ident">collect_ignore</span>();
276276

277-
<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>);
277+
<span class="kw">let</span> <span class="ident">matches</span> <span class="op">=</span> <span class="ident">uu_app</span>().<span class="ident">try_get_matches_from</span>(<span class="ident">args</span>)<span class="question-mark">?</span>;
278278

279279
<span class="kw">let</span> <span class="ident">files</span>: <span class="ident">Vec</span><span class="op">&lt;</span><span class="ident">String</span><span class="op">&gt;</span> <span class="op">=</span> <span class="kw">match</span> <span class="ident">matches</span>.<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::FILE</span>) {
280280
<span class="prelude-val">Some</span>(<span class="ident">v</span>) =&gt; <span class="ident">v</span>.<span class="ident">clone</span>().<span class="ident">map</span>(<span class="op">|</span><span class="ident">v</span><span class="op">|</span> <span class="ident">v</span>.<span class="ident">to_owned</span>()).<span class="ident">collect</span>(),

dev/src/uu_comm/comm.rs.html

+1-1
Original file line numberDiff line numberDiff line change
@@ -327,7 +327,7 @@
327327
<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> {
328328
<span class="kw">let</span> <span class="ident">args</span> <span class="op">=</span> <span class="ident">args</span>.<span class="ident">collect_lossy</span>();
329329

330-
<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>);
330+
<span class="kw">let</span> <span class="ident">matches</span> <span class="op">=</span> <span class="ident">uu_app</span>().<span class="ident">try_get_matches_from</span>(<span class="ident">args</span>)<span class="question-mark">?</span>;
331331
<span class="kw">let</span> <span class="ident">filename1</span> <span class="op">=</span> <span class="ident">matches</span>.<span class="ident">value_of</span>(<span class="ident">options::FILE_1</span>).<span class="ident">unwrap</span>();
332332
<span class="kw">let</span> <span class="ident">filename2</span> <span class="op">=</span> <span class="ident">matches</span>.<span class="ident">value_of</span>(<span class="ident">options::FILE_2</span>).<span class="ident">unwrap</span>();
333333
<span class="kw">let</span> <span class="kw-2">mut</span> <span class="ident">f1</span> <span class="op">=</span> <span class="ident">open_file</span>(<span class="ident">filename1</span>).<span class="ident">map_err_context</span>(<span class="op">|</span><span class="op">|</span> <span class="ident">filename1</span>.<span class="ident">to_string</span>())<span class="question-mark">?</span>;

dev/src/uu_csplit/csplit.rs.html

+1-1
Original file line numberDiff line numberDiff line change
@@ -1532,7 +1532,7 @@
15321532
<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> {
15331533
<span class="kw">let</span> <span class="ident">args</span> <span class="op">=</span> <span class="ident">args</span>.<span class="ident">collect_ignore</span>();
15341534

1535-
<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>);
1535+
<span class="kw">let</span> <span class="ident">matches</span> <span class="op">=</span> <span class="ident">uu_app</span>().<span class="ident">try_get_matches_from</span>(<span class="ident">args</span>)<span class="question-mark">?</span>;
15361536

15371537
<span class="comment">// get the file to split</span>
15381538
<span class="kw">let</span> <span class="ident">file_name</span> <span class="op">=</span> <span class="ident">matches</span>.<span class="ident">value_of</span>(<span class="ident">options::FILE</span>).<span class="ident">unwrap</span>();

dev/src/uu_cut/cut.rs.html

+1-1
Original file line numberDiff line numberDiff line change
@@ -1026,7 +1026,7 @@
10261026
<span class="kw">let</span> <span class="ident">args</span> <span class="op">=</span> <span class="ident">args</span>.<span class="ident">collect_ignore</span>();
10271027

10281028
<span class="kw">let</span> <span class="ident">delimiter_is_equal</span> <span class="op">=</span> <span class="ident">args</span>.<span class="ident">contains</span>(<span class="kw-2">&amp;</span><span class="string">&quot;-d=&quot;</span>.<span class="ident">to_string</span>()); <span class="comment">// special case</span>
1029-
<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>);
1029+
<span class="kw">let</span> <span class="ident">matches</span> <span class="op">=</span> <span class="ident">uu_app</span>().<span class="ident">try_get_matches_from</span>(<span class="ident">args</span>)<span class="question-mark">?</span>;
10301030

10311031
<span class="kw">let</span> <span class="ident">complement</span> <span class="op">=</span> <span class="ident">matches</span>.<span class="ident">contains_id</span>(<span class="ident">options::COMPLEMENT</span>);
10321032

dev/src/uu_date/date.rs.html

+1-1
Original file line numberDiff line numberDiff line change
@@ -581,7 +581,7 @@
581581

582582
<span class="attribute">#[<span class="ident">uucore::main</span>]</span>
583583
<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> {
584-
<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>);
584+
<span class="kw">let</span> <span class="ident">matches</span> <span class="op">=</span> <span class="ident">uu_app</span>().<span class="ident">try_get_matches_from</span>(<span class="ident">args</span>)<span class="question-mark">?</span>;
585585

586586
<span class="kw">let</span> <span class="ident">format</span> <span class="op">=</span> <span class="kw">if</span> <span class="kw">let</span> <span class="prelude-val">Some</span>(<span class="ident">form</span>) <span class="op">=</span> <span class="ident">matches</span>.<span class="ident">value_of</span>(<span class="ident">OPT_FORMAT</span>) {
587587
<span class="kw">if</span> <span class="op">!</span><span class="ident">form</span>.<span class="ident">starts_with</span>(<span class="string">&#39;+&#39;</span>) {

dev/src/uu_dd/dd.rs.html

+1-1
Original file line numberDiff line numberDiff line change
@@ -1893,7 +1893,7 @@
18931893

18941894
<span class="kw">let</span> <span class="ident">matches</span> <span class="op">=</span> <span class="ident">uu_app</span>()
18951895
<span class="comment">//.after_help(TODO: Add note about multiplier strings here.)</span>
1896-
.<span class="ident">get_matches_from</span>(<span class="ident">dashed_args</span>);
1896+
.<span class="ident">try_get_matches_from</span>(<span class="ident">dashed_args</span>)<span class="question-mark">?</span>;
18971897

18981898
<span class="kw">match</span> (
18991899
<span class="ident">matches</span>.<span class="ident">contains_id</span>(<span class="ident">options::INFILE</span>),

dev/src/uu_df/df.rs.html

+1-1
Original file line numberDiff line numberDiff line change
@@ -1303,7 +1303,7 @@
13031303

13041304
<span class="attribute">#[<span class="ident">uucore::main</span>]</span>
13051305
<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> {
1306-
<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>);
1306+
<span class="kw">let</span> <span class="ident">matches</span> <span class="op">=</span> <span class="ident">uu_app</span>().<span class="ident">try_get_matches_from</span>(<span class="ident">args</span>)<span class="question-mark">?</span>;
13071307

13081308
<span class="attribute">#[<span class="ident">cfg</span>(<span class="ident">windows</span>)]</span>
13091309
{

dev/src/uu_dircolors/dircolors.rs.html

+1-1
Original file line numberDiff line numberDiff line change
@@ -521,7 +521,7 @@
521521
<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> {
522522
<span class="kw">let</span> <span class="ident">args</span> <span class="op">=</span> <span class="ident">args</span>.<span class="ident">collect_ignore</span>();
523523

524-
<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="kw-2">&amp;</span><span class="ident">args</span>);
524+
<span class="kw">let</span> <span class="ident">matches</span> <span class="op">=</span> <span class="ident">uu_app</span>().<span class="ident">try_get_matches_from</span>(<span class="kw-2">&amp;</span><span class="ident">args</span>)<span class="question-mark">?</span>;
525525

526526
<span class="kw">let</span> <span class="ident">files</span> <span class="op">=</span> <span class="ident">matches</span>
527527
.<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::FILE</span>)

dev/src/uu_dirname/dirname.rs.html

+5-1
Original file line numberDiff line numberDiff line change
@@ -99,6 +99,8 @@
9999
<span id="93">93</span>
100100
<span id="94">94</span>
101101
<span id="95">95</span>
102+
<span id="96">96</span>
103+
<span id="97">97</span>
102104
</pre><pre class="rust"><code><span class="comment">// This file is part of the uutils coreutils package.</span>
103105
<span class="comment">//</span>
104106
<span class="comment">// (c) Derek Chiang &lt;derekchiang93@gmail.com&gt;</span>
@@ -133,7 +135,9 @@
133135

134136
<span class="kw">let</span> <span class="ident">after_help</span> <span class="op">=</span> <span class="ident">get_long_usage</span>();
135137

136-
<span class="kw">let</span> <span class="ident">matches</span> <span class="op">=</span> <span class="ident">uu_app</span>().<span class="ident">after_help</span>(<span class="kw-2">&amp;</span><span class="ident">after_help</span>[..]).<span class="ident">get_matches_from</span>(<span class="ident">args</span>);
138+
<span class="kw">let</span> <span class="ident">matches</span> <span class="op">=</span> <span class="ident">uu_app</span>()
139+
.<span class="ident">after_help</span>(<span class="kw-2">&amp;</span><span class="ident">after_help</span>[..])
140+
.<span class="ident">try_get_matches_from</span>(<span class="ident">args</span>)<span class="question-mark">?</span>;
137141

138142
<span class="kw">let</span> <span class="ident">separator</span> <span class="op">=</span> <span class="kw">if</span> <span class="ident">matches</span>.<span class="ident">contains_id</span>(<span class="ident">options::ZERO</span>) {
139143
<span class="string">&quot;\0&quot;</span>

dev/src/uu_du/du.rs.html

+1-1
Original file line numberDiff line numberDiff line change
@@ -1478,7 +1478,7 @@
14781478
<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> {
14791479
<span class="kw">let</span> <span class="ident">args</span> <span class="op">=</span> <span class="ident">args</span>.<span class="ident">collect_ignore</span>();
14801480

1481-
<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>);
1481+
<span class="kw">let</span> <span class="ident">matches</span> <span class="op">=</span> <span class="ident">uu_app</span>().<span class="ident">try_get_matches_from</span>(<span class="ident">args</span>)<span class="question-mark">?</span>;
14821482

14831483
<span class="kw">let</span> <span class="ident">summarize</span> <span class="op">=</span> <span class="ident">matches</span>.<span class="ident">contains_id</span>(<span class="ident">options::SUMMARIZE</span>);
14841484

0 commit comments

Comments
 (0)