deploy: c249eba

sylvestre · sylvestre · commit 368a5ffa7434 · 2022-07-25T03:53:33.000Z
diff --git a/dev/settings.html b/dev/settings.html
@@ -1,7 +1,7 @@
 <!DOCTYPE html><html lang="en"><head><meta charset="utf-8"><meta name="viewport" content="width=device-width, initial-scale=1.0"><meta name="generator" content="rustdoc"><meta name="description" content="Settings of Rustdoc"><meta name="keywords" content="rust, rustlang, rust-lang"><title>Rustdoc settings</title><link rel="preload" as="font" type="font/woff2" crossorigin href="./SourceSerif4-Regular.ttf.woff2"><link rel="preload" as="font" type="font/woff2" crossorigin href="./FiraSans-Regular.woff2"><link rel="preload" as="font" type="font/woff2" crossorigin href="./FiraSans-Medium.woff2"><link rel="preload" as="font" type="font/woff2" crossorigin href="./SourceCodePro-Regular.ttf.woff2"><link rel="preload" as="font" type="font/woff2" crossorigin href="./SourceSerif4-Bold.ttf.woff2"><link rel="preload" as="font" type="font/woff2" crossorigin href="./SourceCodePro-Semibold.ttf.woff2"><link rel="stylesheet" type="text/css" href="./normalize.css"><link rel="stylesheet" type="text/css" href="./rustdoc.css" id="mainThemeStyle"><link rel="stylesheet" type="text/css" href="./ayu.css" disabled><link rel="stylesheet" type="text/css" href="./dark.css" disabled><link rel="stylesheet" type="text/css" href="./light.css" id="themeStyle"><script id="default-settings" ></script><script src="./storage.js"></script><script src="./crates.js"></script><script defer src="./main.js"></script>
-    <noscript><link rel="stylesheet" href="./noscript.css"></noscript><link rel="alternate icon" type="image/png" href="./favicon-16x16.png"><link rel="alternate icon" type="image/png" href="./favicon-32x32.png"><link rel="icon" type="image/svg+xml" href="./favicon.svg"></head><body class="rustdoc mod"><!--[if lte IE 11]><div class="warning">This old browser is unsupported and will most likely display funky things.</div><![endif]--><nav class="mobile-topbar"><button class="sidebar-menu-toggle">&#9776;</button><a class="sidebar-logo" href="./vdir/index.html"><div class="logo-container"><img class="rust-logo" src="./rust-logo.svg" alt="logo"></div>
+    <noscript><link rel="stylesheet" href="./noscript.css"></noscript><link rel="alternate icon" type="image/png" href="./favicon-16x16.png"><link rel="alternate icon" type="image/png" href="./favicon-32x32.png"><link rel="icon" type="image/svg+xml" href="./favicon.svg"></head><body class="rustdoc mod"><!--[if lte IE 11]><div class="warning">This old browser is unsupported and will most likely display funky things.</div><![endif]--><nav class="mobile-topbar"><button class="sidebar-menu-toggle">&#9776;</button><a class="sidebar-logo" href="./dir/index.html"><div class="logo-container"><img class="rust-logo" src="./rust-logo.svg" alt="logo"></div>
         </a><h2 class="location"></h2>
     </nav>
-    <nav class="sidebar"><a class="sidebar-logo" href="./vdir/index.html"><div class="logo-container"><img class="rust-logo" src="./rust-logo.svg" alt="logo"></div>
-        </a><h2 class="location">Settings</h2><div class="sidebar-elems"></div></nav><main><div class="width-limiter"><div class="sub-container"><a class="sub-logo-container" href="./vdir/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"><link rel="stylesheet" type="text/css" href="settings.css"><script defer src="settings.js"></script></section></div></main><div id="rustdoc-vars" data-root-path="./" data-current-crate="vdir" data-themes="ayu,dark,light" data-resource-suffix="" data-rustdoc-version="1.62.1 (e092d0b6b 2022-07-16)" ></div>
+    <nav class="sidebar"><a class="sidebar-logo" href="./dir/index.html"><div class="logo-container"><img class="rust-logo" src="./rust-logo.svg" alt="logo"></div>
+        </a><h2 class="location">Settings</h2><div class="sidebar-elems"></div></nav><main><div class="width-limiter"><div class="sub-container"><a class="sub-logo-container" href="./dir/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"><link rel="stylesheet" type="text/css" href="settings.css"><script defer src="settings.js"></script></section></div></main><div id="rustdoc-vars" data-root-path="./" data-current-crate="dir" data-themes="ayu,dark,light" data-resource-suffix="" data-rustdoc-version="1.62.1 (e092d0b6b 2022-07-16)" ></div>
 </body></html>
diff --git a/dev/src/uu_numfmt/format.rs.html b/dev/src/uu_numfmt/format.rs.html
@@ -338,6 +338,15 @@
 <span id="333">333</span>
 <span id="334">334</span>
 <span id="335">335</span>
+<span id="336">336</span>
+<span id="337">337</span>
+<span id="338">338</span>
+<span id="339">339</span>
+<span id="340">340</span>
+<span id="341">341</span>
+<span id="342">342</span>
+<span id="343">343</span>
+<span id="344">344</span>
 </pre><pre class="rust"><code><span class="kw">use</span> <span class="ident">uucore::display::Quotable</span>;
 
 <span class="kw">use</span> <span class="ident"><span class="kw">crate</span>::options</span>::{<span class="ident">NumfmtOptions</span>, <span class="ident">RoundMethod</span>, <span class="ident">TransformOptions</span>};
@@ -485,7 +494,16 @@
     <span class="kw">let</span> (<span class="ident">i</span>, <span class="ident">suffix</span>) <span class="op">=</span> <span class="ident">parse_suffix</span>(<span class="ident">s</span>)<span class="question-mark">?</span>;
     <span class="kw">let</span> <span class="ident">i</span> <span class="op">=</span> <span class="ident">i</span> <span class="op">*</span> (<span class="ident">opts</span>.<span class="ident">from_unit</span> <span class="kw">as</span> <span class="ident">f64</span>);
 
-    <span class="ident">remove_suffix</span>(<span class="ident">i</span>, <span class="ident">suffix</span>, <span class="kw-2">&amp;</span><span class="ident">opts</span>.<span class="ident">from</span>).<span class="ident">map</span>(<span class="op">|</span><span class="ident">n</span><span class="op">|</span> <span class="kw">if</span> <span class="ident">n</span> <span class="op">&lt;</span> <span class="number">0.0</span> { <span class="op">-</span><span class="ident">n</span>.<span class="ident">abs</span>().<span class="ident">ceil</span>() } <span class="kw">else</span> { <span class="ident">n</span>.<span class="ident">ceil</span>() })
+    <span class="ident">remove_suffix</span>(<span class="ident">i</span>, <span class="ident">suffix</span>, <span class="kw-2">&amp;</span><span class="ident">opts</span>.<span class="ident">from</span>).<span class="ident">map</span>(<span class="op">|</span><span class="ident">n</span><span class="op">|</span> {
+        <span class="comment">// GNU numfmt doesn&#39;t round values if no --from argument is provided by the user</span>
+        <span class="kw">if</span> <span class="ident">opts</span>.<span class="ident">from</span> <span class="op">==</span> <span class="ident">Unit::None</span> {
+            <span class="ident">n</span>
+        } <span class="kw">else</span> <span class="kw">if</span> <span class="ident">n</span> <span class="op">&lt;</span> <span class="number">0.0</span> {
+            <span class="op">-</span><span class="ident">n</span>.<span class="ident">abs</span>().<span class="ident">ceil</span>()
+        } <span class="kw">else</span> {
+            <span class="ident">n</span>.<span class="ident">ceil</span>()
+        }
+    })
 }
 
 <span class="doccomment">/// Divide numerator by denominator, with rounding.</span>
diff --git a/dev/src/uu_numfmt/units.rs.html b/dev/src/uu_numfmt/units.rs.html
@@ -66,6 +66,7 @@
 <span id="61">61</span>
 <span id="62">62</span>
 <span id="63">63</span>
+<span id="64">64</span>
 </pre><pre class="rust"><code><span class="kw">use</span> <span class="ident">std::fmt</span>;
 
 <span class="kw">pub</span> <span class="kw">const</span> <span class="ident">SI_BASES</span>: [<span class="ident">f64</span>; <span class="number">10</span>] <span class="op">=</span> [<span class="number">1.</span>, <span class="number">1e3</span>, <span class="number">1e6</span>, <span class="number">1e9</span>, <span class="number">1e12</span>, <span class="number">1e15</span>, <span class="number">1e18</span>, <span class="number">1e21</span>, <span class="number">1e24</span>, <span class="number">1e27</span>];
@@ -85,6 +86,7 @@
 
 <span class="kw">pub</span> <span class="kw">type</span> <span class="ident">WithI</span> <span class="op">=</span> <span class="ident">bool</span>;
 
+<span class="attribute">#[<span class="ident">derive</span>(<span class="ident">PartialEq</span>)]</span>
 <span class="kw">pub</span> <span class="kw">enum</span> <span class="ident">Unit</span> {
     <span class="ident">Auto</span>,
     <span class="ident">Si</span>,
diff --git a/dev/uu_numfmt/format/fn.div_round.html b/dev/uu_numfmt/format/fn.div_round.html
@@ -4,7 +4,7 @@
     </nav>
     <nav class="sidebar"><a class="sidebar-logo" href="../../uu_numfmt/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 uu_numfmt::format</a></h2><div id="sidebar-vars" data-name="div_round" 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="../../uu_numfmt/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">uu_numfmt</a>::<wbr><a href="index.html">format</a>::<wbr><a class="fn" href="#">div_round</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/uu_numfmt/format.rs.html#178-186">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 fn div_round(n: <a class="primitive" href="https://doc.rust-lang.org/1.62.1/std/primitive.f64.html">f64</a>, d: <a class="primitive" href="https://doc.rust-lang.org/1.62.1/std/primitive.f64.html">f64</a>, method: <a class="enum" href="../options/enum.RoundMethod.html" title="enum uu_numfmt::options::RoundMethod">RoundMethod</a>) -&gt; <a class="primitive" href="https://doc.rust-lang.org/1.62.1/std/primitive.f64.html">f64</a></code></pre></div><details class="rustdoc-toggle top-doc" open><summary class="hideme"><span>Expand description</span></summary><div class="docblock"><p>Divide numerator by denominator, with rounding.</p>
+    <h1 class="fqn"><span class="in-band">Function <a href="../index.html">uu_numfmt</a>::<wbr><a href="index.html">format</a>::<wbr><a class="fn" href="#">div_round</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/uu_numfmt/format.rs.html#187-195">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 fn div_round(n: <a class="primitive" href="https://doc.rust-lang.org/1.62.1/std/primitive.f64.html">f64</a>, d: <a class="primitive" href="https://doc.rust-lang.org/1.62.1/std/primitive.f64.html">f64</a>, method: <a class="enum" href="../options/enum.RoundMethod.html" title="enum uu_numfmt::options::RoundMethod">RoundMethod</a>) -&gt; <a class="primitive" href="https://doc.rust-lang.org/1.62.1/std/primitive.f64.html">f64</a></code></pre></div><details class="rustdoc-toggle top-doc" open><summary class="hideme"><span>Expand description</span></summary><div class="docblock"><p>Divide numerator by denominator, with rounding.</p>
 <p>If the result of the division is less than 10.0, round to one decimal point.</p>
 <p>Otherwise, round to an integer.</p>
 <h2 id="examples"><a href="#examples">Examples:</a></h2>
diff --git a/dev/uu_numfmt/format/fn.format_and_print.html b/dev/uu_numfmt/format/fn.format_and_print.html
@@ -4,7 +4,7 @@
     </nav>
     <nav class="sidebar"><a class="sidebar-logo" href="../../uu_numfmt/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 uu_numfmt::format</a></h2><div id="sidebar-vars" data-name="format_and_print" 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="../../uu_numfmt/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">uu_numfmt</a>::<wbr><a href="index.html">format</a>::<wbr><a class="fn" href="#">format_and_print</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/uu_numfmt/format.rs.html#330-335">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 fn format_and_print(s: &amp;<a class="primitive" href="https://doc.rust-lang.org/1.62.1/std/primitive.str.html">str</a>, options: &amp;<a class="struct" href="../options/struct.NumfmtOptions.html" title="struct uu_numfmt::options::NumfmtOptions">NumfmtOptions</a>) -&gt; <a class="enum" href="https://doc.rust-lang.org/1.62.1/core/result/enum.Result.html" title="enum core::result::Result">Result</a>&lt;<a class="primitive" href="https://doc.rust-lang.org/1.62.1/std/primitive.unit.html">()</a>, <a class="struct" href="https://doc.rust-lang.org/1.62.1/alloc/string/struct.String.html" title="struct alloc::string::String">String</a>&gt;</code></pre></div><details class="rustdoc-toggle top-doc" open><summary class="hideme"><span>Expand description</span></summary><div class="docblock"><p>Format a line of text according to the selected options.</p>
+    <h1 class="fqn"><span class="in-band">Function <a href="../index.html">uu_numfmt</a>::<wbr><a href="index.html">format</a>::<wbr><a class="fn" href="#">format_and_print</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/uu_numfmt/format.rs.html#339-344">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 fn format_and_print(s: &amp;<a class="primitive" href="https://doc.rust-lang.org/1.62.1/std/primitive.str.html">str</a>, options: &amp;<a class="struct" href="../options/struct.NumfmtOptions.html" title="struct uu_numfmt::options::NumfmtOptions">NumfmtOptions</a>) -&gt; <a class="enum" href="https://doc.rust-lang.org/1.62.1/core/result/enum.Result.html" title="enum core::result::Result">Result</a>&lt;<a class="primitive" href="https://doc.rust-lang.org/1.62.1/std/primitive.unit.html">()</a>, <a class="struct" href="https://doc.rust-lang.org/1.62.1/alloc/string/struct.String.html" title="struct alloc::string::String">String</a>&gt;</code></pre></div><details class="rustdoc-toggle top-doc" open><summary class="hideme"><span>Expand description</span></summary><div class="docblock"><p>Format a line of text according to the selected options.</p>
 <p>Given a line of text <code>s</code>, split the line into fields, transform and format
 any selected numeric fields, and print the result to stdout. Fields not
 selected for conversion are passed through unmodified.</p>
diff --git a/dev/uu_numfmt/format/index.html b/dev/uu_numfmt/format/index.html
