Skip to content

Commit a65f6d3

Browse files
sylvestresylvestre
committed
deploy: c249eba 
1 parent d6ec6ec commit a65f6d3

File tree

10 files changed

+265
-225
lines changed

10 files changed

+265
-225
lines changed

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

Lines changed: 139 additions & 117 deletions
Large diffs are not rendered by default.

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

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -861,7 +861,7 @@
861861
<span class="kw">mod</span> <span class="ident">filesystem</span>;
862862
<span class="kw">mod</span> <span class="ident">table</span>;
863863

864-
<span class="kw">use</span> <span class="ident">blocks</span>::{<span class="ident">HumanReadable</span>, <span class="ident">SizeFormat</span>};
864+
<span class="kw">use</span> <span class="ident">blocks::HumanReadable</span>;
865865
<span class="kw">use</span> <span class="ident">table::HeaderMode</span>;
866866
<span class="kw">use</span> <span class="ident">uucore::display::Quotable</span>;
867867
<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>};
@@ -875,7 +875,7 @@
875875
<span class="kw">use</span> <span class="ident">std::fmt</span>;
876876
<span class="kw">use</span> <span class="ident">std::path::Path</span>;
877877

878-
<span class="kw">use</span> <span class="ident"><span class="kw">crate</span>::blocks</span>::{<span class="ident">block_size_from_matches</span>, <span class="ident">BlockSize</span>};
878+
<span class="kw">use</span> <span class="ident"><span class="kw">crate</span>::blocks</span>::{<span class="ident">read_block_size</span>, <span class="ident">BlockSize</span>};
879879
<span class="kw">use</span> <span class="ident"><span class="kw">crate</span>::columns</span>::{<span class="ident">Column</span>, <span class="ident">ColumnError</span>};
880880
<span class="kw">use</span> <span class="ident"><span class="kw">crate</span>::filesystem::Filesystem</span>;
881881
<span class="kw">use</span> <span class="ident"><span class="kw">crate</span>::table::Table</span>;
@@ -921,7 +921,7 @@
921921
<span class="kw">struct</span> <span class="ident">Options</span> {
922922
<span class="ident">show_local_fs</span>: <span class="ident">bool</span>,
923923
<span class="ident">show_all_fs</span>: <span class="ident">bool</span>,
924-
<span class="ident">size_format</span>: <span class="ident">SizeFormat</span>,
924+
<span class="ident">human_readable</span>: <span class="prelude-ty">Option</span><span class="op">&lt;</span><span class="ident">HumanReadable</span><span class="op">&gt;</span>,
925925
<span class="ident">block_size</span>: <span class="ident">BlockSize</span>,
926926
<span class="ident">header_mode</span>: <span class="ident">HeaderMode</span>,
927927

@@ -950,7 +950,7 @@
950950
<span class="ident">show_local_fs</span>: <span class="ident">Default::default</span>(),
951951
<span class="ident">show_all_fs</span>: <span class="ident">Default::default</span>(),
952952
<span class="ident">block_size</span>: <span class="ident">Default::default</span>(),
953-
<span class="ident">size_format</span>: <span class="ident">Default::default</span>(),
953+
<span class="ident">human_readable</span>: <span class="ident">Default::default</span>(),
954954
<span class="ident">header_mode</span>: <span class="ident">Default::default</span>(),
955955
<span class="ident">include</span>: <span class="ident">Default::default</span>(),
956956
<span class="ident">exclude</span>: <span class="ident">Default::default</span>(),
@@ -1028,7 +1028,7 @@
10281028
<span class="prelude-val">Ok</span>(<span class="self">Self</span> {
10291029
<span class="ident">show_local_fs</span>: <span class="ident">matches</span>.<span class="ident">is_present</span>(<span class="ident">OPT_LOCAL</span>),
10301030
<span class="ident">show_all_fs</span>: <span class="ident">matches</span>.<span class="ident">is_present</span>(<span class="ident">OPT_ALL</span>),
1031-
<span class="ident">block_size</span>: <span class="ident">block_size_from_matches</span>(<span class="ident">matches</span>).<span class="ident">map_err</span>(<span class="op">|</span><span class="ident">e</span><span class="op">|</span> <span class="kw">match</span> <span class="ident">e</span> {
1031+
<span class="ident">block_size</span>: <span class="ident">read_block_size</span>(<span class="ident">matches</span>).<span class="ident">map_err</span>(<span class="op">|</span><span class="ident">e</span><span class="op">|</span> <span class="kw">match</span> <span class="ident">e</span> {
10321032
<span class="ident">ParseSizeError::InvalidSuffix</span>(<span class="ident">s</span>) =&gt; <span class="ident">OptionsError::InvalidSuffix</span>(<span class="ident">s</span>),
10331033
<span class="ident">ParseSizeError::SizeTooBig</span>(<span class="kw">_</span>) =&gt; <span class="ident">OptionsError::BlockSizeTooLarge</span>(
10341034
<span class="ident">matches</span>.<span class="ident">value_of</span>(<span class="ident">OPT_BLOCKSIZE</span>).<span class="ident">unwrap</span>().<span class="ident">to_string</span>(),
@@ -1050,13 +1050,13 @@
10501050
<span class="ident">HeaderMode::Default</span>
10511051
}
10521052
},
1053-
<span class="ident">size_format</span>: {
1053+
<span class="ident">human_readable</span>: {
10541054
<span class="kw">if</span> <span class="ident">matches</span>.<span class="ident">is_present</span>(<span class="ident">OPT_HUMAN_READABLE_BINARY</span>) {
1055-
<span class="ident">SizeFormat::HumanReadable</span>(<span class="ident">HumanReadable::Binary</span>)
1055+
<span class="prelude-val">Some</span>(<span class="ident">HumanReadable::Binary</span>)
10561056
} <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_HUMAN_READABLE_DECIMAL</span>) {
1057-
<span class="ident">SizeFormat::HumanReadable</span>(<span class="ident">HumanReadable::Decimal</span>)
1057+
<span class="prelude-val">Some</span>(<span class="ident">HumanReadable::Decimal</span>)
10581058
} <span class="kw">else</span> {
1059-
<span class="ident">SizeFormat::StaticBlockSize</span>
1059+
<span class="prelude-val">None</span>
10601060
}
10611061
},
10621062
<span class="ident">include</span>,

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

Lines changed: 15 additions & 73 deletions
Original file line numberDiff line numberDiff line change
@@ -794,35 +794,6 @@
794794
<span id="789">789</span>
795795
<span id="790">790</span>
796796
<span id="791">791</span>
797-
<span id="792">792</span>
798-
<span id="793">793</span>
799-
<span id="794">794</span>
800-
<span id="795">795</span>
801-
<span id="796">796</span>
802-
<span id="797">797</span>
803-
<span id="798">798</span>
804-
<span id="799">799</span>
805-
<span id="800">800</span>
806-
<span id="801">801</span>
807-
<span id="802">802</span>
808-
<span id="803">803</span>
809-
<span id="804">804</span>
810-
<span id="805">805</span>
811-
<span id="806">806</span>
812-
<span id="807">807</span>
813-
<span id="808">808</span>
814-
<span id="809">809</span>
815-
<span id="810">810</span>
816-
<span id="811">811</span>
817-
<span id="812">812</span>
818-
<span id="813">813</span>
819-
<span id="814">814</span>
820-
<span id="815">815</span>
821-
<span id="816">816</span>
822-
<span id="817">817</span>
823-
<span id="818">818</span>
824-
<span id="819">819</span>
825-
<span id="820">820</span>
826797
</pre><pre class="rust"><code><span class="comment">// * This file is part of the uutils coreutils package.</span>
827798
<span class="comment">// *</span>
828799
<span class="comment">// * For the full copyright and license information, please view the LICENSE</span>
@@ -832,10 +803,9 @@
832803
<span class="doccomment">//!</span>
833804
<span class="doccomment">//! A table ([`Table`]) comprises a header row ([`Header`]) and a</span>
834805
<span class="doccomment">//! collection of data rows ([`Row`]), one per filesystem.</span>
835-
<span class="kw">use</span> <span class="ident">number_prefix::NumberPrefix</span>;
836806
<span class="kw">use</span> <span class="ident">unicode_width::UnicodeWidthStr</span>;
837807

838-
<span class="kw">use</span> <span class="ident"><span class="kw">crate</span>::blocks</span>::{<span class="ident">HumanReadable</span>, <span class="ident">SizeFormat</span>};
808+
<span class="kw">use</span> <span class="ident"><span class="kw">crate</span>::blocks</span>::{<span class="ident">to_magnitude_and_suffix</span>, <span class="ident">SuffixType</span>};
839809
<span class="kw">use</span> <span class="ident"><span class="kw">crate</span>::columns</span>::{<span class="ident">Alignment</span>, <span class="ident">Column</span>};
840810
<span class="kw">use</span> <span class="ident"><span class="kw">crate</span>::filesystem::Filesystem</span>;
841811
<span class="kw">use</span> <span class="kw">crate</span>::{<span class="ident">BlockSize</span>, <span class="ident">Options</span>};
@@ -1038,38 +1008,26 @@
10381008
<span class="self">Self</span> { <span class="ident">row</span>, <span class="ident">options</span> }
10391009
}
10401010

1041-
<span class="doccomment">/// Get a human readable string giving the scaled version of the input number.</span>
1042-
<span class="kw">fn</span> <span class="ident">scaled_human_readable</span>(<span class="kw-2">&amp;</span><span class="self">self</span>, <span class="ident">size</span>: <span class="ident">u64</span>, <span class="ident">human_readable</span>: <span class="ident">HumanReadable</span>) -&gt; <span class="ident">String</span> {
1043-
<span class="kw">let</span> <span class="ident">number_prefix</span> <span class="op">=</span> <span class="kw">match</span> <span class="ident">human_readable</span> {
1044-
<span class="ident">HumanReadable::Decimal</span> =&gt; <span class="ident">NumberPrefix::decimal</span>(<span class="ident">size</span> <span class="kw">as</span> <span class="ident">f64</span>),
1045-
<span class="ident">HumanReadable::Binary</span> =&gt; <span class="ident">NumberPrefix::binary</span>(<span class="ident">size</span> <span class="kw">as</span> <span class="ident">f64</span>),
1046-
};
1047-
<span class="kw">match</span> <span class="ident">number_prefix</span> {
1048-
<span class="ident">NumberPrefix::Standalone</span>(<span class="ident">bytes</span>) =&gt; <span class="ident">bytes</span>.<span class="ident">to_string</span>(),
1049-
<span class="ident">NumberPrefix::Prefixed</span>(<span class="ident">prefix</span>, <span class="ident">bytes</span>) =&gt; <span class="macro">format!</span>(<span class="string">&quot;{:.1}{}&quot;</span>, <span class="ident">bytes</span>, <span class="ident">prefix</span>.<span class="ident">symbol</span>()),
1050-
}
1051-
}
1052-
10531011
<span class="doccomment">/// Get a string giving the scaled version of the input number.</span>
10541012
<span class="doccomment">///</span>
10551013
<span class="doccomment">/// The scaling factor is defined in the `options` field.</span>
10561014
<span class="kw">fn</span> <span class="ident">scaled_bytes</span>(<span class="kw-2">&amp;</span><span class="self">self</span>, <span class="ident">size</span>: <span class="ident">u64</span>) -&gt; <span class="ident">String</span> {
1057-
<span class="kw">match</span> <span class="self">self</span>.<span class="ident">options</span>.<span class="ident">size_format</span> {
1058-
<span class="ident">SizeFormat::HumanReadable</span>(<span class="ident">h</span>) =&gt; <span class="self">self</span>.<span class="ident">scaled_human_readable</span>(<span class="ident">size</span>, <span class="ident">h</span>),
1059-
<span class="ident">SizeFormat::StaticBlockSize</span> =&gt; {
1060-
<span class="kw">let</span> <span class="ident">BlockSize::Bytes</span>(<span class="ident">d</span>) <span class="op">=</span> <span class="self">self</span>.<span class="ident">options</span>.<span class="ident">block_size</span>;
1061-
(<span class="ident">size</span> <span class="kw">as</span> <span class="ident">f64</span> <span class="op">/</span> <span class="ident">d</span> <span class="kw">as</span> <span class="ident">f64</span>).<span class="ident">ceil</span>().<span class="ident">to_string</span>()
1062-
}
1015+
<span class="kw">if</span> <span class="kw">let</span> <span class="prelude-val">Some</span>(<span class="ident">h</span>) <span class="op">=</span> <span class="self">self</span>.<span class="ident">options</span>.<span class="ident">human_readable</span> {
1016+
<span class="ident">to_magnitude_and_suffix</span>(<span class="ident">size</span>.<span class="ident">into</span>(), <span class="ident">SuffixType::HumanReadable</span>(<span class="ident">h</span>))
1017+
} <span class="kw">else</span> {
1018+
<span class="kw">let</span> <span class="ident">BlockSize::Bytes</span>(<span class="ident">d</span>) <span class="op">=</span> <span class="self">self</span>.<span class="ident">options</span>.<span class="ident">block_size</span>;
1019+
(<span class="ident">size</span> <span class="kw">as</span> <span class="ident">f64</span> <span class="op">/</span> <span class="ident">d</span> <span class="kw">as</span> <span class="ident">f64</span>).<span class="ident">ceil</span>().<span class="ident">to_string</span>()
10631020
}
10641021
}
10651022

10661023
<span class="doccomment">/// Get a string giving the scaled version of the input number.</span>
10671024
<span class="doccomment">///</span>
10681025
<span class="doccomment">/// The scaling factor is defined in the `options` field.</span>
10691026
<span class="kw">fn</span> <span class="ident">scaled_inodes</span>(<span class="kw-2">&amp;</span><span class="self">self</span>, <span class="ident">size</span>: <span class="ident">u64</span>) -&gt; <span class="ident">String</span> {
1070-
<span class="kw">match</span> <span class="self">self</span>.<span class="ident">options</span>.<span class="ident">size_format</span> {
1071-
<span class="ident">SizeFormat::HumanReadable</span>(<span class="ident">h</span>) =&gt; <span class="self">self</span>.<span class="ident">scaled_human_readable</span>(<span class="ident">size</span>, <span class="ident">h</span>),
1072-
<span class="ident">SizeFormat::StaticBlockSize</span> =&gt; <span class="ident">size</span>.<span class="ident">to_string</span>(),
1027+
<span class="kw">if</span> <span class="kw">let</span> <span class="prelude-val">Some</span>(<span class="ident">h</span>) <span class="op">=</span> <span class="self">self</span>.<span class="ident">options</span>.<span class="ident">human_readable</span> {
1028+
<span class="ident">to_magnitude_and_suffix</span>(<span class="ident">size</span>.<span class="ident">into</span>(), <span class="ident">SuffixType::HumanReadable</span>(<span class="ident">h</span>))
1029+
} <span class="kw">else</span> {
1030+
<span class="ident">size</span>.<span class="ident">to_string</span>()
10731031
}
10741032
}
10751033

@@ -1275,7 +1233,7 @@
12751233
<span class="attribute">#[<span class="ident">cfg</span>(<span class="ident">test</span>)]</span>
12761234
<span class="kw">mod</span> <span class="ident">tests</span> {
12771235

1278-
<span class="kw">use</span> <span class="ident"><span class="kw">crate</span>::blocks</span>::{<span class="ident">HumanReadable</span>, <span class="ident">SizeFormat</span>};
1236+
<span class="kw">use</span> <span class="ident"><span class="kw">crate</span>::blocks::HumanReadable</span>;
12791237
<span class="kw">use</span> <span class="ident"><span class="kw">crate</span>::columns::Column</span>;
12801238
<span class="kw">use</span> <span class="ident"><span class="kw">crate</span>::table</span>::{<span class="ident">Header</span>, <span class="ident">HeaderMode</span>, <span class="ident">Row</span>, <span class="ident">RowFormatter</span>};
12811239
<span class="kw">use</span> <span class="kw">crate</span>::{<span class="ident">BlockSize</span>, <span class="ident">Options</span>};
@@ -1540,7 +1498,7 @@
15401498
<span class="attribute">#[<span class="ident">test</span>]</span>
15411499
<span class="kw">fn</span> <span class="ident">test_row_formatter_with_human_readable_si</span>() {
15421500
<span class="kw">let</span> <span class="ident">options</span> <span class="op">=</span> <span class="ident">Options</span> {
1543-
<span class="ident">size_format</span>: <span class="ident">SizeFormat::HumanReadable</span>(<span class="ident">HumanReadable::Decimal</span>),
1501+
<span class="ident">human_readable</span>: <span class="prelude-val">Some</span>(<span class="ident">HumanReadable::Decimal</span>),
15441502
<span class="ident">columns</span>: <span class="ident">COLUMNS_WITH_FS_TYPE</span>.<span class="ident">to_vec</span>(),
15451503
..<span class="ident">Default::default</span>()
15461504
};
@@ -1559,22 +1517,14 @@
15591517
<span class="kw">let</span> <span class="ident">fmt</span> <span class="op">=</span> <span class="ident">RowFormatter::new</span>(<span class="kw-2">&amp;</span><span class="ident">row</span>, <span class="kw-2">&amp;</span><span class="ident">options</span>);
15601518
<span class="macro">assert_eq!</span>(
15611519
<span class="ident">fmt</span>.<span class="ident">get_values</span>(),
1562-
<span class="macro">vec!</span>(
1563-
<span class="string">&quot;my_device&quot;</span>,
1564-
<span class="string">&quot;my_type&quot;</span>,
1565-
<span class="string">&quot;4.0k&quot;</span>,
1566-
<span class="string">&quot;1.0k&quot;</span>,
1567-
<span class="string">&quot;3.0k&quot;</span>,
1568-
<span class="string">&quot;25%&quot;</span>,
1569-
<span class="string">&quot;my_mount&quot;</span>
1570-
)
1520+
<span class="macro">vec!</span>(<span class="string">&quot;my_device&quot;</span>, <span class="string">&quot;my_type&quot;</span>, <span class="string">&quot;4k&quot;</span>, <span class="string">&quot;1k&quot;</span>, <span class="string">&quot;3k&quot;</span>, <span class="string">&quot;25%&quot;</span>, <span class="string">&quot;my_mount&quot;</span>)
15711521
);
15721522
}
15731523

15741524
<span class="attribute">#[<span class="ident">test</span>]</span>
15751525
<span class="kw">fn</span> <span class="ident">test_row_formatter_with_human_readable_binary</span>() {
15761526
<span class="kw">let</span> <span class="ident">options</span> <span class="op">=</span> <span class="ident">Options</span> {
1577-
<span class="ident">size_format</span>: <span class="ident">SizeFormat::HumanReadable</span>(<span class="ident">HumanReadable::Binary</span>),
1527+
<span class="ident">human_readable</span>: <span class="prelude-val">Some</span>(<span class="ident">HumanReadable::Binary</span>),
15781528
<span class="ident">columns</span>: <span class="ident">COLUMNS_WITH_FS_TYPE</span>.<span class="ident">to_vec</span>(),
15791529
..<span class="ident">Default::default</span>()
15801530
};
@@ -1593,15 +1543,7 @@
15931543
<span class="kw">let</span> <span class="ident">fmt</span> <span class="op">=</span> <span class="ident">RowFormatter::new</span>(<span class="kw-2">&amp;</span><span class="ident">row</span>, <span class="kw-2">&amp;</span><span class="ident">options</span>);
15941544
<span class="macro">assert_eq!</span>(
15951545
<span class="ident">fmt</span>.<span class="ident">get_values</span>(),
1596-
<span class="macro">vec!</span>(
1597-
<span class="string">&quot;my_device&quot;</span>,
1598-
<span class="string">&quot;my_type&quot;</span>,
1599-
<span class="string">&quot;4.0Ki&quot;</span>,
1600-
<span class="string">&quot;1.0Ki&quot;</span>,
1601-
<span class="string">&quot;3.0Ki&quot;</span>,
1602-
<span class="string">&quot;25%&quot;</span>,
1603-
<span class="string">&quot;my_mount&quot;</span>
1604-
)
1546+
<span class="macro">vec!</span>(<span class="string">&quot;my_device&quot;</span>, <span class="string">&quot;my_type&quot;</span>, <span class="string">&quot;4K&quot;</span>, <span class="string">&quot;1K&quot;</span>, <span class="string">&quot;3K&quot;</span>, <span class="string">&quot;25%&quot;</span>, <span class="string">&quot;my_mount&quot;</span>)
16051547
);
16061548
}
16071549

0 commit comments

Comments
 (0)