Skip to content

Commit 152d427

Browse files
sylvestresylvestre
committed
deploy: c249eba 
1 parent 2505580 commit 152d427

Some content is hidden

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

48 files changed

+2170
-194
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/src/uu_expand/expand.rs.html

Lines changed: 42 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -453,6 +453,27 @@
453453
<span id="448">448</span>
454454
<span id="449">449</span>
455455
<span id="450">450</span>
456+
<span id="451">451</span>
457+
<span id="452">452</span>
458+
<span id="453">453</span>
459+
<span id="454">454</span>
460+
<span id="455">455</span>
461+
<span id="456">456</span>
462+
<span id="457">457</span>
463+
<span id="458">458</span>
464+
<span id="459">459</span>
465+
<span id="460">460</span>
466+
<span id="461">461</span>
467+
<span id="462">462</span>
468+
<span id="463">463</span>
469+
<span id="464">464</span>
470+
<span id="465">465</span>
471+
<span id="466">466</span>
472+
<span id="467">467</span>
473+
<span id="468">468</span>
474+
<span id="469">469</span>
475+
<span id="470">470</span>
476+
<span id="471">471</span>
456477
</pre><pre class="rust"><code><span class="comment">// This file is part of the uutils coreutils package.</span>
457478
<span class="comment">//</span>
458479
<span class="comment">// (c) Virgile Andreani &lt;virgile.andreani@anbuco.fr&gt;</span>
@@ -496,6 +517,7 @@
496517

497518
<span class="doccomment">/// The mode to use when replacing tabs beyond the last one specified in</span>
498519
<span class="doccomment">/// the `--tabs` argument.</span>
520+
<span class="attribute">#[<span class="ident">derive</span>(<span class="ident">PartialEq</span>)]</span>
499521
<span class="kw">enum</span> <span class="ident">RemainingMode</span> {
500522
<span class="prelude-val">None</span>,
501523
<span class="ident">Slash</span>,
@@ -520,6 +542,7 @@
520542
<span class="kw">enum</span> <span class="ident">ParseError</span> {
521543
<span class="ident">InvalidCharacter</span>(<span class="ident">String</span>),
522544
<span class="ident">SpecifierNotAtStartOfNumber</span>(<span class="ident">String</span>, <span class="ident">String</span>),
545+
<span class="ident">SpecifierOnlyAllowedWithLastValue</span>(<span class="ident">String</span>),
523546
<span class="ident">TabSizeCannotBeZero</span>,
524547
<span class="ident">TabSizeTooLarge</span>(<span class="ident">String</span>),
525548
<span class="ident">TabSizesMustBeAscending</span>,
@@ -540,6 +563,11 @@
540563
<span class="ident">specifier</span>.<span class="ident">quote</span>(),
541564
<span class="ident">s</span>.<span class="ident">quote</span>(),
542565
),
566+
<span class="ident"><span class="self">Self</span>::SpecifierOnlyAllowedWithLastValue</span>(<span class="ident">specifier</span>) =&gt; <span class="macro">write!</span>(
567+
<span class="ident">f</span>,
568+
<span class="string">&quot;{} specifier only allowed with the last value&quot;</span>,
569+
<span class="ident">specifier</span>.<span class="ident">quote</span>()
570+
),
543571
<span class="ident"><span class="self">Self</span>::TabSizeCannotBeZero</span> =&gt; <span class="macro">write!</span>(<span class="ident">f</span>, <span class="string">&quot;tab size cannot be 0&quot;</span>),
544572
<span class="ident"><span class="self">Self</span>::TabSizeTooLarge</span>(<span class="ident">s</span>) =&gt; <span class="macro">write!</span>(<span class="ident">f</span>, <span class="string">&quot;tab stop is too large {}&quot;</span>, <span class="ident">s</span>.<span class="ident">quote</span>()),
545573
<span class="ident"><span class="self">Self</span>::TabSizesMustBeAscending</span> =&gt; <span class="macro">write!</span>(<span class="ident">f</span>, <span class="string">&quot;tab sizes must be ascending&quot;</span>),
@@ -567,6 +595,7 @@
567595

568596
<span class="kw">let</span> <span class="kw-2">mut</span> <span class="ident">nums</span> <span class="op">=</span> <span class="macro">vec!</span>[];
569597
<span class="kw">let</span> <span class="kw-2">mut</span> <span class="ident">remaining_mode</span> <span class="op">=</span> <span class="ident">RemainingMode::None</span>;
598+
<span class="kw">let</span> <span class="kw-2">mut</span> <span class="ident">is_specifier_already_used</span> <span class="op">=</span> <span class="bool-val">false</span>;
570599
<span class="kw">for</span> <span class="ident">word</span> <span class="kw">in</span> <span class="ident">s</span>.<span class="ident">split</span>(<span class="ident">is_space_or_comma</span>) {
571600
<span class="kw">let</span> <span class="ident">bytes</span> <span class="op">=</span> <span class="ident">word</span>.<span class="ident">as_bytes</span>();
572601
<span class="kw">for</span> <span class="ident">i</span> <span class="kw">in</span> <span class="number">0</span>..<span class="ident">bytes</span>.<span class="ident">len</span>() {
@@ -594,6 +623,19 @@
594623
}
595624
}
596625

626+
<span class="kw">if</span> <span class="ident">is_specifier_already_used</span> {
627+
<span class="kw">let</span> <span class="ident">specifier</span> <span class="op">=</span> <span class="kw">if</span> <span class="ident">remaining_mode</span> <span class="op">==</span> <span class="ident">RemainingMode::Slash</span> {
628+
<span class="string">&quot;/&quot;</span>.<span class="ident">to_string</span>()
629+
} <span class="kw">else</span> {
630+
<span class="string">&quot;+&quot;</span>.<span class="ident">to_string</span>()
631+
};
632+
<span class="kw">return</span> <span class="prelude-val">Err</span>(<span class="ident">ParseError::SpecifierOnlyAllowedWithLastValue</span>(
633+
<span class="ident">specifier</span>,
634+
));
635+
} <span class="kw">else</span> <span class="kw">if</span> <span class="ident">remaining_mode</span> <span class="op">!</span><span class="op">=</span> <span class="ident">RemainingMode::None</span> {
636+
<span class="ident">is_specifier_already_used</span> <span class="op">=</span> <span class="bool-val">true</span>;
637+
}
638+
597639
<span class="comment">// Append this tab stop to the list of all tabstops.</span>
598640
<span class="ident">nums</span>.<span class="ident">push</span>(<span class="ident">num</span>);
599641
<span class="kw">break</span>;

0 commit comments

Comments
 (0)