Skip to content

Commit 18c3362

Browse files
sylvestresylvestre
committed
deploy: c249eba 
1 parent 3d9eccb commit 18c3362

Some content is hidden

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

46 files changed

+313
-113
lines changed

‎dev/search-index.js

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎dev/src/uu_df/blocks.rs.html

Lines changed: 38 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -273,6 +273,24 @@
273273
<span id="268">268</span>
274274
<span id="269">269</span>
275275
<span id="270">270</span>
276+
<span id="271">271</span>
277+
<span id="272">272</span>
278+
<span id="273">273</span>
279+
<span id="274">274</span>
280+
<span id="275">275</span>
281+
<span id="276">276</span>
282+
<span id="277">277</span>
283+
<span id="278">278</span>
284+
<span id="279">279</span>
285+
<span id="280">280</span>
286+
<span id="281">281</span>
287+
<span id="282">282</span>
288+
<span id="283">283</span>
289+
<span id="284">284</span>
290+
<span id="285">285</span>
291+
<span id="286">286</span>
292+
<span id="287">287</span>
293+
<span id="288">288</span>
276294
</pre><pre class="rust"><code><span class="comment">// * This file is part of the uutils coreutils package.</span>
277295
<span class="comment">// *</span>
278296
<span class="comment">// * For the full copyright and license information, please view the LICENSE</span>
@@ -282,7 +300,10 @@
282300
<span class="kw">use</span> <span class="ident">clap::ArgMatches</span>;
283301
<span class="kw">use</span> <span class="ident">std</span>::{<span class="ident">env</span>, <span class="ident">fmt</span>};
284302

285-
<span class="kw">use</span> <span class="ident">uucore::parse_size</span>::{<span class="ident">parse_size</span>, <span class="ident">ParseSizeError</span>};
303+
<span class="kw">use</span> <span class="ident">uucore</span>::{
304+
<span class="ident">display::Quotable</span>,
305+
<span class="ident">parse_size</span>::{<span class="ident">parse_size</span>, <span class="ident">ParseSizeError</span>},
306+
};
286307

287308
<span class="doccomment">/// The first ten powers of 1024.</span>
288309
<span class="kw">const</span> <span class="ident">IEC_BASES</span>: [<span class="ident">u128</span>; <span class="number">10</span>] <span class="op">=</span> [
@@ -442,6 +463,15 @@
442463
<span class="ident">Bytes</span>(<span class="ident">u64</span>),
443464
}
444465

466+
<span class="kw">impl</span> <span class="ident">BlockSize</span> {
467+
<span class="doccomment">/// Returns the associated value</span>
468+
<span class="kw">pub</span>(<span class="kw">crate</span>) <span class="kw">fn</span> <span class="ident">as_u64</span>(<span class="kw-2">&amp;</span><span class="self">self</span>) -&gt; <span class="ident">u64</span> {
469+
<span class="kw">match</span> <span class="kw-2">*</span><span class="self">self</span> {
470+
<span class="ident"><span class="self">Self</span>::Bytes</span>(<span class="ident">n</span>) =&gt; <span class="ident">n</span>,
471+
}
472+
}
473+
}
474+
445475
<span class="kw">impl</span> <span class="ident">Default</span> <span class="kw">for</span> <span class="ident">BlockSize</span> {
446476
<span class="kw">fn</span> <span class="ident">default</span>() -&gt; <span class="self">Self</span> {
447477
<span class="kw">if</span> <span class="ident">env::var</span>(<span class="string">&quot;POSIXLY_CORRECT&quot;</span>).<span class="ident">is_ok</span>() {
@@ -455,7 +485,13 @@
455485
<span class="kw">pub</span>(<span class="kw">crate</span>) <span class="kw">fn</span> <span class="ident">block_size_from_matches</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="ident">BlockSize</span>, <span class="ident">ParseSizeError</span><span class="op">&gt;</span> {
456486
<span class="kw">if</span> <span class="ident">matches</span>.<span class="ident">is_present</span>(<span class="ident">OPT_BLOCKSIZE</span>) {
457487
<span class="kw">let</span> <span class="ident">s</span> <span class="op">=</span> <span class="ident">matches</span>.<span class="ident">value_of</span>(<span class="ident">OPT_BLOCKSIZE</span>).<span class="ident">unwrap</span>();
458-
<span class="prelude-val">Ok</span>(<span class="ident">BlockSize::Bytes</span>(<span class="ident">parse_size</span>(<span class="ident">s</span>)<span class="question-mark">?</span>))
488+
<span class="kw">let</span> <span class="ident">bytes</span> <span class="op">=</span> <span class="ident">parse_size</span>(<span class="ident">s</span>)<span class="question-mark">?</span>;
489+
490+
<span class="kw">if</span> <span class="ident">bytes</span> <span class="op">&gt;</span> <span class="number">0</span> {
491+
<span class="prelude-val">Ok</span>(<span class="ident">BlockSize::Bytes</span>(<span class="ident">bytes</span>))
492+
} <span class="kw">else</span> {
493+
<span class="prelude-val">Err</span>(<span class="ident">ParseSizeError::ParseFailure</span>(<span class="macro">format!</span>(<span class="string">&quot;{}&quot;</span>, <span class="ident">s</span>.<span class="ident">quote</span>())))
494+
}
459495
} <span class="kw">else</span> {
460496
<span class="prelude-val">Ok</span>(<span class="ident">Default::default</span>())
461497
}

‎dev/src/uu_df/df.rs.html

Lines changed: 36 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -820,6 +820,24 @@
820820
<span id="815">815</span>
821821
<span id="816">816</span>
822822
<span id="817">817</span>
823+
<span id="818">818</span>
824+
<span id="819">819</span>
825+
<span id="820">820</span>
826+
<span id="821">821</span>
827+
<span id="822">822</span>
828+
<span id="823">823</span>
829+
<span id="824">824</span>
830+
<span id="825">825</span>
831+
<span id="826">826</span>
832+
<span id="827">827</span>
833+
<span id="828">828</span>
834+
<span id="829">829</span>
835+
<span id="830">830</span>
836+
<span id="831">831</span>
837+
<span id="832">832</span>
838+
<span id="833">833</span>
839+
<span id="834">834</span>
840+
<span id="835">835</span>
823841
</pre><pre class="rust"><code><span class="comment">// This file is part of the uutils coreutils package.</span>
824842
<span class="comment">//</span>
825843
<span class="comment">// (c) Fangxu Hu &lt;framlog@gmail.com&gt;</span>
@@ -834,6 +852,7 @@
834852
<span class="kw">mod</span> <span class="ident">table</span>;
835853

836854
<span class="kw">use</span> <span class="ident">blocks</span>::{<span class="ident">HumanReadable</span>, <span class="ident">SizeFormat</span>};
855+
<span class="kw">use</span> <span class="ident">table::HeaderMode</span>;
837856
<span class="kw">use</span> <span class="ident">uucore::display::Quotable</span>;
838857
<span class="kw">use</span> <span class="ident">uucore::error</span>::{<span class="ident">UError</span>, <span class="ident">UResult</span>, <span class="ident">USimpleError</span>};
839858
<span class="kw">use</span> <span class="ident">uucore::fsext</span>::{<span class="ident">read_fs_list</span>, <span class="ident">MountInfo</span>};
@@ -894,6 +913,7 @@
894913
<span class="ident">show_all_fs</span>: <span class="ident">bool</span>,
895914
<span class="ident">size_format</span>: <span class="ident">SizeFormat</span>,
896915
<span class="ident">block_size</span>: <span class="ident">BlockSize</span>,
916+
<span class="ident">header_mode</span>: <span class="ident">HeaderMode</span>,
897917

898918
<span class="doccomment">/// Optional list of filesystem types to include in the output table.</span>
899919
<span class="doccomment">///</span>
@@ -921,6 +941,7 @@
921941
<span class="ident">show_all_fs</span>: <span class="ident">Default::default</span>(),
922942
<span class="ident">block_size</span>: <span class="ident">Default::default</span>(),
923943
<span class="ident">size_format</span>: <span class="ident">Default::default</span>(),
944+
<span class="ident">header_mode</span>: <span class="ident">Default::default</span>(),
924945
<span class="ident">include</span>: <span class="ident">Default::default</span>(),
925946
<span class="ident">exclude</span>: <span class="ident">Default::default</span>(),
926947
<span class="ident">show_total</span>: <span class="ident">Default::default</span>(),
@@ -998,6 +1019,21 @@
9981019
),
9991020
<span class="ident">ParseSizeError::ParseFailure</span>(<span class="ident">s</span>) =&gt; <span class="ident">OptionsError::InvalidBlockSize</span>(<span class="ident">s</span>),
10001021
})<span class="question-mark">?</span>,
1022+
<span class="ident">header_mode</span>: {
1023+
<span class="kw">if</span> <span class="ident">matches</span>.<span class="ident">is_present</span>(<span class="ident">OPT_HUMAN_READABLE_BINARY</span>)
1024+
<span class="op">|</span><span class="op">|</span> <span class="ident">matches</span>.<span class="ident">is_present</span>(<span class="ident">OPT_HUMAN_READABLE_DECIMAL</span>)
1025+
{
1026+
<span class="ident">HeaderMode::HumanReadable</span>
1027+
} <span class="kw">else</span> <span class="kw">if</span> <span class="ident">matches</span>.<span class="ident">is_present</span>(<span class="ident">OPT_PORTABILITY</span>) {
1028+
<span class="ident">HeaderMode::PosixPortability</span>
1029+
<span class="comment">// is_present() doesn&#39;t work here, it always returns true because OPT_OUTPUT has</span>
1030+
<span class="comment">// default values and hence is always present</span>
1031+
} <span class="kw">else</span> <span class="kw">if</span> <span class="ident">matches</span>.<span class="ident">occurrences_of</span>(<span class="ident">OPT_OUTPUT</span>) <span class="op">&gt;</span> <span class="number">0</span> {
1032+
<span class="ident">HeaderMode::Output</span>
1033+
} <span class="kw">else</span> {
1034+
<span class="ident">HeaderMode::Default</span>
1035+
}
1036+
},
10011037
<span class="ident">size_format</span>: {
10021038
<span class="kw">if</span> <span class="ident">matches</span>.<span class="ident">is_present</span>(<span class="ident">OPT_HUMAN_READABLE_BINARY</span>) {
10031039
<span class="ident">SizeFormat::HumanReadable</span>(<span class="ident">HumanReadable::Binary</span>)

0 commit comments

Comments
 (0)