Skip to content

Commit e806fa7

Browse files
sylvestresylvestre
committed
deploy: 055173b 
1 parent ca9bcca commit e806fa7

File tree

2 files changed

+38
-8
lines changed

2 files changed

+38
-8
lines changed

‎dev/src/uu_install/install.rs.html

Lines changed: 37 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -756,6 +756,21 @@
756756
<span id="754">754</span>
757757
<span id="755">755</span>
758758
<span id="756">756</span>
759+
<span id="757">757</span>
760+
<span id="758">758</span>
761+
<span id="759">759</span>
762+
<span id="760">760</span>
763+
<span id="761">761</span>
764+
<span id="762">762</span>
765+
<span id="763">763</span>
766+
<span id="764">764</span>
767+
<span id="765">765</span>
768+
<span id="766">766</span>
769+
<span id="767">767</span>
770+
<span id="768">768</span>
771+
<span id="769">769</span>
772+
<span id="770">770</span>
773+
<span id="771">771</span>
759774
</pre><pre class="rust"><code><span class="comment">// * This file is part of the uutils coreutils package.</span>
760775
<span class="comment">// *</span>
761776
<span class="comment">// * (c) Ben Eills &lt;ben@beneills.com&gt;</span>
@@ -776,7 +791,7 @@
776791
<span class="kw">use</span> <span class="ident">uucore::backup_control</span>::{<span class="self">self</span>, <span class="ident">BackupMode</span>};
777792
<span class="kw">use</span> <span class="ident">uucore::display::Quotable</span>;
778793
<span class="kw">use</span> <span class="ident">uucore::entries</span>::{<span class="ident">grp2gid</span>, <span class="ident">usr2uid</span>};
779-
<span class="kw">use</span> <span class="ident">uucore::error</span>::{<span class="ident">FromIo</span>, <span class="ident">UError</span>, <span class="ident">UIoError</span>, <span class="ident">UResult</span>};
794+
<span class="kw">use</span> <span class="ident">uucore::error</span>::{<span class="ident">FromIo</span>, <span class="ident">UError</span>, <span class="ident">UIoError</span>, <span class="ident">UResult</span>, <span class="ident">UUsageError</span>};
780795
<span class="kw">use</span> <span class="ident">uucore::format_usage</span>;
781796
<span class="kw">use</span> <span class="ident">uucore::mode::get_umask</span>;
782797
<span class="kw">use</span> <span class="ident">uucore::perms</span>::{<span class="ident">wrap_chown</span>, <span class="ident">Verbosity</span>, <span class="ident">VerbosityLevel</span>};
@@ -1200,11 +1215,14 @@
12001215
<span class="doccomment">/// Returns a Result type with the Err variant containing the error message.</span>
12011216
<span class="doccomment">///</span>
12021217
<span class="kw">fn</span> <span class="ident">standard</span>(<span class="kw-2">mut</span> <span class="ident">paths</span>: <span class="ident">Vec</span><span class="op">&lt;</span><span class="ident">String</span><span class="op">&gt;</span>, <span class="ident">b</span>: <span class="kw-2">&amp;</span><span class="ident">Behavior</span>) -&gt; <span class="ident">UResult</span><span class="op">&lt;</span>()<span class="op">&gt;</span> {
1203-
<span class="kw">let</span> <span class="ident">target</span>: <span class="ident">PathBuf</span> <span class="op">=</span> <span class="ident">b</span>
1204-
.<span class="ident">target_dir</span>
1205-
.<span class="ident">clone</span>()
1206-
.<span class="ident">unwrap_or_else</span>(<span class="op">|</span><span class="op">|</span> <span class="ident">paths</span>.<span class="ident">pop</span>().<span class="ident">unwrap</span>())
1207-
.<span class="ident">into</span>();
1218+
<span class="kw">let</span> <span class="ident">target</span>: <span class="ident">PathBuf</span> <span class="op">=</span> <span class="kw">if</span> <span class="kw">let</span> <span class="prelude-val">Some</span>(<span class="ident">path</span>) <span class="op">=</span> <span class="kw-2">&amp;</span><span class="ident">b</span>.<span class="ident">target_dir</span> {
1219+
<span class="ident">path</span>.<span class="ident">into</span>()
1220+
} <span class="kw">else</span> {
1221+
<span class="ident">paths</span>
1222+
.<span class="ident">pop</span>()
1223+
.<span class="ident">ok_or_else</span>(<span class="op">|</span><span class="op">|</span> <span class="ident">UUsageError::new</span>(<span class="number">1</span>, <span class="string">&quot;missing file operand&quot;</span>))<span class="question-mark">?</span>
1224+
.<span class="ident">into</span>()
1225+
};
12081226

12091227
<span class="kw">let</span> <span class="ident">sources</span> <span class="op">=</span> <span class="kw-2">&amp;</span><span class="ident">paths</span>.<span class="ident">iter</span>().<span class="ident">map</span>(<span class="ident">PathBuf::from</span>).<span class="ident">collect</span>::<span class="op">&lt;</span><span class="ident">Vec</span><span class="op">&lt;</span><span class="kw">_</span><span class="op">&gt;</span><span class="op">&gt;</span>();
12101228

@@ -1226,7 +1244,19 @@
12261244
}
12271245

12281246
<span class="kw">if</span> <span class="ident">target</span>.<span class="ident">is_file</span>() <span class="op">|</span><span class="op">|</span> <span class="ident">is_new_file_path</span>(<span class="kw-2">&amp;</span><span class="ident">target</span>) {
1229-
<span class="ident">copy</span>(<span class="kw-2">&amp;</span><span class="ident">sources</span>[<span class="number">0</span>], <span class="kw-2">&amp;</span><span class="ident">target</span>, <span class="ident">b</span>)
1247+
<span class="ident">copy</span>(
1248+
<span class="ident">sources</span>.<span class="ident">get</span>(<span class="number">0</span>).<span class="ident">ok_or_else</span>(<span class="op">|</span><span class="op">|</span> {
1249+
<span class="ident">UUsageError::new</span>(
1250+
<span class="number">1</span>,
1251+
<span class="macro">format!</span>(
1252+
<span class="string">&quot;missing destination file operand after &#39;{}&#39;&quot;</span>,
1253+
<span class="ident">target</span>.<span class="ident">to_str</span>().<span class="ident">unwrap</span>()
1254+
),
1255+
)
1256+
})<span class="question-mark">?</span>,
1257+
<span class="kw-2">&amp;</span><span class="ident">target</span>,
1258+
<span class="ident">b</span>,
1259+
)
12301260
} <span class="kw">else</span> {
12311261
<span class="prelude-val">Err</span>(<span class="ident">InstallError::InvalidTarget</span>(<span class="ident">target</span>).<span class="ident">into</span>())
12321262
}

‎dev/uu_install/index.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<!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="API documentation for the Rust `uu_install` crate."><meta name="keywords" content="rust, rustlang, rust-lang, uu_install"><title>uu_install - Rust</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>
22
<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 crate"><!--[if lte IE 11]><div class="warning">This old browser is unsupported and will most likely display funky things.</div><![endif]--><nav class="sidebar"><div class="sidebar-menu" role="button">&#9776;</div><a class="sidebar-logo" href="../uu_install/index.html"><div class="logo-container"><img class="rust-logo" src="../rust-logo.png" alt="logo"></div>
3-
</a><h2 class="location">Crate uu_install</h2><div class="block version"><div class="narrow-helper"></div><p>Version 0.0.12</p></div><div class="sidebar-elems"><a id="all-types" href="all.html"><p>See all uu_install's items</p></a><div class="block items"><ul><li><a href="#structs">Structs</a></li><li><a href="#enums">Enums</a></li><li><a href="#functions">Functions</a></li></ul></div><div id="sidebar-vars" data-name="uu_install" 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_install/index.html"><img class="rust-logo" src="../rust-logo.png" alt="logo"></a><nav class="sub"><div class="theme-picker"><button id="theme-picker" aria-label="Pick another theme!" aria-haspopup="menu" title="themes"><img width="18" height="18" alt="Pick another theme!" src="../brush.svg"></button><div id="theme-choices" role="menu"></div></div><form class="search-form"><div class="search-container"><div><select id="crate-search"><option value="All crates">All crates</option></select><input class="search-input" name="search" autocomplete="off" spellcheck="false" placeholder="Click or press ‘S’ to search, ‘?’ for more options…" type="search"></div><button type="button" id="help-button" title="help">?</button><a id="settings-menu" href="../settings.html" title="settings"><img width="18" height="18" alt="Change settings" src="../wheel.svg"></a></div></form></nav></div><section id="main-content" class="content"><h1 class="fqn"><span class="in-band">Crate <a class="mod" href="#">uu_install</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><span class="out-of-band"><span id="render-detail"><a id="toggle-all-docs" href="javascript:void(0)" title="collapse all docs">[<span class="inner">&#x2212;</span>]</a></span><a class="srclink" href="../src/uu_install/install.rs.html#10-756" title="goto source code">[src]</a></span></h1><h2 id="structs" class="small-section-header"><a href="#structs">Structs</a></h2>
3+
</a><h2 class="location">Crate uu_install</h2><div class="block version"><div class="narrow-helper"></div><p>Version 0.0.12</p></div><div class="sidebar-elems"><a id="all-types" href="all.html"><p>See all uu_install's items</p></a><div class="block items"><ul><li><a href="#structs">Structs</a></li><li><a href="#enums">Enums</a></li><li><a href="#functions">Functions</a></li></ul></div><div id="sidebar-vars" data-name="uu_install" 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_install/index.html"><img class="rust-logo" src="../rust-logo.png" alt="logo"></a><nav class="sub"><div class="theme-picker"><button id="theme-picker" aria-label="Pick another theme!" aria-haspopup="menu" title="themes"><img width="18" height="18" alt="Pick another theme!" src="../brush.svg"></button><div id="theme-choices" role="menu"></div></div><form class="search-form"><div class="search-container"><div><select id="crate-search"><option value="All crates">All crates</option></select><input class="search-input" name="search" autocomplete="off" spellcheck="false" placeholder="Click or press ‘S’ to search, ‘?’ for more options…" type="search"></div><button type="button" id="help-button" title="help">?</button><a id="settings-menu" href="../settings.html" title="settings"><img width="18" height="18" alt="Change settings" src="../wheel.svg"></a></div></form></nav></div><section id="main-content" class="content"><h1 class="fqn"><span class="in-band">Crate <a class="mod" href="#">uu_install</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><span class="out-of-band"><span id="render-detail"><a id="toggle-all-docs" href="javascript:void(0)" title="collapse all docs">[<span class="inner">&#x2212;</span>]</a></span><a class="srclink" href="../src/uu_install/install.rs.html#10-771" title="goto source code">[src]</a></span></h1><h2 id="structs" class="small-section-header"><a href="#structs">Structs</a></h2>
44
<div class="item-table"><div class="item-row"><div class="item-left module-item"><a class="struct" href="struct.Behavior.html" title="uu_install::Behavior struct">Behavior</a></div><div class="item-right docblock-short"></div></div></div><h2 id="enums" class="small-section-header"><a href="#enums">Enums</a></h2>
55
<div class="item-table"><div class="item-row"><div class="item-left module-item"><a class="enum" href="enum.MainFunction.html" title="uu_install::MainFunction enum">MainFunction</a></div><div class="item-right docblock-short"></div></div></div><h2 id="functions" class="small-section-header"><a href="#functions">Functions</a></h2>
66
<div class="item-table"><div class="item-row"><div class="item-left module-item"><a class="fn" href="fn.uu_app.html" title="uu_install::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_install::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_install" data-themes="ayu,dark,light" data-resource-suffix="" data-rustdoc-version="1.59.0 (9d1b2106e 2022-02-23)" ></div>

0 commit comments

Comments
 (0)