This commit is contained in:
sylvestre
2022-05-18 03:24:42 +00:00
parent 2a488e3c97
commit 93097ca1d7
36 changed files with 77 additions and 69 deletions
+1 -1
View File
@@ -4,5 +4,5 @@
</nav>
<nav class="sidebar"><a class="sidebar-logo" href="../coreutils/index.html"><div class="logo-container"><img class="rust-logo" src="../rust-logo.svg" alt="logo"></div>
</a><div class="sidebar-elems"><h2 class="location"><a href="index.html">In coreutils</a></h2><div id="sidebar-vars" data-name="util_map" 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="../coreutils/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">
<h1 class="fqn"><span class="in-band">Function <a href="index.html">coreutils</a>::<wbr><a class="fn" href="#">util_map</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/coreutils/home/runner/work/coreutils-docs/coreutils-docs/coreutils/target/debug/build/coreutils-a8c85d83d7df04f3/out/uutils_map.rs.html#3-153">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(crate) fn util_map&lt;T:&nbsp;<a class="trait" href="../uucore/trait.Args.html" title="trait uucore::Args">Args</a>&gt;(<br>) -&gt; <a class="struct" href="https://docs.rs/phf/0.10/phf/map/struct.Map.html" title="struct phf::map::Map">Map</a>&lt;&amp;'static <a class="primitive" href="https://doc.rust-lang.org/1.60.0/std/primitive.str.html">str</a>, <a class="primitive" href="https://doc.rust-lang.org/1.60.0/std/primitive.tuple.html">(</a><a class="primitive" href="https://doc.rust-lang.org/1.60.0/std/primitive.fn.html">fn</a>(_: T) -&gt; <a class="primitive" href="https://doc.rust-lang.org/1.60.0/std/primitive.i32.html">i32</a>, <a class="primitive" href="https://doc.rust-lang.org/1.60.0/std/primitive.fn.html">fn</a>() -&gt; Command&lt;'static&gt;<a class="primitive" href="https://doc.rust-lang.org/1.60.0/std/primitive.tuple.html">)</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="coreutils" data-themes="ayu,dark,light" data-resource-suffix="" data-rustdoc-version="1.60.0 (7737e0b5c 2022-04-04)" ></div>
<h1 class="fqn"><span class="in-band">Function <a href="index.html">coreutils</a>::<wbr><a class="fn" href="#">util_map</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/coreutils/home/runner/work/coreutils-docs/coreutils-docs/coreutils/target/debug/build/coreutils-d710312941481a9b/out/uutils_map.rs.html#3-153">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(crate) fn util_map&lt;T:&nbsp;<a class="trait" href="../uucore/trait.Args.html" title="trait uucore::Args">Args</a>&gt;(<br>) -&gt; <a class="struct" href="https://docs.rs/phf/0.10/phf/map/struct.Map.html" title="struct phf::map::Map">Map</a>&lt;&amp;'static <a class="primitive" href="https://doc.rust-lang.org/1.60.0/std/primitive.str.html">str</a>, <a class="primitive" href="https://doc.rust-lang.org/1.60.0/std/primitive.tuple.html">(</a><a class="primitive" href="https://doc.rust-lang.org/1.60.0/std/primitive.fn.html">fn</a>(_: T) -&gt; <a class="primitive" href="https://doc.rust-lang.org/1.60.0/std/primitive.i32.html">i32</a>, <a class="primitive" href="https://doc.rust-lang.org/1.60.0/std/primitive.fn.html">fn</a>() -&gt; Command&lt;'static&gt;<a class="primitive" href="https://doc.rust-lang.org/1.60.0/std/primitive.tuple.html">)</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="coreutils" data-themes="ayu,dark,light" data-resource-suffix="" data-rustdoc-version="1.60.0 (7737e0b5c 2022-04-04)" ></div>
</body></html>
+1 -1
View File
@@ -4,5 +4,5 @@
</nav>
<nav class="sidebar"><a class="sidebar-logo" href="../coreutils/index.html"><div class="logo-container"><img class="rust-logo" src="../rust-logo.svg" alt="logo"></div>
</a><h2 class="location"><a href="#">UtilityMap</a></h2><div class="sidebar-elems"><h2 class="location"><a href="index.html">In coreutils</a></h2><div id="sidebar-vars" data-name="UtilityMap" data-ty="type" 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="../coreutils/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">
<h1 class="fqn"><span class="in-band">Type Definition <a href="index.html">coreutils</a>::<wbr><a class="type" href="#">UtilityMap</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/coreutils/home/runner/work/coreutils-docs/coreutils-docs/coreutils/target/debug/build/coreutils-a8c85d83d7df04f3/out/uutils_map.rs.html#1">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 typedef"><code>pub(crate) type UtilityMap&lt;T&gt; = <a class="struct" href="https://docs.rs/phf/0.10/phf/map/struct.Map.html" title="struct phf::map::Map">Map</a>&lt;&amp;'static <a class="primitive" href="https://doc.rust-lang.org/1.60.0/std/primitive.str.html">str</a>, <a class="primitive" href="https://doc.rust-lang.org/1.60.0/std/primitive.tuple.html">(</a><a class="primitive" href="https://doc.rust-lang.org/1.60.0/std/primitive.fn.html">fn</a>(_: T) -&gt; <a class="primitive" href="https://doc.rust-lang.org/1.60.0/std/primitive.i32.html">i32</a>, <a class="primitive" href="https://doc.rust-lang.org/1.60.0/std/primitive.fn.html">fn</a>() -&gt; Command&lt;'static&gt;<a class="primitive" href="https://doc.rust-lang.org/1.60.0/std/primitive.tuple.html">)</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="coreutils" data-themes="ayu,dark,light" data-resource-suffix="" data-rustdoc-version="1.60.0 (7737e0b5c 2022-04-04)" ></div>
<h1 class="fqn"><span class="in-band">Type Definition <a href="index.html">coreutils</a>::<wbr><a class="type" href="#">UtilityMap</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/coreutils/home/runner/work/coreutils-docs/coreutils-docs/coreutils/target/debug/build/coreutils-d710312941481a9b/out/uutils_map.rs.html#1">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 typedef"><code>pub(crate) type UtilityMap&lt;T&gt; = <a class="struct" href="https://docs.rs/phf/0.10/phf/map/struct.Map.html" title="struct phf::map::Map">Map</a>&lt;&amp;'static <a class="primitive" href="https://doc.rust-lang.org/1.60.0/std/primitive.str.html">str</a>, <a class="primitive" href="https://doc.rust-lang.org/1.60.0/std/primitive.tuple.html">(</a><a class="primitive" href="https://doc.rust-lang.org/1.60.0/std/primitive.fn.html">fn</a>(_: T) -&gt; <a class="primitive" href="https://doc.rust-lang.org/1.60.0/std/primitive.i32.html">i32</a>, <a class="primitive" href="https://doc.rust-lang.org/1.60.0/std/primitive.fn.html">fn</a>() -&gt; Command&lt;'static&gt;<a class="primitive" href="https://doc.rust-lang.org/1.60.0/std/primitive.tuple.html">)</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="coreutils" data-themes="ayu,dark,light" data-resource-suffix="" data-rustdoc-version="1.60.0 (7737e0b5c 2022-04-04)" ></div>
</body></html>
+2 -2
View File
File diff suppressed because one or more lines are too long
+1 -1
View File
@@ -415,7 +415,7 @@
<span class="kw">fn</span> <span class="ident">handle_obsolete</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>, <span class="prelude-ty">Option</span><span class="op">&lt;</span><span class="ident">String</span><span class="op">&gt;</span>) {
<span class="kw">for</span> (<span class="ident">i</span>, <span class="ident">arg</span>) <span class="kw">in</span> <span class="ident">args</span>.<span class="ident">iter</span>().<span class="ident">enumerate</span>() {
<span class="kw">let</span> <span class="ident">slice</span> <span class="op">=</span> <span class="kw-2">&amp;</span><span class="ident">arg</span>;
<span class="kw">if</span> <span class="ident">slice</span>.<span class="ident">starts_with</span>(<span class="string">&#39;-&#39;</span>) <span class="op">&amp;&amp;</span> <span class="ident">slice</span>.<span class="ident">chars</span>().<span class="ident">nth</span>(<span class="number">1</span>).<span class="ident">map_or</span>(<span class="bool-val">false</span>, <span class="op">|</span><span class="ident">c</span><span class="op">|</span> <span class="ident">c</span>.<span class="ident">is_digit</span>(<span class="number">10</span>)) {
<span class="kw">if</span> <span class="ident">slice</span>.<span class="ident">starts_with</span>(<span class="string">&#39;-&#39;</span>) <span class="op">&amp;&amp;</span> <span class="ident">slice</span>.<span class="ident">chars</span>().<span class="ident">nth</span>(<span class="number">1</span>).<span class="ident">map_or</span>(<span class="bool-val">false</span>, <span class="op">|</span><span class="ident">c</span><span class="op">|</span> <span class="ident">c</span>.<span class="ident">is_ascii_digit</span>()) {
<span class="kw">let</span> <span class="kw-2">mut</span> <span class="ident">v</span> <span class="op">=</span> <span class="ident">args</span>.<span class="ident">to_vec</span>();
<span class="ident">v</span>.<span class="ident">remove</span>(<span class="ident">i</span>);
<span class="kw">return</span> (<span class="ident">v</span>, <span class="prelude-val">Some</span>(<span class="ident">slice</span>[<span class="number">1</span>..].<span class="ident">to_owned</span>()));
+1 -1
View File
@@ -207,7 +207,7 @@
<span class="kw">let</span> <span class="kw-2">mut</span> <span class="ident">has_num</span> <span class="op">=</span> <span class="bool-val">false</span>;
<span class="kw">let</span> <span class="kw-2">mut</span> <span class="ident">last_char</span> <span class="op">=</span> <span class="number">0</span> <span class="kw">as</span> <span class="ident">char</span>;
<span class="kw">for</span> (<span class="ident">n</span>, <span class="ident">c</span>) <span class="kw">in</span> <span class="kw-2">&amp;mut</span> <span class="ident">chars</span> {
<span class="kw">if</span> <span class="ident">c</span>.<span class="ident">is_digit</span>(<span class="number">10</span>) {
<span class="kw">if</span> <span class="ident">c</span>.<span class="ident">is_ascii_digit</span>() {
<span class="ident">has_num</span> <span class="op">=</span> <span class="bool-val">true</span>;
<span class="ident">num_end</span> <span class="op">=</span> <span class="ident">n</span>;
} <span class="kw">else</span> {
+3 -3
View File
@@ -2802,7 +2802,7 @@
<span class="ident">cmp::Reverse</span>,
<span class="ident">error::Error</span>,
<span class="ident">ffi</span>::{<span class="ident">OsStr</span>, <span class="ident">OsString</span>},
<span class="ident">fmt::Display</span>,
<span class="ident">fmt</span>::{<span class="ident">Display</span>, <span class="ident">Write</span> <span class="kw">as</span> <span class="ident">FmtWrite</span>},
<span class="ident">fs</span>::{<span class="self">self</span>, <span class="ident">DirEntry</span>, <span class="ident">FileType</span>, <span class="ident">Metadata</span>, <span class="ident">ReadDir</span>},
<span class="ident">io</span>::{<span class="ident">stdout</span>, <span class="ident">BufWriter</span>, <span class="ident">ErrorKind</span>, <span class="ident">Stdout</span>, <span class="ident">Write</span>},
<span class="ident">path</span>::{<span class="ident">Path</span>, <span class="ident">PathBuf</span>},
@@ -4600,7 +4600,7 @@
} <span class="kw">else</span> {
<span class="string">&quot;?&quot;</span>.<span class="ident">to_owned</span>()
};
<span class="ident">result</span>.<span class="ident">push_str</span>(<span class="kw-2">&amp;</span><span class="macro">format!</span>(<span class="string">&quot;{} &quot;</span>, <span class="ident">pad_left</span>(<span class="kw-2">&amp;</span><span class="ident">i</span>, <span class="ident">padding</span>.<span class="ident">inode</span>)));
<span class="macro">write!</span>(<span class="ident">result</span>, <span class="string">&quot;{} &quot;</span>, <span class="ident">pad_left</span>(<span class="kw-2">&amp;</span><span class="ident">i</span>, <span class="ident">padding</span>.<span class="ident">inode</span>)).<span class="ident">unwrap</span>();
}
}
@@ -4610,7 +4610,7 @@
} <span class="kw">else</span> {
<span class="string">&quot;?&quot;</span>.<span class="ident">to_owned</span>()
};
<span class="ident">result</span>.<span class="ident">push_str</span>(<span class="kw-2">&amp;</span><span class="macro">format!</span>(<span class="string">&quot;{} &quot;</span>, <span class="ident">pad_left</span>(<span class="kw-2">&amp;</span><span class="ident">s</span>, <span class="ident">padding</span>.<span class="ident">block_size</span>),));
<span class="macro">write!</span>(<span class="ident">result</span>, <span class="string">&quot;{} &quot;</span>, <span class="ident">pad_left</span>(<span class="kw-2">&amp;</span><span class="ident">s</span>, <span class="ident">padding</span>.<span class="ident">block_size</span>)).<span class="ident">unwrap</span>();
}
<span class="prelude-val">Ok</span>(<span class="ident">result</span>)
}
+1 -1
View File
@@ -568,7 +568,7 @@
<span class="ident">p</span> =&gt; <span class="macro">format!</span>(
<span class="string">&quot;{:&lt;padding$}&quot;</span>,
<span class="ident">number_with_suffix</span>,
<span class="ident">padding</span> <span class="op">=</span> <span class="ident">p</span>.<span class="ident">abs</span>() <span class="kw">as</span> <span class="ident">usize</span>
<span class="ident">padding</span> <span class="op">=</span> <span class="ident">p</span>.<span class="ident">unsigned_abs</span>()
),
})
}
+14 -4
View File
@@ -685,6 +685,11 @@
<span id="680">680</span>
<span id="681">681</span>
<span id="682">682</span>
<span id="683">683</span>
<span id="684">684</span>
<span id="685">685</span>
<span id="686">686</span>
<span id="687">687</span>
</pre><pre class="rust"><code><span class="comment">// * This file is part of the uutils coreutils package.</span>
<span class="comment">// *</span>
<span class="comment">// * (c) Ben Hirsch &lt;benhirsch24@gmail.com&gt;</span>
@@ -716,6 +721,7 @@
<span class="kw">mod</span> <span class="ident">prn_int</span>;
<span class="kw">use</span> <span class="ident">std::cmp</span>;
<span class="kw">use</span> <span class="ident">std::fmt::Write</span>;
<span class="kw">use</span> <span class="ident"><span class="kw">crate</span>::byteorder_io</span>::<span class="kw-2">*</span>;
<span class="kw">use</span> <span class="ident"><span class="kw">crate</span>::formatteriteminfo</span>::<span class="kw-2">*</span>;
@@ -1287,11 +1293,13 @@ exitcode will be non-zero.&quot;#</span>;
<span class="kw">let</span> <span class="kw-2">mut</span> <span class="ident">b</span> <span class="op">=</span> <span class="number">0</span>;
<span class="kw">while</span> <span class="ident">b</span> <span class="op">&lt;</span> <span class="ident">input_decoder</span>.<span class="ident">length</span>() {
<span class="ident">output_text</span>.<span class="ident">push_str</span>(<span class="kw-2">&amp;</span><span class="macro">format!</span>(
<span class="macro">write!</span>(
<span class="ident">output_text</span>,
<span class="string">&quot;{:&gt;width$}&quot;</span>,
<span class="string">&quot;&quot;</span>,
<span class="ident">width</span> <span class="op">=</span> <span class="ident">f</span>.<span class="ident">spacing</span>[<span class="ident">b</span> <span class="op">%</span> <span class="ident">output_info</span>.<span class="ident">byte_size_block</span>]
));
)
.<span class="ident">unwrap</span>();
<span class="kw">match</span> <span class="ident">f</span>.<span class="ident">formatter_item_info</span>.<span class="ident">formatter</span> {
<span class="ident">FormatWriter::IntWriter</span>(<span class="ident">func</span>) =&gt; {
@@ -1314,12 +1322,14 @@ exitcode will be non-zero.&quot;#</span>;
<span class="kw">let</span> <span class="ident">missing_spacing</span> <span class="op">=</span> <span class="ident">output_info</span>
.<span class="ident">print_width_line</span>
.<span class="ident">saturating_sub</span>(<span class="ident">output_text</span>.<span class="ident">chars</span>().<span class="ident">count</span>());
<span class="ident">output_text</span>.<span class="ident">push_str</span>(<span class="kw-2">&amp;</span><span class="macro">format!</span>(
<span class="macro">write!</span>(
<span class="ident">output_text</span>,
<span class="string">&quot;{:&gt;width$} {}&quot;</span>,
<span class="string">&quot;&quot;</span>,
<span class="ident">format_ascii_dump</span>(<span class="ident">input_decoder</span>.<span class="ident">get_buffer</span>(<span class="number">0</span>)),
<span class="ident">width</span> <span class="op">=</span> <span class="ident">missing_spacing</span>
));
)
.<span class="ident">unwrap</span>();
}
<span class="kw">if</span> <span class="ident">first</span> {
+1 -1
View File
@@ -788,7 +788,7 @@
<span class="kw">return</span> <span class="bool-val">false</span>;
}
<span class="kw">match</span> <span class="ident">ch</span> {
<span class="prelude-val">Some</span>(<span class="ident">d</span>) <span class="kw">if</span> <span class="ident">d</span>.<span class="ident">is_digit</span>(<span class="number">10</span>) =&gt; {
<span class="prelude-val">Some</span>(<span class="ident">d</span>) <span class="kw">if</span> <span class="ident">d</span>.<span class="ident">is_ascii_digit</span>() =&gt; {
<span class="ident">decimal_size</span>.<span class="ident">push</span>(<span class="ident">d</span>);
<span class="bool-val">true</span>
}
+1 -1
View File
@@ -383,7 +383,7 @@
}
<span class="doccomment">/// Implementation for `getopts`</span>
<span class="kw">impl</span><span class="op">&lt;</span><span class="lifetime">&#39;a</span><span class="op">&gt;</span> <span class="ident">CommandLineOpts</span> <span class="kw">for</span> <span class="ident">ArgMatches</span> {
<span class="kw">impl</span> <span class="ident">CommandLineOpts</span> <span class="kw">for</span> <span class="ident">ArgMatches</span> {
<span class="kw">fn</span> <span class="ident">inputs</span>(<span class="kw-2">&amp;</span><span class="self">self</span>) -&gt; <span class="ident">Vec</span><span class="op">&lt;</span><span class="kw-2">&amp;</span><span class="ident">str</span><span class="op">&gt;</span> {
<span class="self">self</span>.<span class="ident">values_of</span>(<span class="ident">options::FILENAME</span>)
.<span class="ident">map</span>(<span class="op">|</span><span class="ident">values</span><span class="op">|</span> <span class="ident">values</span>.<span class="ident">collect</span>())
+16 -12
View File
@@ -885,6 +885,8 @@
<span id="880">880</span>
<span id="881">881</span>
<span id="882">882</span>
<span id="883">883</span>
<span id="884">884</span>
</pre><pre class="rust"><code><span class="comment">// * This file is part of the uutils coreutils package.</span>
<span class="comment">// *</span>
<span class="comment">// * (c) Dorota Kapturkiewicz &lt;dokaptur@gmail.com&gt;</span>
@@ -900,7 +902,7 @@
<span class="kw">use</span> <span class="ident">std::collections</span>::{<span class="ident">BTreeSet</span>, <span class="ident">HashMap</span>, <span class="ident">HashSet</span>};
<span class="kw">use</span> <span class="ident">std::default::Default</span>;
<span class="kw">use</span> <span class="ident">std::error::Error</span>;
<span class="kw">use</span> <span class="ident">std::fmt</span>::{<span class="ident">Display</span>, <span class="ident">Formatter</span>};
<span class="kw">use</span> <span class="ident">std::fmt</span>::{<span class="ident">Display</span>, <span class="ident">Formatter</span>, <span class="ident">Write</span> <span class="kw">as</span> <span class="ident">FmtWrite</span>};
<span class="kw">use</span> <span class="ident">std::fs::File</span>;
<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>};
<span class="kw">use</span> <span class="ident">std::num::ParseIntError</span>;
@@ -1459,7 +1461,7 @@
<span class="ident">reference</span>: <span class="kw-2">&amp;</span><span class="ident">str</span>,
) -&gt; <span class="ident">String</span> {
<span class="kw">let</span> <span class="kw-2">mut</span> <span class="ident">output</span> <span class="op">=</span> <span class="ident">String::new</span>();
<span class="ident">output</span>.<span class="ident">push_str</span>(<span class="kw-2">&amp;</span><span class="macro">format!</span>(<span class="string">&quot;\\{} &quot;</span>, <span class="ident">config</span>.<span class="ident">macro_name</span>));
<span class="macro">write!</span>(<span class="ident">output</span>, <span class="string">&quot;\\{} &quot;</span>, <span class="ident">config</span>.<span class="ident">macro_name</span>).<span class="ident">unwrap</span>();
<span class="kw">let</span> <span class="ident">all_before</span> <span class="op">=</span> <span class="kw">if</span> <span class="ident">config</span>.<span class="ident">input_ref</span> {
<span class="kw">let</span> <span class="ident">before</span> <span class="op">=</span> <span class="kw-2">&amp;</span><span class="ident">line</span>[<span class="number">0</span>..<span class="ident">word_ref</span>.<span class="ident">position</span>];
<span class="kw">let</span> <span class="ident">before_start_trim_offset</span> <span class="op">=</span>
@@ -1474,18 +1476,18 @@
<span class="kw">let</span> <span class="ident">after_chars_trim_idx</span> <span class="op">=</span> (<span class="ident">word_ref</span>.<span class="ident">position_end</span>, <span class="ident">chars_line</span>.<span class="ident">len</span>());
<span class="kw">let</span> <span class="ident">all_after</span> <span class="op">=</span> <span class="kw-2">&amp;</span><span class="ident">chars_line</span>[<span class="ident">after_chars_trim_idx</span>.<span class="number">0</span>..<span class="ident">after_chars_trim_idx</span>.<span class="number">1</span>];
<span class="kw">let</span> (<span class="ident">tail</span>, <span class="ident">before</span>, <span class="ident">after</span>, <span class="ident">head</span>) <span class="op">=</span> <span class="ident">get_output_chunks</span>(<span class="ident">all_before</span>, <span class="ident">keyword</span>, <span class="ident">all_after</span>, <span class="ident">config</span>);
<span class="ident">output</span>.<span class="ident">push_str</span>(<span class="kw-2">&amp;</span><span class="macro">format!</span>(
<span class="string">&quot;{5}{0}{6}{5}{1}{6}{5}{2}{6}{5}{3}{6}{5}{4}{6}&quot;</span>,
<span class="macro">write!</span>(
<span class="ident">output</span>,
<span class="string">&quot;{{{0}}}{{{1}}}{{{2}}}{{{3}}}{{{4}}}&quot;</span>,
<span class="ident">format_tex_field</span>(<span class="kw-2">&amp;</span><span class="ident">tail</span>),
<span class="ident">format_tex_field</span>(<span class="kw-2">&amp;</span><span class="ident">before</span>),
<span class="ident">format_tex_field</span>(<span class="ident">keyword</span>),
<span class="ident">format_tex_field</span>(<span class="kw-2">&amp;</span><span class="ident">after</span>),
<span class="ident">format_tex_field</span>(<span class="kw-2">&amp;</span><span class="ident">head</span>),
<span class="string">&quot;{&quot;</span>,
<span class="string">&quot;}&quot;</span>
));
)
.<span class="ident">unwrap</span>();
<span class="kw">if</span> <span class="ident">config</span>.<span class="ident">auto_ref</span> <span class="op">|</span><span class="op">|</span> <span class="ident">config</span>.<span class="ident">input_ref</span> {
<span class="ident">output</span>.<span class="ident">push_str</span>(<span class="kw-2">&amp;</span><span class="macro">format!</span>(<span class="string">&quot;{}{}{}&quot;</span>, <span class="string">&quot;{&quot;</span>, <span class="ident">format_tex_field</span>(<span class="ident">reference</span>), <span class="string">&quot;}&quot;</span>));
<span class="macro">write!</span>(<span class="ident">output</span>, <span class="string">&quot;{{{}}}&quot;</span>, <span class="ident">format_tex_field</span>(<span class="ident">reference</span>)).<span class="ident">unwrap</span>();
}
<span class="ident">output</span>
}
@@ -1502,7 +1504,7 @@
<span class="ident">reference</span>: <span class="kw-2">&amp;</span><span class="ident">str</span>,
) -&gt; <span class="ident">String</span> {
<span class="kw">let</span> <span class="kw-2">mut</span> <span class="ident">output</span> <span class="op">=</span> <span class="ident">String::new</span>();
<span class="ident">output</span>.<span class="ident">push_str</span>(<span class="kw-2">&amp;</span><span class="macro">format!</span>(<span class="string">&quot;.{}&quot;</span>, <span class="ident">config</span>.<span class="ident">macro_name</span>));
<span class="macro">write!</span>(<span class="ident">output</span>, <span class="string">&quot;.{}&quot;</span>, <span class="ident">config</span>.<span class="ident">macro_name</span>).<span class="ident">unwrap</span>();
<span class="kw">let</span> <span class="ident">all_before</span> <span class="op">=</span> <span class="kw">if</span> <span class="ident">config</span>.<span class="ident">input_ref</span> {
<span class="kw">let</span> <span class="ident">before</span> <span class="op">=</span> <span class="kw-2">&amp;</span><span class="ident">line</span>[<span class="number">0</span>..<span class="ident">word_ref</span>.<span class="ident">position</span>];
<span class="kw">let</span> <span class="ident">before_start_trim_offset</span> <span class="op">=</span>
@@ -1517,16 +1519,18 @@
<span class="kw">let</span> <span class="ident">after_chars_trim_idx</span> <span class="op">=</span> (<span class="ident">word_ref</span>.<span class="ident">position_end</span>, <span class="ident">chars_line</span>.<span class="ident">len</span>());
<span class="kw">let</span> <span class="ident">all_after</span> <span class="op">=</span> <span class="kw-2">&amp;</span><span class="ident">chars_line</span>[<span class="ident">after_chars_trim_idx</span>.<span class="number">0</span>..<span class="ident">after_chars_trim_idx</span>.<span class="number">1</span>];
<span class="kw">let</span> (<span class="ident">tail</span>, <span class="ident">before</span>, <span class="ident">after</span>, <span class="ident">head</span>) <span class="op">=</span> <span class="ident">get_output_chunks</span>(<span class="ident">all_before</span>, <span class="ident">keyword</span>, <span class="ident">all_after</span>, <span class="ident">config</span>);
<span class="ident">output</span>.<span class="ident">push_str</span>(<span class="kw-2">&amp;</span><span class="macro">format!</span>(
<span class="macro">write!</span>(
<span class="ident">output</span>,
<span class="string">&quot; \&quot;{}\&quot; \&quot;{}\&quot; \&quot;{}{}\&quot; \&quot;{}\&quot;&quot;</span>,
<span class="ident">format_roff_field</span>(<span class="kw-2">&amp;</span><span class="ident">tail</span>),
<span class="ident">format_roff_field</span>(<span class="kw-2">&amp;</span><span class="ident">before</span>),
<span class="ident">format_roff_field</span>(<span class="ident">keyword</span>),
<span class="ident">format_roff_field</span>(<span class="kw-2">&amp;</span><span class="ident">after</span>),
<span class="ident">format_roff_field</span>(<span class="kw-2">&amp;</span><span class="ident">head</span>)
));
)
.<span class="ident">unwrap</span>();
<span class="kw">if</span> <span class="ident">config</span>.<span class="ident">auto_ref</span> <span class="op">|</span><span class="op">|</span> <span class="ident">config</span>.<span class="ident">input_ref</span> {
<span class="ident">output</span>.<span class="ident">push_str</span>(<span class="kw-2">&amp;</span><span class="macro">format!</span>(<span class="string">&quot; \&quot;{}\&quot;&quot;</span>, <span class="ident">format_roff_field</span>(<span class="ident">reference</span>)));
<span class="macro">write!</span>(<span class="ident">output</span>, <span class="string">&quot; \&quot;{}\&quot;&quot;</span>, <span class="ident">format_roff_field</span>(<span class="ident">reference</span>)).<span class="ident">unwrap</span>();
}
<span class="ident">output</span>
}
+2 -2
View File
@@ -2332,9 +2332,9 @@ Valid options are: MbdfhnRrV. They override the global options for this key.&quo
];
<span class="kw">let</span> <span class="kw-2">mut</span> <span class="ident">size_string</span> <span class="op">=</span> <span class="ident">input</span>.<span class="ident">trim</span>().<span class="ident">to_string</span>();
<span class="kw">if</span> <span class="ident">size_string</span>.<span class="ident">ends_with</span>(<span class="op">|</span><span class="ident">c</span>: <span class="ident">char</span><span class="op">|</span> <span class="ident">ALLOW_LIST</span>.<span class="ident">contains</span>(<span class="kw-2">&amp;</span><span class="ident">c</span>) <span class="op">|</span><span class="op">|</span> <span class="ident">c</span>.<span class="ident">is_digit</span>(<span class="number">10</span>)) {
<span class="kw">if</span> <span class="ident">size_string</span>.<span class="ident">ends_with</span>(<span class="op">|</span><span class="ident">c</span>: <span class="ident">char</span><span class="op">|</span> <span class="ident">ALLOW_LIST</span>.<span class="ident">contains</span>(<span class="kw-2">&amp;</span><span class="ident">c</span>) <span class="op">|</span><span class="op">|</span> <span class="ident">c</span>.<span class="ident">is_ascii_digit</span>()) {
<span class="comment">// b 1, K 1024 (default)</span>
<span class="kw">if</span> <span class="ident">size_string</span>.<span class="ident">ends_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_digit</span>(<span class="number">10</span>)) {
<span class="kw">if</span> <span class="ident">size_string</span>.<span class="ident">ends_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>()) {
<span class="ident">size_string</span>.<span class="ident">push</span>(<span class="string">&#39;K&#39;</span>);
} <span class="kw">else</span> <span class="kw">if</span> <span class="ident">size_string</span>.<span class="ident">ends_with</span>(<span class="string">&#39;b&#39;</span>) {
<span class="ident">size_string</span>.<span class="ident">pop</span>();
+2 -2
View File
@@ -1251,8 +1251,8 @@
<span class="kw">pub</span> <span class="kw">fn</span> <span class="ident">group_num</span>(<span class="ident">s</span>: <span class="kw-2">&amp;</span><span class="ident">str</span>) -&gt; <span class="ident">Cow</span><span class="op">&lt;</span><span class="ident">str</span><span class="op">&gt;</span> {
<span class="kw">let</span> <span class="ident">is_negative</span> <span class="op">=</span> <span class="ident">s</span>.<span class="ident">starts_with</span>(<span class="string">&#39;-&#39;</span>);
<span class="macro">assert!</span>(<span class="ident">is_negative</span> <span class="op">|</span><span class="op">|</span> <span class="ident">s</span>.<span class="ident">chars</span>().<span class="ident">take</span>(<span class="number">1</span>).<span class="ident">all</span>(<span class="op">|</span><span class="ident">c</span><span class="op">|</span> <span class="ident">c</span>.<span class="ident">is_digit</span>(<span class="number">10</span>)));
<span class="macro">assert!</span>(<span class="ident">s</span>.<span class="ident">chars</span>().<span class="ident">skip</span>(<span class="number">1</span>).<span class="ident">all</span>(<span class="op">|</span><span class="ident">c</span><span class="op">|</span> <span class="ident">c</span>.<span class="ident">is_digit</span>(<span class="number">10</span>)));
<span class="macro">assert!</span>(<span class="ident">is_negative</span> <span class="op">|</span><span class="op">|</span> <span class="ident">s</span>.<span class="ident">chars</span>().<span class="ident">take</span>(<span class="number">1</span>).<span class="ident">all</span>(<span class="op">|</span><span class="ident">c</span><span class="op">|</span> <span class="ident">c</span>.<span class="ident">is_ascii_digit</span>()));
<span class="macro">assert!</span>(<span class="ident">s</span>.<span class="ident">chars</span>().<span class="ident">skip</span>(<span class="number">1</span>).<span class="ident">all</span>(<span class="op">|</span><span class="ident">c</span><span class="op">|</span> <span class="ident">c</span>.<span class="ident">is_ascii_digit</span>()));
<span class="kw">if</span> <span class="ident">s</span>.<span class="ident">len</span>() <span class="op">&lt;</span> <span class="number">4</span> {
<span class="kw">return</span> <span class="ident">s</span>.<span class="ident">into</span>();
}
+1 -1
View File
@@ -305,7 +305,7 @@
<span class="ident">stderr</span>: <span class="ident">BufferType</span>,
}
<span class="kw">impl</span><span class="op">&lt;</span><span class="lifetime">&#39;a</span><span class="op">&gt;</span> <span class="ident">TryFrom</span><span class="op">&lt;</span><span class="kw-2">&amp;</span><span class="ident">ArgMatches</span><span class="op">&gt;</span> <span class="kw">for</span> <span class="ident">ProgramOptions</span> {
<span class="kw">impl</span> <span class="ident">TryFrom</span><span class="op">&lt;</span><span class="kw-2">&amp;</span><span class="ident">ArgMatches</span><span class="op">&gt;</span> <span class="kw">for</span> <span class="ident">ProgramOptions</span> {
<span class="kw">type</span> <span class="ident">Error</span> <span class="op">=</span> <span class="ident">ProgramOptionsError</span>;
<span class="kw">fn</span> <span class="ident">try_from</span>(<span class="ident">matches</span>: <span class="kw-2">&amp;</span><span class="ident">ArgMatches</span>) -&gt; <span class="prelude-ty">Result</span><span class="op">&lt;</span><span class="self">Self</span>, <span class="ident"><span class="self">Self</span>::Error</span><span class="op">&gt;</span> {
+1 -1
View File
@@ -185,7 +185,7 @@
<span class="kw">let</span> <span class="kw-2">mut</span> <span class="ident">has_num</span> <span class="op">=</span> <span class="bool-val">false</span>;
<span class="kw">let</span> <span class="kw-2">mut</span> <span class="ident">last_char</span> <span class="op">=</span> <span class="number">0</span> <span class="kw">as</span> <span class="ident">char</span>;
<span class="kw">for</span> (<span class="ident">n</span>, <span class="ident">c</span>) <span class="kw">in</span> <span class="kw-2">&amp;mut</span> <span class="ident">chars</span> {
<span class="kw">if</span> <span class="ident">c</span>.<span class="ident">is_digit</span>(<span class="number">10</span>) {
<span class="kw">if</span> <span class="ident">c</span>.<span class="ident">is_ascii_digit</span>() {
<span class="ident">has_num</span> <span class="op">=</span> <span class="bool-val">true</span>;
<span class="ident">num_end</span> <span class="op">=</span> <span class="ident">n</span>;
} <span class="kw">else</span> {
+1 -9
View File
@@ -188,10 +188,6 @@
<span id="183">183</span>
<span id="184">184</span>
<span id="185">185</span>
<span id="186">186</span>
<span id="187">187</span>
<span id="188">188</span>
<span id="189">189</span>
</pre><pre class="rust"><code><span class="comment">// * This file is part of the uutils coreutils package.</span>
<span class="comment">// *</span>
<span class="comment">// * (c) Ben Eggers &lt;ben.eggers36@gmail.com&gt;</span>
@@ -244,11 +240,7 @@ If FILE is not passed in, stdin is used instead.&quot;</span>;
<span class="kw">let</span> <span class="kw-2">mut</span> <span class="ident">line</span> <span class="op">=</span> <span class="ident">String::new</span>();
<span class="kw">match</span> <span class="ident">reader</span>.<span class="ident">read_line</span>(<span class="kw-2">&amp;mut</span> <span class="ident">line</span>) {
<span class="prelude-val">Ok</span>(<span class="kw">_</span>) =&gt; {
<span class="kw">let</span> <span class="ident">tokens</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="ident">line</span>
.<span class="ident">trim_end</span>()
.<span class="ident">split_whitespace</span>()
.<span class="ident">map</span>(<span class="op">|</span><span class="ident">s</span><span class="op">|</span> <span class="ident">s</span>.<span class="ident">to_owned</span>())
.<span class="ident">collect</span>();
<span class="kw">let</span> <span class="ident">tokens</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="ident">line</span>.<span class="ident">split_whitespace</span>().<span class="ident">map</span>(<span class="op">|</span><span class="ident">s</span><span class="op">|</span> <span class="ident">s</span>.<span class="ident">to_owned</span>()).<span class="ident">collect</span>();
<span class="kw">if</span> <span class="ident">tokens</span>.<span class="ident">is_empty</span>() {
<span class="kw">break</span>;
}
+9 -7
View File
@@ -563,6 +563,7 @@
<span id="558">558</span>
<span id="559">559</span>
<span id="560">560</span>
<span id="561">561</span>
</pre><pre class="rust"><code><span class="comment">// This file is part of the uutils coreutils package.</span>
<span class="comment">//</span>
<span class="comment">// (c) Jian Zeng &lt;anonymousknight96@gmail.com&gt;</span>
@@ -580,6 +581,7 @@
<span class="kw">use</span> <span class="ident">clap</span>::{<span class="ident">crate_version</span>, <span class="ident">Arg</span>, <span class="ident">Command</span>};
<span class="kw">use</span> <span class="ident">std::borrow::Cow</span>;
<span class="kw">use</span> <span class="ident">std::ffi::CStr</span>;
<span class="kw">use</span> <span class="ident">std::fmt::Write</span>;
<span class="kw">use</span> <span class="ident">std::os::unix::fs::MetadataExt</span>;
<span class="kw">use</span> <span class="ident">std::path::PathBuf</span>;
<span class="kw">use</span> <span class="ident">uucore</span>::{<span class="ident">format_usage</span>, <span class="ident">InvalidEncodingHandling</span>};
@@ -1094,24 +1096,24 @@
<span class="kw">let</span> <span class="kw-2">mut</span> <span class="ident">buf</span> <span class="op">=</span> <span class="ident">String::with_capacity</span>(<span class="number">64</span>);
<span class="kw">let</span> <span class="ident">msg</span> <span class="op">=</span> <span class="macro">vec!</span>[<span class="string">&#39; &#39;</span>, <span class="ident">state</span>].<span class="ident">into_iter</span>().<span class="ident">collect</span>::<span class="op">&lt;</span><span class="ident">String</span><span class="op">&gt;</span>();
<span class="ident">buf</span>.<span class="ident">push_str</span>(<span class="kw-2">&amp;</span><span class="macro">format!</span>(<span class="string">&quot;{:&lt;8}&quot;</span>, <span class="ident">user</span>));
<span class="macro">write!</span>(<span class="ident">buf</span>, <span class="string">&quot;{:&lt;8}&quot;</span>, <span class="ident">user</span>).<span class="ident">unwrap</span>();
<span class="kw">if</span> <span class="self">self</span>.<span class="ident">include_mesg</span> {
<span class="ident">buf</span>.<span class="ident">push_str</span>(<span class="kw-2">&amp;</span><span class="ident">msg</span>);
}
<span class="ident">buf</span>.<span class="ident">push_str</span>(<span class="kw-2">&amp;</span><span class="macro">format!</span>(<span class="string">&quot; {:&lt;12}&quot;</span>, <span class="ident">line</span>));
<span class="macro">write!</span>(<span class="ident">buf</span>, <span class="string">&quot; {:&lt;12}&quot;</span>, <span class="ident">line</span>).<span class="ident">unwrap</span>();
<span class="comment">// &quot;%b %e %H:%M&quot; (LC_ALL=C)</span>
<span class="kw">let</span> <span class="ident">time_size</span> <span class="op">=</span> <span class="number">3</span> <span class="op">+</span> <span class="number">2</span> <span class="op">+</span> <span class="number">2</span> <span class="op">+</span> <span class="number">1</span> <span class="op">+</span> <span class="number">2</span>;
<span class="ident">buf</span>.<span class="ident">push_str</span>(<span class="kw-2">&amp;</span><span class="macro">format!</span>(<span class="string">&quot; {:&lt;1$}&quot;</span>, <span class="ident">time</span>, <span class="ident">time_size</span>));
<span class="macro">write!</span>(<span class="ident">buf</span>, <span class="string">&quot; {:&lt;1$}&quot;</span>, <span class="ident">time</span>, <span class="ident">time_size</span>).<span class="ident">unwrap</span>();
<span class="kw">if</span> <span class="op">!</span><span class="self">self</span>.<span class="ident">short_output</span> {
<span class="kw">if</span> <span class="self">self</span>.<span class="ident">include_idle</span> {
<span class="ident">buf</span>.<span class="ident">push_str</span>(<span class="kw-2">&amp;</span><span class="macro">format!</span>(<span class="string">&quot; {:&lt;6}&quot;</span>, <span class="ident">idle</span>));
<span class="macro">write!</span>(<span class="ident">buf</span>, <span class="string">&quot; {:&lt;6}&quot;</span>, <span class="ident">idle</span>).<span class="ident">unwrap</span>();
}
<span class="ident">buf</span>.<span class="ident">push_str</span>(<span class="kw-2">&amp;</span><span class="macro">format!</span>(<span class="string">&quot; {:&gt;10}&quot;</span>, <span class="ident">pid</span>));
<span class="macro">write!</span>(<span class="ident">buf</span>, <span class="string">&quot; {:&gt;10}&quot;</span>, <span class="ident">pid</span>).<span class="ident">unwrap</span>();
}
<span class="ident">buf</span>.<span class="ident">push_str</span>(<span class="kw-2">&amp;</span><span class="macro">format!</span>(<span class="string">&quot; {:&lt;8}&quot;</span>, <span class="ident">comment</span>));
<span class="macro">write!</span>(<span class="ident">buf</span>, <span class="string">&quot; {:&lt;8}&quot;</span>, <span class="ident">comment</span>).<span class="ident">unwrap</span>();
<span class="kw">if</span> <span class="self">self</span>.<span class="ident">include_exit</span> {
<span class="ident">buf</span>.<span class="ident">push_str</span>(<span class="kw-2">&amp;</span><span class="macro">format!</span>(<span class="string">&quot; {:&lt;12}&quot;</span>, <span class="ident">exit</span>));
<span class="macro">write!</span>(<span class="ident">buf</span>, <span class="string">&quot; {:&lt;12}&quot;</span>, <span class="ident">exit</span>).<span class="ident">unwrap</span>();
}
<span class="macro">println!</span>(<span class="string">&quot;{}&quot;</span>, <span class="ident">buf</span>.<span class="ident">trim_end</span>());
}
+1 -1
View File
@@ -359,7 +359,7 @@
}
<span class="comment">// Get the numeric part of the size argument. For example, if the</span>
<span class="comment">// argument is &quot;123K&quot;, then the numeric part is &quot;123&quot;.</span>
<span class="kw">let</span> <span class="ident">numeric_string</span>: <span class="ident">String</span> <span class="op">=</span> <span class="ident">size</span>.<span class="ident">chars</span>().<span class="ident">take_while</span>(<span class="op">|</span><span class="ident">c</span><span class="op">|</span> <span class="ident">c</span>.<span class="ident">is_digit</span>(<span class="number">10</span>)).<span class="ident">collect</span>();
<span class="kw">let</span> <span class="ident">numeric_string</span>: <span class="ident">String</span> <span class="op">=</span> <span class="ident">size</span>.<span class="ident">chars</span>().<span class="ident">take_while</span>(<span class="op">|</span><span class="ident">c</span><span class="op">|</span> <span class="ident">c</span>.<span class="ident">is_ascii_digit</span>()).<span class="ident">collect</span>();
<span class="kw">let</span> <span class="ident">number</span>: <span class="ident">u64</span> <span class="op">=</span> <span class="kw">if</span> <span class="op">!</span><span class="ident">numeric_string</span>.<span class="ident">is_empty</span>() {
<span class="kw">match</span> <span class="ident">numeric_string</span>.<span class="ident">parse</span>() {
<span class="prelude-val">Ok</span>(<span class="ident">n</span>) =&gt; <span class="ident">n</span>,

Some files were not shown because too many files have changed in this diff Show More