|
460 | 460 | <span id="460">460</span>
|
461 | 461 | <span id="461">461</span>
|
462 | 462 | <span id="462">462</span>
|
| 463 | +<span id="463">463</span> |
| 464 | +<span id="464">464</span> |
| 465 | +<span id="465">465</span> |
463 | 466 | </pre><pre class="rust"><code><span class="comment">// * This file is part of the uutils coreutils package.</span>
|
464 | 467 | <span class="comment">// *</span>
|
465 | 468 | <span class="comment">// * (c) Yury Krivopalov <ykrivopalov@yandex.ru></span>
|
|
620 | 623 | <span class="prelude-val">Ok</span>(<span class="number">0</span>)
|
621 | 624 | }<span class="question-mark">?</span>;
|
622 | 625 |
|
623 |
| - <span class="kw">let</span> <span class="ident">fields</span> <span class="op">=</span> <span class="kw">match</span> <span class="ident">args</span>.<span class="ident">get_one</span>::<span class="op"><</span><span class="ident">String</span><span class="op">></span>(<span class="ident">options::FIELD</span>).<span class="ident">unwrap</span>().<span class="ident">as_str</span>() { |
624 |
| - <span class="string">"-"</span> => <span class="macro">vec!</span>[<span class="ident">Range</span> { |
| 626 | + <span class="kw">let</span> <span class="ident">fields</span> <span class="op">=</span> <span class="ident">args</span>.<span class="ident">get_one</span>::<span class="op"><</span><span class="ident">String</span><span class="op">></span>(<span class="ident">options::FIELD</span>).<span class="ident">unwrap</span>().<span class="ident">as_str</span>(); |
| 627 | + <span class="comment">// a lone "-" means "all fields", even as part of a list of fields</span> |
| 628 | + <span class="kw">let</span> <span class="ident">fields</span> <span class="op">=</span> <span class="kw">if</span> <span class="ident">fields</span>.<span class="ident">split</span>(<span class="string">','</span>).<span class="ident">any</span>(<span class="op">|</span><span class="ident">x</span><span class="op">|</span> <span class="ident">x</span> <span class="op">==</span> <span class="string">"-"</span>) { |
| 629 | + <span class="macro">vec!</span>[<span class="ident">Range</span> { |
625 | 630 | <span class="ident">low</span>: <span class="number">1</span>,
|
626 | 631 | <span class="ident">high</span>: <span class="ident">std::usize::MAX</span>,
|
627 |
| - }], |
628 |
| - <span class="ident">v</span> => <span class="ident">Range::from_list</span>(<span class="ident">v</span>)<span class="question-mark">?</span>, |
| 632 | + }] |
| 633 | + } <span class="kw">else</span> { |
| 634 | + <span class="ident">Range::from_list</span>(<span class="ident">fields</span>)<span class="question-mark">?</span> |
629 | 635 | };
|
630 | 636 |
|
631 | 637 | <span class="kw">let</span> <span class="ident">format</span> <span class="op">=</span> <span class="kw">match</span> <span class="ident">args</span>.<span class="ident">get_one</span>::<span class="op"><</span><span class="ident">String</span><span class="op">></span>(<span class="ident">options::FORMAT</span>) {
|
|
0 commit comments