Skip to content

Commit a27c984

Browse files
sylvestresylvestre
committed
deploy: c249eba 
1 parent d664201 commit a27c984

24 files changed

+132
-69
lines changed

‎dev/search-index.js

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎dev/src/uu_dd/parseargs.rs.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1261,7 +1261,7 @@
12611261
<span class="kw">let</span> (<span class="ident">num</span>, <span class="ident">multiplier</span>) <span class="op">=</span> <span class="kw">match</span> (<span class="ident">s</span>.<span class="ident">find</span>(<span class="string">&#39;c&#39;</span>), <span class="ident">s</span>.<span class="ident">rfind</span>(<span class="string">&#39;w&#39;</span>), <span class="ident">s</span>.<span class="ident">rfind</span>(<span class="string">&#39;b&#39;</span>)) {
12621262
(<span class="prelude-val">None</span>, <span class="prelude-val">None</span>, <span class="prelude-val">None</span>) =&gt; <span class="kw">match</span> <span class="ident">uucore::parse_size::parse_size</span>(<span class="ident">s</span>) {
12631263
<span class="prelude-val">Ok</span>(<span class="ident">n</span>) =&gt; (<span class="ident">n</span>, <span class="number">1</span>),
1264-
<span class="prelude-val">Err</span>(<span class="ident">ParseSizeError::ParseFailure</span>(<span class="ident">s</span>)) =&gt; {
1264+
<span class="prelude-val">Err</span>(<span class="ident">ParseSizeError::InvalidSuffix</span>(<span class="ident">s</span>)) <span class="op">|</span> <span class="prelude-val">Err</span>(<span class="ident">ParseSizeError::ParseFailure</span>(<span class="ident">s</span>)) =&gt; {
12651265
<span class="kw">return</span> <span class="prelude-val">Err</span>(<span class="ident">ParseError::MultiplierStringParseFailure</span>(<span class="ident">s</span>))
12661266
}
12671267
<span class="prelude-val">Err</span>(<span class="ident">ParseSizeError::SizeTooBig</span>(<span class="ident">s</span>)) =&gt; {

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

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -842,6 +842,11 @@
842842
<span id="837">837</span>
843843
<span id="838">838</span>
844844
<span id="839">839</span>
845+
<span id="840">840</span>
846+
<span id="841">841</span>
847+
<span id="842">842</span>
848+
<span id="843">843</span>
849+
<span id="844">844</span>
845850
</pre><pre class="rust"><code><span class="comment">// This file is part of the uutils coreutils package.</span>
846851
<span class="comment">//</span>
847852
<span class="comment">// (c) Fangxu Hu &lt;framlog@gmail.com&gt;</span>
@@ -965,6 +970,7 @@
965970
<span class="kw">enum</span> <span class="ident">OptionsError</span> {
966971
<span class="ident">BlockSizeTooLarge</span>(<span class="ident">String</span>),
967972
<span class="ident">InvalidBlockSize</span>(<span class="ident">String</span>),
973+
<span class="ident">InvalidSuffix</span>(<span class="ident">String</span>),
968974

969975
<span class="doccomment">/// An error getting the columns to display in the output table.</span>
970976
<span class="ident">ColumnError</span>(<span class="ident">ColumnError</span>),
@@ -983,6 +989,9 @@
983989
<span class="comment">// TODO This needs to vary based on whether `--block-size`</span>
984990
<span class="comment">// or `-B` were provided.</span>
985991
<span class="ident"><span class="self">Self</span>::InvalidBlockSize</span>(<span class="ident">s</span>) =&gt; <span class="macro">write!</span>(<span class="ident">f</span>, <span class="string">&quot;invalid --block-size argument {}&quot;</span>, <span class="ident">s</span>),
992+
<span class="comment">// TODO This needs to vary based on whether `--block-size`</span>
993+
<span class="comment">// or `-B` were provided.</span>
994+
<span class="ident"><span class="self">Self</span>::InvalidSuffix</span>(<span class="ident">s</span>) =&gt; <span class="macro">write!</span>(<span class="ident">f</span>, <span class="string">&quot;invalid suffix in --block-size argument {}&quot;</span>, <span class="ident">s</span>),
986995
<span class="ident"><span class="self">Self</span>::ColumnError</span>(<span class="ident">ColumnError::MultipleColumns</span>(<span class="ident">s</span>)) =&gt; <span class="macro">write!</span>(
987996
<span class="ident">f</span>,
988997
<span class="string">&quot;option --output: field {} used more than once&quot;</span>,
@@ -1018,6 +1027,7 @@
10181027
<span class="ident">show_local_fs</span>: <span class="ident">matches</span>.<span class="ident">is_present</span>(<span class="ident">OPT_LOCAL</span>),
10191028
<span class="ident">show_all_fs</span>: <span class="ident">matches</span>.<span class="ident">is_present</span>(<span class="ident">OPT_ALL</span>),
10201029
<span class="ident">block_size</span>: <span class="ident">block_size_from_matches</span>(<span class="ident">matches</span>).<span class="ident">map_err</span>(<span class="op">|</span><span class="ident">e</span><span class="op">|</span> <span class="kw">match</span> <span class="ident">e</span> {
1030+
<span class="ident">ParseSizeError::InvalidSuffix</span>(<span class="ident">s</span>) =&gt; <span class="ident">OptionsError::InvalidSuffix</span>(<span class="ident">s</span>),
10211031
<span class="ident">ParseSizeError::SizeTooBig</span>(<span class="kw">_</span>) =&gt; <span class="ident">OptionsError::BlockSizeTooLarge</span>(
10221032
<span class="ident">matches</span>.<span class="ident">value_of</span>(<span class="ident">OPT_BLOCKSIZE</span>).<span class="ident">unwrap</span>().<span class="ident">to_string</span>(),
10231033
),

‎dev/src/uu_du/du.rs.html

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -982,6 +982,8 @@
982982
<span id="977">977</span>
983983
<span id="978">978</span>
984984
<span id="979">979</span>
985+
<span id="980">980</span>
986+
<span id="981">981</span>
985987
</pre><pre class="rust"><code><span class="comment">// * This file is part of the uutils coreutils package.</span>
986988
<span class="comment">// *</span>
987989
<span class="comment">// * (c) Derek Chiang &lt;derekchiang93@gmail.com&gt;</span>
@@ -1937,8 +1939,10 @@
19371939
<span class="kw">fn</span> <span class="ident">format_error_message</span>(<span class="ident">error</span>: <span class="kw-2">&amp;</span><span class="ident">ParseSizeError</span>, <span class="ident">s</span>: <span class="kw-2">&amp;</span><span class="ident">str</span>, <span class="ident">option</span>: <span class="kw-2">&amp;</span><span class="ident">str</span>) -&gt; <span class="ident">String</span> {
19381940
<span class="comment">// NOTE:</span>
19391941
<span class="comment">// GNU&#39;s du echos affected flag, -B or --block-size (-t or --threshold), depending user&#39;s selection</span>
1940-
<span class="comment">// GNU&#39;s du does distinguish between &quot;invalid (suffix in) argument&quot;</span>
19411942
<span class="kw">match</span> <span class="ident">error</span> {
1943+
<span class="ident">ParseSizeError::InvalidSuffix</span>(<span class="kw">_</span>) =&gt; {
1944+
<span class="macro">format!</span>(<span class="string">&quot;invalid suffix in --{} argument {}&quot;</span>, <span class="ident">option</span>, <span class="ident">s</span>.<span class="ident">quote</span>())
1945+
}
19421946
<span class="ident">ParseSizeError::ParseFailure</span>(<span class="kw">_</span>) =&gt; <span class="macro">format!</span>(<span class="string">&quot;invalid --{} argument {}&quot;</span>, <span class="ident">option</span>, <span class="ident">s</span>.<span class="ident">quote</span>()),
19431947
<span class="ident">ParseSizeError::SizeTooBig</span>(<span class="kw">_</span>) =&gt; <span class="macro">format!</span>(<span class="string">&quot;--{} argument {} too large&quot;</span>, <span class="ident">option</span>, <span class="ident">s</span>.<span class="ident">quote</span>()),
19441948
}

‎dev/src/uu_od/od.rs.html

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -690,6 +690,8 @@
690690
<span id="685">685</span>
691691
<span id="686">686</span>
692692
<span id="687">687</span>
693+
<span id="688">688</span>
694+
<span id="689">689</span>
693695
</pre><pre class="rust"><code><span class="comment">// * This file is part of the uutils coreutils package.</span>
694696
<span class="comment">// *</span>
695697
<span class="comment">// * (c) Ben Hirsch &lt;benhirsch24@gmail.com&gt;</span>
@@ -1371,8 +1373,10 @@
13711373
<span class="kw">fn</span> <span class="ident">format_error_message</span>(<span class="ident">error</span>: <span class="kw-2">&amp;</span><span class="ident">ParseSizeError</span>, <span class="ident">s</span>: <span class="kw-2">&amp;</span><span class="ident">str</span>, <span class="ident">option</span>: <span class="kw-2">&amp;</span><span class="ident">str</span>) -&gt; <span class="ident">String</span> {
13721374
<span class="comment">// NOTE:</span>
13731375
<span class="comment">// GNU&#39;s od echos affected flag, -N or --read-bytes (-j or --skip-bytes, etc.), depending user&#39;s selection</span>
1374-
<span class="comment">// GNU&#39;s od does distinguish between &quot;invalid (suffix in) argument&quot;</span>
13751376
<span class="kw">match</span> <span class="ident">error</span> {
1377+
<span class="ident">ParseSizeError::InvalidSuffix</span>(<span class="kw">_</span>) =&gt; {
1378+
<span class="macro">format!</span>(<span class="string">&quot;invalid suffix in --{} argument {}&quot;</span>, <span class="ident">option</span>, <span class="ident">s</span>.<span class="ident">quote</span>())
1379+
}
13761380
<span class="ident">ParseSizeError::ParseFailure</span>(<span class="kw">_</span>) =&gt; <span class="macro">format!</span>(<span class="string">&quot;invalid --{} argument {}&quot;</span>, <span class="ident">option</span>, <span class="ident">s</span>.<span class="ident">quote</span>()),
13771381
<span class="ident">ParseSizeError::SizeTooBig</span>(<span class="kw">_</span>) =&gt; <span class="macro">format!</span>(<span class="string">&quot;--{} argument {} too large&quot;</span>, <span class="ident">option</span>, <span class="ident">s</span>.<span class="ident">quote</span>()),
13781382
}

‎dev/src/uu_sort/sort.rs.html

Lines changed: 10 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1982,6 +1982,10 @@
19821982
<span id="1977">1977</span>
19831983
<span id="1978">1978</span>
19841984
<span id="1979">1979</span>
1985+
<span id="1980">1980</span>
1986+
<span id="1981">1981</span>
1987+
<span id="1982">1982</span>
1988+
<span id="1983">1983</span>
19851989
</pre><pre class="rust"><code><span class="comment">// * This file is part of the uutils coreutils package.</span>
19861990
<span class="comment">// *</span>
19871991
<span class="comment">// * (c) Michael Yin &lt;mikeyin@mikeyin.org&gt;</span>
@@ -2346,8 +2350,10 @@
23462350
<span class="ident">size</span>
23472351
))
23482352
})
2353+
} <span class="kw">else</span> <span class="kw">if</span> <span class="ident">size_string</span>.<span class="ident">starts_with</span>(<span class="op">|</span><span class="ident">c</span>: <span class="ident">char</span><span class="op">|</span> <span class="ident">c</span>.<span class="ident">is_ascii_digit</span>()) {
2354+
<span class="prelude-val">Err</span>(<span class="ident">ParseSizeError::InvalidSuffix</span>(<span class="string">&quot;invalid suffix&quot;</span>.<span class="ident">to_string</span>()))
23492355
} <span class="kw">else</span> {
2350-
<span class="prelude-val">Err</span>(<span class="ident">ParseSizeError::ParseFailure</span>(<span class="string">&quot;invalid suffix&quot;</span>.<span class="ident">to_string</span>()))
2356+
<span class="prelude-val">Err</span>(<span class="ident">ParseSizeError::ParseFailure</span>(<span class="string">&quot;parse failure&quot;</span>.<span class="ident">to_string</span>()))
23512357
}
23522358
}
23532359

@@ -3817,8 +3823,10 @@
38173823
<span class="kw">fn</span> <span class="ident">format_error_message</span>(<span class="ident">error</span>: <span class="kw-2">&amp;</span><span class="ident">ParseSizeError</span>, <span class="ident">s</span>: <span class="kw-2">&amp;</span><span class="ident">str</span>, <span class="ident">option</span>: <span class="kw-2">&amp;</span><span class="ident">str</span>) -&gt; <span class="ident">String</span> {
38183824
<span class="comment">// NOTE:</span>
38193825
<span class="comment">// GNU&#39;s sort echos affected flag, -S or --buffer-size, depending user&#39;s selection</span>
3820-
<span class="comment">// GNU&#39;s sort does distinguish between &quot;invalid (suffix in) argument&quot;</span>
38213826
<span class="kw">match</span> <span class="ident">error</span> {
3827+
<span class="ident">ParseSizeError::InvalidSuffix</span>(<span class="kw">_</span>) =&gt; {
3828+
<span class="macro">format!</span>(<span class="string">&quot;invalid suffix in --{} argument {}&quot;</span>, <span class="ident">option</span>, <span class="ident">s</span>.<span class="ident">quote</span>())
3829+
}
38223830
<span class="ident">ParseSizeError::ParseFailure</span>(<span class="kw">_</span>) =&gt; <span class="macro">format!</span>(<span class="string">&quot;invalid --{} argument {}&quot;</span>, <span class="ident">option</span>, <span class="ident">s</span>.<span class="ident">quote</span>()),
38233831
<span class="ident">ParseSizeError::SizeTooBig</span>(<span class="kw">_</span>) =&gt; <span class="macro">format!</span>(<span class="string">&quot;--{} argument {} too large&quot;</span>, <span class="ident">option</span>, <span class="ident">s</span>.<span class="ident">quote</span>()),
38243832
}

0 commit comments

Comments
 (0)