uutils/uutils.github.io
0
0
Fork 0
mirror of https://github.com/uutils/uutils.github.io.git synced 2026-06-10 16:12:28 -07:00
Code Issues Packages Projects Releases Wiki Activity

deploy: f0e8d44e6e

Browse Source
This commit is contained in:
sylvestre
2023-03-21 02:35:42 +00:00
parent 450d1ada75
commit 1bffa911cb
18 changed files with 92 additions and 60 deletions
Download Patch File Download Diff File Expand all files Collapse all files
dev/src/uu_dd/progress.rs.html
+70 -20
View File
@@ -631,6 +631,31 @@
<a href="#631" id="631">631</a>
<a href="#632" id="632">632</a>
<a href="#633" id="633">633</a>
<a href="#634" id="634">634</a>
<a href="#635" id="635">635</a>
<a href="#636" id="636">636</a>
<a href="#637" id="637">637</a>
<a href="#638" id="638">638</a>
<a href="#639" id="639">639</a>
<a href="#640" id="640">640</a>
<a href="#641" id="641">641</a>
<a href="#642" id="642">642</a>
<a href="#643" id="643">643</a>
<a href="#644" id="644">644</a>
<a href="#645" id="645">645</a>
<a href="#646" id="646">646</a>
<a href="#647" id="647">647</a>
<a href="#648" id="648">648</a>
<a href="#649" id="649">649</a>
<a href="#650" id="650">650</a>
<a href="#651" id="651">651</a>
<a href="#652" id="652">652</a>
<a href="#653" id="653">653</a>
<a href="#654" id="654">654</a>
<a href="#655" id="655">655</a>
<a href="#656" id="656">656</a>
<a href="#657" id="657">657</a>
<a href="#658" id="658">658</a>
</pre><pre class="rust"><code><span class="comment">// * This file is part of the uutils coreutils package.
// *
// * For the full copyright and license information, please view the LICENSE
@@ -646,6 +671,9 @@
<span class="kw">use </span>std::sync::mpsc;
<span class="kw">use </span>std::time::Duration;
<span class="kw">use </span>uucore::error::UResult;
<span class="kw">use </span>uucore::memo::sprintf;
<span class="kw">use </span><span class="kw">crate</span>::numbers::{to_magnitude_and_suffix, SuffixType};
<span class="comment">// On Linux, we register a signal handler that prints progress updates.
@@ -764,7 +792,7 @@
/// prog_update.write_prog_line(&amp;mut cursor, rewrite).unwrap();
/// assert_eq!(cursor.get_ref(), b&quot;0 bytes copied, 1.0 s, 0.0 B/s\n&quot;);
/// ```
</span><span class="kw">fn </span>write_prog_line(<span class="kw-2">&amp;</span><span class="self">self</span>, w: <span class="kw-2">&amp;mut </span><span class="kw">impl </span>Write, rewrite: bool) -&gt; std::io::Result&lt;()&gt; {
</span><span class="kw">fn </span>write_prog_line(<span class="kw-2">&amp;</span><span class="self">self</span>, w: <span class="kw-2">&amp;mut </span><span class="kw">impl </span>Write, rewrite: bool) -&gt; UResult&lt;()&gt; {
<span class="comment">// The total number of bytes written as a string, in SI and IEC format.
</span><span class="kw">let </span>btotal = <span class="self">self</span>.write_stat.bytes_total;
<span class="kw">let </span>btotal_metric = to_magnitude_and_suffix(btotal, SuffixType::Si);
@@ -781,27 +809,31 @@
// (`\n`) at the end.
</span><span class="kw">let </span>(carriage_return, newline) = <span class="kw">if </span>rewrite { (<span class="string">&quot;\r&quot;</span>, <span class="string">&quot;&quot;</span>) } <span class="kw">else </span>{ (<span class="string">&quot;&quot;</span>, <span class="string">&quot;\n&quot;</span>) };
<span class="comment">// The duration should be formatted as in `printf %g`.
</span><span class="kw">let </span>duration_str = sprintf(<span class="string">&quot;%g&quot;</span>, <span class="kw-2">&amp;</span>[duration.to_string()])<span class="question-mark">?</span>;
<span class="comment">// If the number of bytes written is sufficiently large, then
// print a more concise representation of the number, like
// &quot;1.2 kB&quot; and &quot;1.0 KiB&quot;.
</span><span class="kw">match </span>btotal {
<span class="number">1 </span>=&gt; <span class="macro">write!</span>(
w,
<span class="string">&quot;{carriage_return}{btotal} byte copied, {duration:.1} s, {transfer_rate}/s{newline}&quot;</span>,
),
<span class="string">&quot;{carriage_return}{btotal} byte copied, {duration_str} s, {transfer_rate}/s{newline}&quot;</span>,
)<span class="question-mark">?</span>,
<span class="number">0</span>..=<span class="number">999 </span>=&gt; <span class="macro">write!</span>(
w,
<span class="string">&quot;{carriage_return}{btotal} bytes copied, {duration:.1} s, {transfer_rate}/s{newline}&quot;</span>,
),
<span class="string">&quot;{carriage_return}{btotal} bytes copied, {duration_str} s, {transfer_rate}/s{newline}&quot;</span>,
)<span class="question-mark">?</span>,
<span class="number">1000</span>..=<span class="number">1023 </span>=&gt; <span class="macro">write!</span>(
w,
<span class="string">&quot;{carriage_return}{btotal} bytes ({btotal_metric}) copied, {duration:.1} s, {transfer_rate}/s{newline}&quot;</span>,
),
<span class="string">&quot;{carriage_return}{btotal} bytes ({btotal_metric}) copied, {duration_str} s, {transfer_rate}/s{newline}&quot;</span>,
)<span class="question-mark">?</span>,
<span class="kw">_ </span>=&gt; <span class="macro">write!</span>(
w,
<span class="string">&quot;{carriage_return}{btotal} bytes ({btotal_metric}, {btotal_bin}) copied, {duration:.1} s, {transfer_rate}/s{newline}&quot;</span>,
),
}
<span class="string">&quot;{carriage_return}{btotal} bytes ({btotal_metric}, {btotal_bin}) copied, {duration_str} s, {transfer_rate}/s{newline}&quot;</span>,
)<span class="question-mark">?</span>,
};
<span class="prelude-val">Ok</span>(())
}
<span class="doccomment">/// Write all summary statistics.
@@ -833,7 +865,7 @@
/// assert_eq!(iter.next().unwrap(), b&quot;&quot;);
/// assert!(iter.next().is_none());
/// ```
</span><span class="kw">fn </span>write_transfer_stats(<span class="kw-2">&amp;</span><span class="self">self</span>, w: <span class="kw-2">&amp;mut </span><span class="kw">impl </span>Write, new_line: bool) -&gt; std::io::Result&lt;()&gt; {
</span><span class="kw">fn </span>write_transfer_stats(<span class="kw-2">&amp;</span><span class="self">self</span>, w: <span class="kw-2">&amp;mut </span><span class="kw">impl </span>Write, new_line: bool) -&gt; UResult&lt;()&gt; {
<span class="kw">if </span>new_line {
<span class="macro">writeln!</span>(w)<span class="question-mark">?</span>;
}
@@ -1129,6 +1161,15 @@
}
}
<span class="kw">fn </span>prog_update_duration(duration: Duration) -&gt; ProgUpdate {
ProgUpdate {
read_stat: Default::default(),
write_stat: Default::default(),
duration: duration,
complete: <span class="bool-val">false</span>,
}
}
<span class="attr">#[test]
</span><span class="kw">fn </span>test_read_stat_report() {
<span class="kw">let </span>read_stat = ReadStat::new(<span class="number">1</span>, <span class="number">2</span>, <span class="number">3</span>);
@@ -1185,24 +1226,24 @@
// 0 bytes copied, 7.9151e-05 s, 0.0 kB/s
//
// The throughput still does not match GNU dd.
</span><span class="macro">assert_eq!</span>(cursor.get_ref(), <span class="string">b&quot;0 bytes copied, 1.0 s, 0.0 B/s\n&quot;</span>);
</span><span class="macro">assert_eq!</span>(cursor.get_ref(), <span class="string">b&quot;0 bytes copied, 1 s, 0.0 B/s\n&quot;</span>);
<span class="kw">let </span>prog_update = prog_update_write(<span class="number">1</span>);
<span class="kw">let </span><span class="kw-2">mut </span>cursor = Cursor::new(<span class="macro">vec!</span>[]);
prog_update.write_prog_line(<span class="kw-2">&amp;mut </span>cursor, rewrite).unwrap();
<span class="macro">assert_eq!</span>(cursor.get_ref(), <span class="string">b&quot;1 byte copied, 1.0 s, 0.0 B/s\n&quot;</span>);
<span class="macro">assert_eq!</span>(cursor.get_ref(), <span class="string">b&quot;1 byte copied, 1 s, 0.0 B/s\n&quot;</span>);
<span class="kw">let </span>prog_update = prog_update_write(<span class="number">999</span>);
<span class="kw">let </span><span class="kw-2">mut </span>cursor = Cursor::new(<span class="macro">vec!</span>[]);
prog_update.write_prog_line(<span class="kw-2">&amp;mut </span>cursor, rewrite).unwrap();
<span class="macro">assert_eq!</span>(cursor.get_ref(), <span class="string">b&quot;999 bytes copied, 1.0 s, 0.0 B/s\n&quot;</span>);
<span class="macro">assert_eq!</span>(cursor.get_ref(), <span class="string">b&quot;999 bytes copied, 1 s, 0.0 B/s\n&quot;</span>);
<span class="kw">let </span>prog_update = prog_update_write(<span class="number">1000</span>);
<span class="kw">let </span><span class="kw-2">mut </span>cursor = Cursor::new(<span class="macro">vec!</span>[]);
prog_update.write_prog_line(<span class="kw-2">&amp;mut </span>cursor, rewrite).unwrap();
<span class="macro">assert_eq!</span>(
cursor.get_ref(),
<span class="string">b&quot;1000 bytes (1.0 kB) copied, 1.0 s, 1.0 kB/s\n&quot;
<span class="string">b&quot;1000 bytes (1.0 kB) copied, 1 s, 1.0 kB/s\n&quot;
</span>);
<span class="kw">let </span>prog_update = prog_update_write(<span class="number">1023</span>);
@@ -1210,7 +1251,7 @@
prog_update.write_prog_line(<span class="kw-2">&amp;mut </span>cursor, rewrite).unwrap();
<span class="macro">assert_eq!</span>(
cursor.get_ref(),
<span class="string">b&quot;1023 bytes (1.0 kB) copied, 1.0 s, 1.0 kB/s\n&quot;
<span class="string">b&quot;1023 bytes (1.0 kB) copied, 1 s, 1.0 kB/s\n&quot;
</span>);
<span class="kw">let </span>prog_update = prog_update_write(<span class="number">1024</span>);
@@ -1218,7 +1259,7 @@
prog_update.write_prog_line(<span class="kw-2">&amp;mut </span>cursor, rewrite).unwrap();
<span class="macro">assert_eq!</span>(
cursor.get_ref(),
<span class="string">b&quot;1024 bytes (1.0 kB, 1.0 KiB) copied, 1.0 s, 1.0 kB/s\n&quot;
<span class="string">b&quot;1024 bytes (1.0 kB, 1.0 KiB) copied, 1 s, 1.0 kB/s\n&quot;
</span>);
}
@@ -1237,7 +1278,7 @@
<span class="kw">let </span><span class="kw-2">mut </span>iter = cursor.get_ref().split(|v| <span class="kw-2">*</span>v == <span class="string">b&#39;\n&#39;</span>);
<span class="macro">assert_eq!</span>(iter.next().unwrap(), <span class="string">b&quot;0+0 records in&quot;</span>);
<span class="macro">assert_eq!</span>(iter.next().unwrap(), <span class="string">b&quot;0+0 records out&quot;</span>);
<span class="macro">assert_eq!</span>(iter.next().unwrap(), <span class="string">b&quot;0 bytes copied, 1.0 s, 0.0 B/s&quot;</span>);
<span class="macro">assert_eq!</span>(iter.next().unwrap(), <span class="string">b&quot;0 bytes copied, 1 s, 0.0 B/s&quot;</span>);
<span class="macro">assert_eq!</span>(iter.next().unwrap(), <span class="string">b&quot;&quot;</span>);
<span class="macro">assert!</span>(iter.next().is_none());
}
@@ -1256,13 +1297,22 @@
prog_update.write_prog_line(<span class="kw-2">&amp;mut </span>cursor, rewrite).unwrap();
prog_update.write_transfer_stats(<span class="kw-2">&amp;mut </span>cursor, <span class="bool-val">true</span>).unwrap();
<span class="kw">let </span><span class="kw-2">mut </span>iter = cursor.get_ref().split(|v| <span class="kw-2">*</span>v == <span class="string">b&#39;\n&#39;</span>);
<span class="macro">assert_eq!</span>(iter.next().unwrap(), <span class="string">b&quot;\r0 bytes copied, 1.0 s, 0.0 B/s&quot;</span>);
<span class="macro">assert_eq!</span>(iter.next().unwrap(), <span class="string">b&quot;\r0 bytes copied, 1 s, 0.0 B/s&quot;</span>);
<span class="macro">assert_eq!</span>(iter.next().unwrap(), <span class="string">b&quot;0+0 records in&quot;</span>);
<span class="macro">assert_eq!</span>(iter.next().unwrap(), <span class="string">b&quot;0+0 records out&quot;</span>);
<span class="macro">assert_eq!</span>(iter.next().unwrap(), <span class="string">b&quot;0 bytes copied, 1.0 s, 0.0 B/s&quot;</span>);
<span class="macro">assert_eq!</span>(iter.next().unwrap(), <span class="string">b&quot;0 bytes copied, 1 s, 0.0 B/s&quot;</span>);
<span class="macro">assert_eq!</span>(iter.next().unwrap(), <span class="string">b&quot;&quot;</span>);
<span class="macro">assert!</span>(iter.next().is_none());
}
<span class="attr">#[test]
</span><span class="kw">fn </span>test_duration_precision() {
<span class="kw">let </span>prog_update = prog_update_duration(Duration::from_nanos(<span class="number">123</span>));
<span class="kw">let </span><span class="kw-2">mut </span>cursor = Cursor::new(<span class="macro">vec!</span>[]);
<span class="kw">let </span>rewrite = <span class="bool-val">false</span>;
prog_update.write_prog_line(<span class="kw-2">&amp;mut </span>cursor, rewrite).unwrap();
<span class="macro">assert_eq!</span>(cursor.get_ref(), <span class="string">b&quot;0 bytes copied, 1.23e-07 s, 0.0 B/s\n&quot;</span>);
}
}
</code></pre></div>
</section></main><div id="rustdoc-vars" data-root-path="../../" data-static-root-path="../../static.files/" data-current-crate="uu_dd" data-themes="" data-resource-suffix="" data-rustdoc-version="1.68.0 (2c8cc3432 2023-03-06)" data-search-js="search-98d53477a794af0b.js" data-settings-js="settings-c3c521c753752a1a.js" data-settings-css="settings-08ddfdda51b8ee2e.css" ></div></body></html>
dev/src/uu_expand/expand.rs.html
+3 -5
View File
@@ -506,7 +506,6 @@
<a href="#506" id="506">506</a>
<a href="#507" id="507">507</a>
<a href="#508" id="508">508</a>
<a href="#509" id="509">509</a>
</pre><pre class="rust"><code><span class="comment">// This file is part of the uutils coreutils package.
//
// (c) Virgile Andreani &lt;virgile.andreani@anbuco.fr&gt;
@@ -528,11 +527,10 @@
<span class="kw">use </span>unicode_width::UnicodeWidthChar;
<span class="kw">use </span>uucore::display::Quotable;
<span class="kw">use </span>uucore::error::{FromIo, UError, UResult};
<span class="kw">use </span>uucore::{crash, format_usage};
<span class="kw">use </span>uucore::{crash, format_usage, help_about, help_usage};
<span class="kw">static </span>ABOUT: <span class="kw-2">&amp;</span>str = <span class="string">&quot;Convert tabs in each FILE to spaces, writing to standard output.
With no FILE, or when FILE is -, read standard input.&quot;</span>;
<span class="kw">const </span>USAGE: <span class="kw-2">&amp;</span>str = <span class="string">&quot;{} [OPTION]... [FILE]...&quot;</span>;
<span class="kw">const </span>ABOUT: <span class="kw-2">&amp;</span>str = <span class="macro">help_about!</span>(<span class="string">&quot;expand.md&quot;</span>);
<span class="kw">const </span>USAGE: <span class="kw-2">&amp;</span>str = <span class="macro">help_usage!</span>(<span class="string">&quot;expand.md&quot;</span>);
<span class="kw">pub mod </span>options {
<span class="kw">pub static </span>TABS: <span class="kw-2">&amp;</span>str = <span class="string">&quot;tabs&quot;</span>;
dev/src/uu_false/false.rs.html
+2 -12
View File
@@ -65,11 +65,6 @@
<a href="#65" id="65">65</a>
<a href="#66" id="66">66</a>
<a href="#67" id="67">67</a>
<a href="#68" id="68">68</a>
<a href="#69" id="69">69</a>
<a href="#70" id="70">70</a>
<a href="#71" id="71">71</a>
<a href="#72" id="72">72</a>
</pre><pre class="rust"><code><span class="comment">// * This file is part of the uutils coreutils package.
// *
// * (c) Jordi Boggiano &lt;j.boggiano@seld.be&gt;
@@ -79,14 +74,9 @@
</span><span class="kw">use </span>clap::{Arg, ArgAction, Command};
<span class="kw">use </span>std::{ffi::OsString, io::Write};
<span class="kw">use </span>uucore::error::{set_exit_code, UResult};
<span class="kw">use </span>uucore::help_about;
<span class="kw">static </span>ABOUT: <span class="kw-2">&amp;</span>str = <span class="string">&quot;\
Returns false, an unsuccessful exit status.
Immediately returns with the exit status `1`. When invoked with one of the recognized options it
will try to write the help or version text. Any IO error during this operation is diagnosed, yet
the program will also return `1`.
&quot;</span>;
<span class="kw">const </span>ABOUT: <span class="kw-2">&amp;</span>str = <span class="macro">help_about!</span>(<span class="string">&quot;false.md&quot;</span>);
<span class="attr">#[uucore::main]
</span><span class="kw">pub fn </span>uumain(args: <span class="kw">impl </span>uucore::Args) -&gt; UResult&lt;()&gt; {
dev/src/uu_groups/groups.rs.html
+3 -9
View File
@@ -110,9 +110,6 @@
<a href="#110" id="110">110</a>
<a href="#111" id="111">111</a>
<a href="#112" id="112">112</a>
<a href="#113" id="113">113</a>
<a href="#114" id="114">114</a>
<a href="#115" id="115">115</a>
</pre><pre class="rust"><code><span class="comment">// This file is part of the uutils coreutils package.
//
// (c) Alan Andrade &lt;alan.andradec@gmail.com&gt;
@@ -136,7 +133,7 @@
display::Quotable,
entries::{get_groups_gnu, gid2grp, Locate, Passwd},
error::{UError, UResult},
format_usage, show,
format_usage, help_about, help_usage, show,
};
<span class="kw">use </span>clap::{crate_version, Arg, ArgAction, Command};
@@ -144,11 +141,8 @@
<span class="kw">mod </span>options {
<span class="kw">pub const </span>USERS: <span class="kw-2">&amp;</span>str = <span class="string">&quot;USERNAME&quot;</span>;
}
<span class="kw">static </span>ABOUT: <span class="kw-2">&amp;</span>str = <span class="string">&quot;Print group memberships for each USERNAME or, \
if no USERNAME is specified, for\nthe current process \
(which may differ if the groups data‐base has changed).&quot;</span>;
<span class="kw">const </span>USAGE: <span class="kw-2">&amp;</span>str = <span class="string">&quot;{} [OPTION]... [USERNAME]...&quot;</span>;
<span class="kw">const </span>ABOUT: <span class="kw-2">&amp;</span>str = <span class="macro">help_about!</span>(<span class="string">&quot;groups.md&quot;</span>);
<span class="kw">const </span>USAGE: <span class="kw-2">&amp;</span>str = <span class="macro">help_usage!</span>(<span class="string">&quot;groups.md&quot;</span>);
<span class="attr">#[derive(Debug)]
</span><span class="kw">enum </span>GroupsError {
dev/uu_expand/fn.uu_app.html
+1 -1
View File
File diff suppressed because one or more lines are too long
dev/uu_expand/fn.uumain.html
+1 -1
View File
File diff suppressed because one or more lines are too long
dev/uu_expand/index.html
+1 -1
View File
File diff suppressed because one or more lines are too long
dev/uu_expand/options/index.html
+1 -1
View File
File diff suppressed because one or more lines are too long
dev/uu_expand/options/static.FILES.html
+1 -1
View File
File diff suppressed because one or more lines are too long
dev/uu_expand/options/static.INITIAL.html
+1 -1
View File
File diff suppressed because one or more lines are too long
dev/uu_expand/options/static.NO_UTF8.html
+1 -1
View File
File diff suppressed because one or more lines are too long
dev/uu_expand/options/static.TABS.html
+1 -1
View File
File diff suppressed because one or more lines are too long
dev/uu_false/fn.uu_app.html
+1 -1
View File
File diff suppressed because one or more lines are too long
dev/uu_false/fn.uumain.html
+1 -1
View File
File diff suppressed because one or more lines are too long
dev/uu_false/index.html
+1 -1
View File
File diff suppressed because one or more lines are too long
dev/uu_groups/fn.uu_app.html
+1 -1
View File
File diff suppressed because one or more lines are too long
dev/uu_groups/fn.uumain.html
+1 -1
View File
File diff suppressed because one or more lines are too long
dev/uu_groups/index.html
+1 -1
View File
File diff suppressed because one or more lines are too long