deploy: c249eba

sylvestre · sylvestre · commit f0db59db5f8c · 2022-05-08T03:20:19.000Z
diff --git a/dev/src/uu_df/blocks.rs.html b/dev/src/uu_df/blocks.rs.html
@@ -251,6 +251,13 @@
 <span id="246">246</span>
 <span id="247">247</span>
 <span id="248">248</span>
+<span id="249">249</span>
+<span id="250">250</span>
+<span id="251">251</span>
+<span id="252">252</span>
+<span id="253">253</span>
+<span id="254">254</span>
+<span id="255">255</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">//  * For the full copyright and license information, please view the LICENSE</span>
@@ -326,7 +333,7 @@
     <span class="prelude-val">Err</span>(())
 }
 
-<span class="doccomment">/// Convert a number, except multiples of 1024, into a string like &quot;12kB&quot; or &quot;34MB&quot;.</span>
+<span class="doccomment">/// Convert a number into a string like &quot;12kB&quot; or &quot;34MB&quot;.</span>
 <span class="doccomment">///</span>
 <span class="doccomment">/// Powers of 1000 become &quot;1kB&quot;, &quot;1MB&quot;, &quot;1GB&quot;, etc.</span>
 <span class="doccomment">///</span>
@@ -363,7 +370,7 @@
 <span class="doccomment">///</span>
 <span class="doccomment">/// If the number is too large to represent.</span>
 <span class="kw">fn</span> <span class="ident">to_magnitude_and_suffix</span>(<span class="ident">n</span>: <span class="ident">u128</span>) -&gt; <span class="prelude-ty">Result</span><span class="op">&lt;</span><span class="ident">String</span>, ()<span class="op">&gt;</span> {
-    <span class="kw">if</span> <span class="ident">n</span> <span class="op">%</span> <span class="number">1024</span> <span class="op">==</span> <span class="number">0</span> {
+    <span class="kw">if</span> <span class="ident">n</span> <span class="op">%</span> <span class="number">1024</span> <span class="op">==</span> <span class="number">0</span> <span class="op">&amp;&amp;</span> <span class="ident">n</span> <span class="op">%</span> <span class="number">1000</span> <span class="op">!</span><span class="op">=</span> <span class="number">0</span> {
         <span class="ident">to_magnitude_and_suffix_1024</span>(<span class="ident">n</span>)
     } <span class="kw">else</span> {
         <span class="ident">to_magnitude_and_suffix_not_powers_of_1024</span>(<span class="ident">n</span>)
@@ -492,6 +499,13 @@
         <span class="macro">assert_eq!</span>(<span class="ident">to_magnitude_and_suffix</span>(<span class="number">1_000_000_001</span>).<span class="ident">unwrap</span>(), <span class="string">&quot;1.1GB&quot;</span>);
     }
 
+    <span class="attribute">#[<span class="ident">test</span>]</span>
+    <span class="kw">fn</span> <span class="ident">test_to_magnitude_and_suffix_multiples_of_1000_and_1024</span>() {
+        <span class="macro">assert_eq!</span>(<span class="ident">to_magnitude_and_suffix</span>(<span class="number">128_000</span>).<span class="ident">unwrap</span>(), <span class="string">&quot;128kB&quot;</span>);
+        <span class="macro">assert_eq!</span>(<span class="ident">to_magnitude_and_suffix</span>(<span class="number">1000</span> <span class="op">*</span> <span class="number">1024</span>).<span class="ident">unwrap</span>(), <span class="string">&quot;1.1MB&quot;</span>);
+        <span class="macro">assert_eq!</span>(<span class="ident">to_magnitude_and_suffix</span>(<span class="number">1_000_000_000_000</span>).<span class="ident">unwrap</span>(), <span class="string">&quot;1TB&quot;</span>);
+    }
+
     <span class="attribute">#[<span class="ident">test</span>]</span>
     <span class="kw">fn</span> <span class="ident">test_block_size_display</span>() {
         <span class="macro">assert_eq!</span>(<span class="macro">format!</span>(<span class="string">&quot;{}&quot;</span>, <span class="ident">BlockSize::Bytes</span>(<span class="number">1024</span>)), <span class="string">&quot;1K&quot;</span>);
