deploy: c249eba

sylvestre · sylvestre · commit 47d7d9c9f36b · 2022-05-22T03:16:47.000Z
diff --git a/dev/src/uu_mktemp/mktemp.rs.html b/dev/src/uu_mktemp/mktemp.rs.html
@@ -394,6 +394,8 @@
 <span id="389">389</span>
 <span id="390">390</span>
 <span id="391">391</span>
+<span id="392">392</span>
+<span id="393">393</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">// (c) Sunrin SHIMURA</span>
@@ -548,12 +550,14 @@
     <span class="kw">let</span> <span class="ident">dry_run</span> <span class="op">=</span> <span class="ident">matches</span>.<span class="ident">is_present</span>(<span class="ident">OPT_DRY_RUN</span>);
     <span class="kw">let</span> <span class="ident">suppress_file_err</span> <span class="op">=</span> <span class="ident">matches</span>.<span class="ident">is_present</span>(<span class="ident">OPT_QUIET</span>);
 
-    <span class="kw">let</span> (<span class="ident">prefix</span>, <span class="ident">rand</span>, <span class="ident">suffix</span>) <span class="op">=</span> <span class="ident">parse_template</span>(<span class="ident">template</span>, <span class="ident">matches</span>.<span class="ident">value_of</span>(<span class="ident">OPT_SUFFIX</span>))<span class="question-mark">?</span>;
-
-    <span class="kw">if</span> <span class="ident">matches</span>.<span class="ident">is_present</span>(<span class="ident">OPT_TMPDIR</span>) <span class="op">&amp;&amp;</span> <span class="ident">PathBuf::from</span>(<span class="ident">prefix</span>).<span class="ident">is_absolute</span>() {
+    <span class="comment">// If `--tmpdir` is given, the template cannot be an absolute</span>
+    <span class="comment">// path. For example, `mktemp --tmpdir=a /XXX` is not allowed.</span>
+    <span class="kw">if</span> <span class="ident">matches</span>.<span class="ident">is_present</span>(<span class="ident">OPT_TMPDIR</span>) <span class="op">&amp;&amp;</span> <span class="ident">PathBuf::from</span>(<span class="ident">template</span>).<span class="ident">is_absolute</span>() {
         <span class="kw">return</span> <span class="prelude-val">Err</span>(<span class="ident">MkTempError::InvalidTemplate</span>(<span class="ident">template</span>.<span class="ident">into</span>()).<span class="ident">into</span>());
     }
 
+    <span class="kw">let</span> (<span class="ident">prefix</span>, <span class="ident">rand</span>, <span class="ident">suffix</span>) <span class="op">=</span> <span class="ident">parse_template</span>(<span class="ident">template</span>, <span class="ident">matches</span>.<span class="ident">value_of</span>(<span class="ident">OPT_SUFFIX</span>))<span class="question-mark">?</span>;
+
     <span class="kw">let</span> <span class="ident">res</span> <span class="op">=</span> <span class="kw">if</span> <span class="ident">dry_run</span> {
         <span class="ident">dry_exec</span>(<span class="ident">tmpdir</span>, <span class="ident">prefix</span>, <span class="ident">rand</span>, <span class="ident">suffix</span>)
     } <span class="kw">else</span> {
diff --git a/dev/src/uu_mv/mv.rs.html b/dev/src/uu_mv/mv.rs.html
@@ -478,6 +478,19 @@
 <span id="473">473</span>
 <span id="474">474</span>
 <span id="475">475</span>
+<span id="476">476</span>
+<span id="477">477</span>
+<span id="478">478</span>
+<span id="479">479</span>
+<span id="480">480</span>
+<span id="481">481</span>
+<span id="482">482</span>
+<span id="483">483</span>
+<span id="484">484</span>
+<span id="485">485</span>
+<span id="486">486</span>
+<span id="487">487</span>
+<span id="488">488</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">// (c) Orvar Segerström &lt;orvarsegerstrom@gmail.com&gt;</span>
@@ -493,7 +506,7 @@
 <span class="attribute">#[<span class="ident">macro_use</span>]</span>
 <span class="kw">extern</span> <span class="kw">crate</span> <span class="ident">uucore</span>;
 
-<span class="kw">use</span> <span class="ident">clap</span>::{<span class="ident">crate_version</span>, <span class="ident">Arg</span>, <span class="ident">ArgMatches</span>, <span class="ident">Command</span>};
+<span class="kw">use</span> <span class="ident">clap</span>::{<span class="ident">crate_version</span>, <span class="ident">Arg</span>, <span class="ident">ArgMatches</span>, <span class="ident">Command</span>, <span class="ident">ErrorKind</span>};
 <span class="kw">use</span> <span class="ident">std::env</span>;
 <span class="kw">use</span> <span class="ident">std::ffi::OsString</span>;
 <span class="kw">use</span> <span class="ident">std::fs</span>;
@@ -550,13 +563,26 @@
 
 <span class="attribute">#[<span class="ident">uucore::main</span>]</span>
 <span class="kw">pub</span> <span class="kw">fn</span> <span class="ident">uumain</span>(<span class="ident">args</span>: <span class="kw">impl</span> <span class="ident">uucore::Args</span>) -&gt; <span class="ident">UResult</span><span class="op">&lt;</span>()<span class="op">&gt;</span> {
-    <span class="kw">let</span> <span class="ident">matches</span> <span class="op">=</span> <span class="ident">uu_app</span>()
-        .<span class="ident">after_help</span>(<span class="kw-2">&amp;</span><span class="kw-2">*</span><span class="macro">format!</span>(
-            <span class="string">&quot;{}\n{}&quot;</span>,
-            <span class="ident">LONG_HELP</span>,
-            <span class="ident">backup_control::BACKUP_CONTROL_LONG_HELP</span>
-        ))
-        .<span class="ident">get_matches_from</span>(<span class="ident">args</span>);
+    <span class="kw">let</span> <span class="ident">help</span> <span class="op">=</span> <span class="macro">format!</span>(
+        <span class="string">&quot;{}\n{}&quot;</span>,
+        <span class="ident">LONG_HELP</span>,
+        <span class="ident">backup_control::BACKUP_CONTROL_LONG_HELP</span>
+    );
+    <span class="kw">let</span> <span class="kw-2">mut</span> <span class="ident">app</span> <span class="op">=</span> <span class="ident">uu_app</span>().<span class="ident">after_help</span>(<span class="kw-2">&amp;</span><span class="kw-2">*</span><span class="ident">help</span>);
+    <span class="kw">let</span> <span class="ident">matches</span> <span class="op">=</span> <span class="ident">app</span>
+        .<span class="ident">try_get_matches_from_mut</span>(<span class="ident">args</span>)
+        .<span class="ident">unwrap_or_else</span>(<span class="op">|</span><span class="ident">e</span><span class="op">|</span> <span class="ident">e</span>.<span class="ident">exit</span>());
+
+    <span class="kw">if</span> <span class="op">!</span><span class="ident">matches</span>.<span class="ident">is_present</span>(<span class="ident">OPT_TARGET_DIRECTORY</span>) <span class="op">&amp;&amp;</span> <span class="ident">matches</span>.<span class="ident">occurrences_of</span>(<span class="ident">ARG_FILES</span>) <span class="op">==</span> <span class="number">1</span> {
+        <span class="ident">app</span>.<span class="ident">error</span>(
+            <span class="ident">ErrorKind::TooFewValues</span>,
+            <span class="macro">format!</span>(
+                <span class="string">&quot;The argument &#39;&lt;{}&gt;...&#39; requires at least 2 values, but only 1 was provided&quot;</span>,
+                <span class="ident">ARG_FILES</span>
+            ),
+        )
+        .<span class="ident">exit</span>();
+    }
 
     <span class="kw">let</span> <span class="ident">files</span>: <span class="ident">Vec</span><span class="op">&lt;</span><span class="ident">OsString</span><span class="op">&gt;</span> <span class="op">=</span> <span class="ident">matches</span>
         .<span class="ident">values_of_os</span>(<span class="ident">ARG_FILES</span>)
@@ -661,7 +687,7 @@
         <span class="ident">Arg::new</span>(<span class="ident">ARG_FILES</span>)
             .<span class="ident">multiple_occurrences</span>(<span class="bool-val">true</span>)
             .<span class="ident">takes_value</span>(<span class="bool-val">true</span>)
-            .<span class="ident">min_values</span>(<span class="number">2</span>)
+            .<span class="ident">min_values</span>(<span class="number">1</span>)
             .<span class="ident">required</span>(<span class="bool-val">true</span>)
             .<span class="ident">allow_invalid_utf8</span>(<span class="bool-val">true</span>)
             .<span class="ident">value_hint</span>(<span class="ident">clap::ValueHint::AnyPath</span>)
diff --git a/dev/uu_mktemp/fn.dry_exec.html b/dev/uu_mktemp/fn.dry_exec.html
@@ -4,5 +4,5 @@
     </nav>
     <nav class="sidebar"><a class="sidebar-logo" href="../uu_mktemp/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_mktemp</a></h2><div id="sidebar-vars" data-name="dry_exec" 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_mktemp/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_mktemp</a>::<wbr><a class="fn" href="#">dry_exec</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_mktemp/mktemp.rs.html#292-314">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 dry_exec(<br>&nbsp;&nbsp;&nbsp;&nbsp;tmpdir: <a class="struct" href="https://doc.rust-lang.org/1.61.0/std/path/struct.PathBuf.html" title="struct std::path::PathBuf">PathBuf</a>, <br>&nbsp;&nbsp;&nbsp;&nbsp;prefix: &amp;<a class="primitive" href="https://doc.rust-lang.org/1.61.0/std/primitive.str.html">str</a>, <br>&nbsp;&nbsp;&nbsp;&nbsp;rand: <a class="primitive" href="https://doc.rust-lang.org/1.61.0/std/primitive.usize.html">usize</a>, <br>&nbsp;&nbsp;&nbsp;&nbsp;suffix: &amp;<a class="primitive" href="https://doc.rust-lang.org/1.61.0/std/primitive.str.html">str</a><br>) -&gt; <a class="type" href="../uucore/mods/error/type.UResult.html" title="type uucore::mods::error::UResult">UResult</a>&lt;<a class="primitive" href="https://doc.rust-lang.org/1.61.0/std/primitive.unit.html">()</a>&gt;</code></pre></div></section><section id="search" class="content hidden"></section></div></main><div id="rustdoc-vars" data-root-path="../" data-current-crate="uu_mktemp" data-themes="ayu,dark,light" data-resource-suffix="" data-rustdoc-version="1.61.0 (fe5b13d68 2022-05-18)" ></div>
+    <h1 class="fqn"><span class="in-band">Function <a href="index.html">uu_mktemp</a>::<wbr><a class="fn" href="#">dry_exec</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_mktemp/mktemp.rs.html#294-316">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 dry_exec(<br>&nbsp;&nbsp;&nbsp;&nbsp;tmpdir: <a class="struct" href="https://doc.rust-lang.org/1.61.0/std/path/struct.PathBuf.html" title="struct std::path::PathBuf">PathBuf</a>, <br>&nbsp;&nbsp;&nbsp;&nbsp;prefix: &amp;<a class="primitive" href="https://doc.rust-lang.org/1.61.0/std/primitive.str.html">str</a>, <br>&nbsp;&nbsp;&nbsp;&nbsp;rand: <a class="primitive" href="https://doc.rust-lang.org/1.61.0/std/primitive.usize.html">usize</a>, <br>&nbsp;&nbsp;&nbsp;&nbsp;suffix: &amp;<a class="primitive" href="https://doc.rust-lang.org/1.61.0/std/primitive.str.html">str</a><br>) -&gt; <a class="type" href="../uucore/mods/error/type.UResult.html" title="type uucore::mods::error::UResult">UResult</a>&lt;<a class="primitive" href="https://doc.rust-lang.org/1.61.0/std/primitive.unit.html">()</a>&gt;</code></pre></div></section><section id="search" class="content hidden"></section></div></main><div id="rustdoc-vars" data-root-path="../" data-current-crate="uu_mktemp" data-themes="ayu,dark,light" data-resource-suffix="" data-rustdoc-version="1.61.0 (fe5b13d68 2022-05-18)" ></div>
 </body></html>
diff --git a/dev/uu_mktemp/fn.uu_app.html b/dev/uu_mktemp/fn.uu_app.html
@@ -4,5 +4,5 @@
     </nav>
     <nav class="sidebar"><a class="sidebar-logo" href="../uu_mktemp/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_mktemp</a></h2><div id="sidebar-vars" data-name="uu_app" 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_mktemp/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_mktemp</a>::<wbr><a class="fn" href="#">uu_app</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_mktemp/mktemp.rs.html#175-232">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 uu_app&lt;'a&gt;() -&gt; Command&lt;'a&gt;</code></pre></div></section><section id="search" class="content hidden"></section></div></main><div id="rustdoc-vars" data-root-path="../" data-current-crate="uu_mktemp" data-themes="ayu,dark,light" data-resource-suffix="" data-rustdoc-version="1.61.0 (fe5b13d68 2022-05-18)" ></div>
+    <h1 class="fqn"><span class="in-band">Function <a href="index.html">uu_mktemp</a>::<wbr><a class="fn" href="#">uu_app</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_mktemp/mktemp.rs.html#177-234">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 uu_app&lt;'a&gt;() -&gt; Command&lt;'a&gt;</code></pre></div></section><section id="search" class="content hidden"></section></div></main><div id="rustdoc-vars" data-root-path="../" data-current-crate="uu_mktemp" data-themes="ayu,dark,light" data-resource-suffix="" data-rustdoc-version="1.61.0 (fe5b13d68 2022-05-18)" ></div>
 </body></html>
diff --git a/dev/uu_mktemp/index.html b/dev/uu_mktemp/index.html
@@ -4,6 +4,6 @@
     </nav>
     <nav class="sidebar"><a class="sidebar-logo" href="../uu_mktemp/index.html"><div class="logo-container"><img class="rust-logo" src="../rust-logo.svg" alt="logo"></div>
         </a><h2 class="location"><a href="#">Crate uu_mktemp</a></h2><div class="sidebar-elems"><div class="block"><ul><li class="version">Version 0.0.13</li><li><a id="all-types" href="all.html">All Items</a></li></div></ul><section><div class="block"><ul><li><a href="#functions">Functions</a></li></ul></div></section><div id="sidebar-vars" data-name="uu_mktemp" data-ty="mod" 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_mktemp/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">Crate <a class="mod" href="#">uu_mktemp</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_mktemp/mktemp.rs.html#11-391">source</a> · <a id="toggle-all-docs" href="javascript:void(0)" title="collapse all docs">[<span class="inner">&#x2212;</span>]</a></span></div><h2 id="functions" class="small-section-header"><a href="#functions">Functions</a></h2>
+    <h1 class="fqn"><span class="in-band">Crate <a class="mod" href="#">uu_mktemp</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_mktemp/mktemp.rs.html#11-393">source</a> · <a id="toggle-all-docs" href="javascript:void(0)" title="collapse all docs">[<span class="inner">&#x2212;</span>]</a></span></div><h2 id="functions" class="small-section-header"><a href="#functions">Functions</a></h2>
 <div class="item-table"><div class="item-row"><div class="item-left module-item"><a class="fn" href="fn.dry_exec.html" title="uu_mktemp::dry_exec fn">dry_exec</a></div><div class="item-right docblock-short"></div></div><div class="item-row"><div class="item-left module-item"><a class="fn" href="fn.uu_app.html" title="uu_mktemp::uu_app fn">uu_app</a></div><div class="item-right docblock-short"></div></div><div class="item-row"><div class="item-left module-item"><a class="fn" href="fn.uumain.html" title="uu_mktemp::uumain fn">uumain</a></div><div class="item-right docblock-short"></div></div></div></section><section id="search" class="content hidden"></section></div></main><div id="rustdoc-vars" data-root-path="../" data-current-crate="uu_mktemp" data-themes="ayu,dark,light" data-resource-suffix="" data-rustdoc-version="1.61.0 (fe5b13d68 2022-05-18)" ></div>
 </body></html>
diff --git a/dev/uu_mv/fn.uu_app.html b/dev/uu_mv/fn.uu_app.html
diff --git a/dev/uu_mv/index.html b/dev/uu_mv/index.html
