Skip to content

Commit fe37531

Browse files
sylvestresylvestre
committed
deploy: c249eba 
1 parent 00df2b0 commit fe37531

11 files changed

+28
-36
lines changed

‎dev/src/uu_expand/expand.rs.html

Lines changed: 16 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -511,10 +511,6 @@
511511
<span id="506">506</span>
512512
<span id="507">507</span>
513513
<span id="508">508</span>
514-
<span id="509">509</span>
515-
<span id="510">510</span>
516-
<span id="511">511</span>
517-
<span id="512">512</span>
518514
</pre><pre class="rust"><code><span class="comment">// This file is part of the uutils coreutils package.</span>
519515
<span class="comment">//</span>
520516
<span class="comment">// (c) Virgile Andreani &lt;virgile.andreani@anbuco.fr&gt;</span>
@@ -531,16 +527,15 @@
531527

532528
<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>};
533529
<span class="kw">use</span> <span class="ident">std::error::Error</span>;
534-
<span class="kw">use</span> <span class="ident">std::ffi::OsString</span>;
535530
<span class="kw">use</span> <span class="ident">std::fmt</span>;
536531
<span class="kw">use</span> <span class="ident">std::fs::File</span>;
537532
<span class="kw">use</span> <span class="ident">std::io</span>::{<span class="ident">stdin</span>, <span class="ident">stdout</span>, <span class="ident">BufRead</span>, <span class="ident">BufReader</span>, <span class="ident">BufWriter</span>, <span class="ident">Read</span>, <span class="ident">Write</span>};
538533
<span class="kw">use</span> <span class="ident">std::num::IntErrorKind</span>;
539534
<span class="kw">use</span> <span class="ident">std::str::from_utf8</span>;
540535
<span class="kw">use</span> <span class="ident">unicode_width::UnicodeWidthChar</span>;
541536
<span class="kw">use</span> <span class="ident">uucore::display::Quotable</span>;
542-
<span class="kw">use</span> <span class="ident">uucore::error</span>::{<span class="ident">FromIo</span>, <span class="ident">UError</span>, <span class="ident">UResult</span>, <span class="ident">UUsageError</span>};
543-
<span class="kw">use</span> <span class="ident">uucore::format_usage</span>;
537+
<span class="kw">use</span> <span class="ident">uucore::error</span>::{<span class="ident">FromIo</span>, <span class="ident">UError</span>, <span class="ident">UResult</span>};
538+
<span class="kw">use</span> <span class="ident">uucore</span>::{<span class="ident">format_usage</span>, <span class="ident">InvalidEncodingHandling</span>};
544539

545540
<span class="kw">static</span> <span class="ident">ABOUT</span>: <span class="kw-2">&amp;</span><span class="ident">str</span> <span class="op">=</span> <span class="string">&quot;Convert tabs in each FILE to spaces, writing to standard output.
546541
With no FILE, or when FILE is -, read standard input.&quot;</span>;
@@ -768,33 +763,30 @@
768763

769764
<span class="doccomment">/// Preprocess command line arguments and expand shortcuts. For example, &quot;-7&quot; is expanded to</span>
770765
<span class="doccomment">/// &quot;--tabs=7&quot; and &quot;-1,3&quot; to &quot;--tabs=1 --tabs=3&quot;.</span>
771-
<span class="kw">fn</span> <span class="ident">expand_shortcuts</span><span class="op">&lt;</span><span class="lifetime">&#39;a</span><span class="op">&gt;</span>(
772-
<span class="kw-2">mut</span> <span class="ident">args</span>: <span class="kw">impl</span> <span class="ident">uucore::Args</span> <span class="op">+</span> <span class="lifetime">&#39;a</span>,
773-
) -&gt; <span class="prelude-ty">Result</span><span class="op">&lt;</span><span class="ident">Box</span><span class="op">&lt;</span><span class="kw">dyn</span> <span class="ident">Iterator</span><span class="op">&lt;</span><span class="ident">Item</span> <span class="op">=</span> <span class="ident">OsString</span><span class="op">&gt;</span> <span class="op">+</span> <span class="lifetime">&#39;a</span><span class="op">&gt;</span>, <span class="ident">Box</span><span class="op">&lt;</span>(<span class="kw">dyn</span> <span class="ident">UError</span> <span class="op">+</span> <span class="lifetime">&#39;static</span>)<span class="op">&gt;</span><span class="op">&gt;</span> {
774-
<span class="comment">// argv[0] is always present</span>
775-
<span class="kw">let</span> <span class="kw-2">mut</span> <span class="ident">processed_args</span> <span class="op">=</span> <span class="macro">vec!</span>[<span class="ident">args</span>.<span class="ident">next</span>().<span class="ident">unwrap</span>()];
766+
<span class="kw">fn</span> <span class="ident">expand_shortcuts</span>(<span class="ident">args</span>: <span class="kw-2">&amp;</span>[<span class="ident">String</span>]) -&gt; <span class="ident">Vec</span><span class="op">&lt;</span><span class="ident">String</span><span class="op">&gt;</span> {
767+
<span class="kw">let</span> <span class="kw-2">mut</span> <span class="ident">processed_args</span> <span class="op">=</span> <span class="ident">Vec::with_capacity</span>(<span class="ident">args</span>.<span class="ident">len</span>());
776768

777769
<span class="kw">for</span> <span class="ident">arg</span> <span class="kw">in</span> <span class="ident">args</span> {
778-
<span class="kw">if</span> <span class="kw">let</span> <span class="prelude-val">Some</span>(<span class="ident">s</span>) <span class="op">=</span> <span class="ident">arg</span>.<span class="ident">to_str</span>() {
779-
<span class="kw">if</span> <span class="ident">s</span>.<span class="ident">starts_with</span>(<span class="string">&#39;-&#39;</span>) <span class="op">&amp;&amp;</span> <span class="ident">s</span>[<span class="number">1</span>..].<span class="ident">chars</span>().<span class="ident">all</span>(<span class="ident">is_digit_or_comma</span>) {
780-
<span class="ident">s</span>[<span class="number">1</span>..]
781-
.<span class="ident">split</span>(<span class="string">&#39;,&#39;</span>)
782-
.<span class="ident">filter</span>(<span class="op">|</span><span class="ident">s</span><span class="op">|</span> <span class="op">!</span><span class="ident">s</span>.<span class="ident">is_empty</span>())
783-
.<span class="ident">for_each</span>(<span class="op">|</span><span class="ident">s</span><span class="op">|</span> <span class="ident">processed_args</span>.<span class="ident">push</span>(<span class="macro">format!</span>(<span class="string">&quot;--tabs={}&quot;</span>, <span class="ident">s</span>).<span class="ident">into</span>()));
784-
} <span class="kw">else</span> {
785-
<span class="ident">processed_args</span>.<span class="ident">push</span>(<span class="ident">arg</span>);
786-
}
770+
<span class="kw">if</span> <span class="ident">arg</span>.<span class="ident">starts_with</span>(<span class="string">&#39;-&#39;</span>) <span class="op">&amp;&amp;</span> <span class="ident">arg</span>[<span class="number">1</span>..].<span class="ident">chars</span>().<span class="ident">all</span>(<span class="ident">is_digit_or_comma</span>) {
771+
<span class="ident">arg</span>[<span class="number">1</span>..]
772+
.<span class="ident">split</span>(<span class="string">&#39;,&#39;</span>)
773+
.<span class="ident">filter</span>(<span class="op">|</span><span class="ident">s</span><span class="op">|</span> <span class="op">!</span><span class="ident">s</span>.<span class="ident">is_empty</span>())
774+
.<span class="ident">for_each</span>(<span class="op">|</span><span class="ident">s</span><span class="op">|</span> <span class="ident">processed_args</span>.<span class="ident">push</span>(<span class="macro">format!</span>(<span class="string">&quot;--tabs={}&quot;</span>, <span class="ident">s</span>)));
787775
} <span class="kw">else</span> {
788-
<span class="kw">return</span> <span class="prelude-val">Err</span>(<span class="ident">UUsageError::new</span>(<span class="number">1</span>, <span class="string">&quot;bad argument encoding&quot;</span>.<span class="ident">to_owned</span>()));
776+
<span class="ident">processed_args</span>.<span class="ident">push</span>(<span class="ident">arg</span>.<span class="ident">to_string</span>());
789777
}
790778
}
791779

792-
<span class="prelude-val">Ok</span>(<span class="ident">Box::new</span>(<span class="ident">processed_args</span>.<span class="ident">into_iter</span>()))
780+
<span class="ident">processed_args</span>
793781
}
794782

795783
<span class="attribute">#[<span class="ident">uucore::main</span>]</span>
796784
<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> {
797-
<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">expand_shortcuts</span>(<span class="ident">args</span>)<span class="question-mark">?</span>);
785+
<span class="kw">let</span> <span class="ident">args</span> <span class="op">=</span> <span class="ident">args</span>
786+
.<span class="ident">collect_str</span>(<span class="ident">InvalidEncodingHandling::Ignore</span>)
787+
.<span class="ident">accept_any</span>();
788+
789+
<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">expand_shortcuts</span>(<span class="kw-2">&amp;</span><span class="ident">args</span>));
798790

799791
<span class="ident">expand</span>(<span class="kw-2">&amp;</span><span class="ident">Options::new</span>(<span class="kw-2">&amp;</span><span class="ident">matches</span>)<span class="question-mark">?</span>).<span class="ident">map_err_context</span>(<span class="op">|</span><span class="op">|</span> <span class="string">&quot;failed to write output&quot;</span>.<span class="ident">to_string</span>())
800792
}

‎dev/src/uucore/lib.rs.html

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -523,8 +523,8 @@
523523
<span class="kw">pub</span> <span class="kw">trait</span> <span class="ident">Args</span>: <span class="ident">Iterator</span><span class="op">&lt;</span><span class="ident">Item</span> <span class="op">=</span> <span class="ident">OsString</span><span class="op">&gt;</span> <span class="op">+</span> <span class="ident">Sized</span> {
524524
<span class="doccomment">/// Converts each iterator item to a String and collects these into a vector</span>
525525
<span class="doccomment">/// On invalid encoding, the result will depend on the argument. This method allows to either drop entries with illegal encoding</span>
526-
<span class="doccomment">/// completely (```InvalidEncodingHandling::Ignore```), convert them using lossy-conversion (```InvalidEncodingHandling::Lossy```) which will</span>
527-
<span class="doccomment">/// result in strange strings or can chosen to panic (```InvalidEncodingHandling::Panic```).</span>
526+
<span class="doccomment">/// completely (```InvalidEncodingHandling::Ignore```), convert them using lossy-conversion (```InvalidEncodingHandling::ConvertLossy```)</span>
527+
<span class="doccomment">/// which will result in strange strings or can chosen to panic (```InvalidEncodingHandling::Panic```).</span>
528528
<span class="doccomment">/// # Arguments</span>
529529
<span class="doccomment">/// * `handling` - This switch allows to switch the behavior, when invalid encoding is encountered</span>
530530
<span class="doccomment">/// # Panics</span>

‎dev/uu_expand/fn.uu_app.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,5 +4,5 @@
44
</nav>
55
<nav class="sidebar"><a class="sidebar-logo" href="../uu_expand/index.html"><div class="logo-container"><img class="rust-logo" src="../rust-logo.svg" alt="logo"></div>
66
</a><div class="sidebar-elems"><h2 class="location"><a href="index.html">In uu_expand</a></h2><div id="sidebar-vars" data-name="uu_app" data-ty="fn" data-relpath=""></div><script defer src="sidebar-items.js"></script></div></nav><main><div class="width-limiter"><div class="sub-container"><a class="sub-logo-container" href="../uu_expand/index.html"><img class="rust-logo" src="../rust-logo.svg" alt="logo"></a><nav class="sub"><div class="theme-picker hidden"><button id="theme-picker" aria-label="Pick another theme!" aria-haspopup="menu" title="themes"><img width="22" height="22" alt="Pick another theme!" src="../brush.svg"></button><div id="theme-choices" role="menu"></div></div><form class="search-form"><div class="search-container"><span></span><input class="search-input" name="search" autocomplete="off" spellcheck="false" placeholder="Click or press ‘S’ to search, ‘?’ for more options…" type="search"><button type="button" id="help-button" title="help">?</button><a id="settings-menu" href="../settings.html" title="settings"><img width="22" height="22" alt="Change settings" src="../wheel.svg"></a></div></form></nav></div><section id="main-content" class="content"><div class="main-heading">
7-
<h1 class="fqn"><span class="in-band">Function <a href="index.html">uu_expand</a>::<wbr><a class="fn" href="#">uu_app</a><button id="copy-path" onclick="copy_path(this)" title="Copy item path to clipboard"><img src="../clipboard.svg" width="19" height="18" alt="Copy item path"></button></span></h1><span class="out-of-band"><a class="srclink" href="../src/uu_expand/expand.rs.html#285-319">source</a> · <a id="toggle-all-docs" href="javascript:void(0)" title="collapse all docs">[<span class="inner">&#x2212;</span>]</a></span></div><div class="docblock item-decl"><pre class="rust fn"><code>pub fn uu_app&lt;'a&gt;() -&gt; Command&lt;'a&gt;</code></pre></div></section><section id="search" class="content hidden"></section></div></main><div id="rustdoc-vars" data-root-path="../" data-current-crate="uu_expand" data-themes="ayu,dark,light" data-resource-suffix="" data-rustdoc-version="1.61.0 (fe5b13d68 2022-05-18)" ></div>
7+
<h1 class="fqn"><span class="in-band">Function <a href="index.html">uu_expand</a>::<wbr><a class="fn" href="#">uu_app</a><button id="copy-path" onclick="copy_path(this)" title="Copy item path to clipboard"><img src="../clipboard.svg" width="19" height="18" alt="Copy item path"></button></span></h1><span class="out-of-band"><a class="srclink" href="../src/uu_expand/expand.rs.html#281-315">source</a> · <a id="toggle-all-docs" href="javascript:void(0)" title="collapse all docs">[<span class="inner">&#x2212;</span>]</a></span></div><div class="docblock item-decl"><pre class="rust fn"><code>pub fn uu_app&lt;'a&gt;() -&gt; Command&lt;'a&gt;</code></pre></div></section><section id="search" class="content hidden"></section></div></main><div id="rustdoc-vars" data-root-path="../" data-current-crate="uu_expand" data-themes="ayu,dark,light" data-resource-suffix="" data-rustdoc-version="1.61.0 (fe5b13d68 2022-05-18)" ></div>
88
</body></html>

‎dev/uu_expand/fn.uumain.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,5 +4,5 @@
44
</nav>
55
<nav class="sidebar"><a class="sidebar-logo" href="../uu_expand/index.html"><div class="logo-container"><img class="rust-logo" src="../rust-logo.svg" alt="logo"></div>
66
</a><div class="sidebar-elems"><h2 class="location"><a href="index.html">In uu_expand</a></h2><div id="sidebar-vars" data-name="uumain" data-ty="fn" data-relpath=""></div><script defer src="sidebar-items.js"></script></div></nav><main><div class="width-limiter"><div class="sub-container"><a class="sub-logo-container" href="../uu_expand/index.html"><img class="rust-logo" src="../rust-logo.svg" alt="logo"></a><nav class="sub"><div class="theme-picker hidden"><button id="theme-picker" aria-label="Pick another theme!" aria-haspopup="menu" title="themes"><img width="22" height="22" alt="Pick another theme!" src="../brush.svg"></button><div id="theme-choices" role="menu"></div></div><form class="search-form"><div class="search-container"><span></span><input class="search-input" name="search" autocomplete="off" spellcheck="false" placeholder="Click or press ‘S’ to search, ‘?’ for more options…" type="search"><button type="button" id="help-button" title="help">?</button><a id="settings-menu" href="../settings.html" title="settings"><img width="22" height="22" alt="Change settings" src="../wheel.svg"></a></div></form></nav></div><section id="main-content" class="content"><div class="main-heading">
7-
<h1 class="fqn"><span class="in-band">Function <a href="index.html">uu_expand</a>::<wbr><a class="fn" href="#">uumain</a><button id="copy-path" onclick="copy_path(this)" title="Copy item path to clipboard"><img src="../clipboard.svg" width="19" height="18" alt="Copy item path"></button></span></h1><span class="out-of-band"><a class="srclink" href="../src/uu_expand/expand.rs.html#278">source</a> · <a id="toggle-all-docs" href="javascript:void(0)" title="collapse all docs">[<span class="inner">&#x2212;</span>]</a></span></div><div class="docblock item-decl"><pre class="rust fn"><code>pub fn uumain(args: impl <a class="trait" href="../uucore/trait.Args.html" title="trait uucore::Args">Args</a>) -&gt; <a class="primitive" href="https://doc.rust-lang.org/1.61.0/std/primitive.i32.html">i32</a></code></pre></div></section><section id="search" class="content hidden"></section></div></main><div id="rustdoc-vars" data-root-path="../" data-current-crate="uu_expand" data-themes="ayu,dark,light" data-resource-suffix="" data-rustdoc-version="1.61.0 (fe5b13d68 2022-05-18)" ></div>
7+
<h1 class="fqn"><span class="in-band">Function <a href="index.html">uu_expand</a>::<wbr><a class="fn" href="#">uumain</a><button id="copy-path" onclick="copy_path(this)" title="Copy item path to clipboard"><img src="../clipboard.svg" width="19" height="18" alt="Copy item path"></button></span></h1><span class="out-of-band"><a class="srclink" href="../src/uu_expand/expand.rs.html#270">source</a> · <a id="toggle-all-docs" href="javascript:void(0)" title="collapse all docs">[<span class="inner">&#x2212;</span>]</a></span></div><div class="docblock item-decl"><pre class="rust fn"><code>pub fn uumain(args: impl <a class="trait" href="../uucore/trait.Args.html" title="trait uucore::Args">Args</a>) -&gt; <a class="primitive" href="https://doc.rust-lang.org/1.61.0/std/primitive.i32.html">i32</a></code></pre></div></section><section id="search" class="content hidden"></section></div></main><div id="rustdoc-vars" data-root-path="../" data-current-crate="uu_expand" data-themes="ayu,dark,light" data-resource-suffix="" data-rustdoc-version="1.61.0 (fe5b13d68 2022-05-18)" ></div>
88
</body></html>

0 commit comments

Comments
 (0)