Skip to content

Commit 5e7f8d3

Browse files
sylvestresylvestre
committed
deploy: c249eba 
1 parent 7ca97a0 commit 5e7f8d3

File tree

6 files changed

+75
-13
lines changed

6 files changed

+75
-13
lines changed

‎dev/settings.html

+4-4
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
1-
<!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 defer src="sidebar-items.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="./dir/index.html"><div class="logo-container"><img class="rust-logo" src="./rust-logo.svg" alt="logo"></div>
1+
<!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 defer src="sidebar-items.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>
22
</a><h2 class="location"></h2>
33
</nav>
4-
<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>
5-
</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"><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><div id="settings-menu" tabindex="-1">
4+
<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>
5+
</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"><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><div id="settings-menu" tabindex="-1">
66
<a href="./settings.html" title="settings"><img width="22" height="22" alt="Change settings" src="./wheel.svg"></a></div>
7-
</div></form></nav></div><section id="main-content" class="content"><div class="main-heading"><h1 class="fqn"><span class="in-band">Rustdoc settings</span></h1><span class="out-of-band"><a id="back" href="javascript:void(0)" onclick="history.back();">Back</a></span></div><noscript><section>You need to enable Javascript be able to update your settings.</section></noscript><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.63.0 (4b91a6ea7 2022-08-08)" ></div>
7+
</div></form></nav></div><section id="main-content" class="content"><div class="main-heading"><h1 class="fqn"><span class="in-band">Rustdoc settings</span></h1><span class="out-of-band"><a id="back" href="javascript:void(0)" onclick="history.back();">Back</a></span></div><noscript><section>You need to enable Javascript be able to update your settings.</section></noscript><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.63.0 (4b91a6ea7 2022-08-08)" ></div>
88
</body></html>

‎dev/src/uu_realpath/realpath.rs.html

+4-4
Original file line numberDiff line numberDiff line change
@@ -302,7 +302,7 @@
302302
<span class="attribute">#[<span class="ident">macro_use</span>]</span>
303303
<span class="kw">extern</span> <span class="kw">crate</span> <span class="ident">uucore</span>;
304304

305-
<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>};
305+
<span class="kw">use</span> <span class="ident">clap</span>::{<span class="ident">builder::NonEmptyStringValueParser</span>, <span class="ident">crate_version</span>, <span class="ident">Arg</span>, <span class="ident">ArgMatches</span>, <span class="ident">Command</span>};
306306
<span class="kw">use</span> <span class="ident">std</span>::{
307307
<span class="ident">io</span>::{<span class="ident">stdout</span>, <span class="ident">Write</span>},
308308
<span class="ident">path</span>::{<span class="ident">Path</span>, <span class="ident">PathBuf</span>},
@@ -442,22 +442,22 @@
442442
.<span class="ident">long</span>(<span class="ident">OPT_RELATIVE_TO</span>)
443443
.<span class="ident">takes_value</span>(<span class="bool-val">true</span>)
444444
.<span class="ident">value_name</span>(<span class="string">&quot;DIR&quot;</span>)
445-
.<span class="ident">forbid_empty_values</span>(<span class="bool-val">true</span>)
445+
.<span class="ident">value_parser</span>(<span class="ident">NonEmptyStringValueParser::new</span>())
446446
.<span class="ident">help</span>(<span class="string">&quot;print the resolved path relative to DIR&quot;</span>),
447447
)
448448
.<span class="ident">arg</span>(
449449
<span class="ident">Arg::new</span>(<span class="ident">OPT_RELATIVE_BASE</span>)
450450
.<span class="ident">long</span>(<span class="ident">OPT_RELATIVE_BASE</span>)
451451
.<span class="ident">takes_value</span>(<span class="bool-val">true</span>)
452452
.<span class="ident">value_name</span>(<span class="string">&quot;DIR&quot;</span>)
453-
.<span class="ident">forbid_empty_values</span>(<span class="bool-val">true</span>)
453+
.<span class="ident">value_parser</span>(<span class="ident">NonEmptyStringValueParser::new</span>())
454454
.<span class="ident">help</span>(<span class="string">&quot;print absolute paths unless paths below DIR&quot;</span>),
455455
)
456456
.<span class="ident">arg</span>(
457457
<span class="ident">Arg::new</span>(<span class="ident">ARG_FILES</span>)
458458
.<span class="ident">multiple_occurrences</span>(<span class="bool-val">true</span>)
459459
.<span class="ident">required</span>(<span class="bool-val">true</span>)
460-
.<span class="ident">forbid_empty_values</span>(<span class="bool-val">true</span>)
460+
.<span class="ident">value_parser</span>(<span class="ident">NonEmptyStringValueParser::new</span>())
461461
.<span class="ident">value_hint</span>(<span class="ident">clap::ValueHint::AnyPath</span>),
462462
)
463463
}

‎dev/src/uu_rm/rm.rs.html

+64-2
Original file line numberDiff line numberDiff line change
@@ -457,6 +457,37 @@
457457
<span id="451">451</span>
458458
<span id="452">452</span>
459459
<span id="453">453</span>
460+
<span id="454">454</span>
461+
<span id="455">455</span>
462+
<span id="456">456</span>
463+
<span id="457">457</span>
464+
<span id="458">458</span>
465+
<span id="459">459</span>
466+
<span id="460">460</span>
467+
<span id="461">461</span>
468+
<span id="462">462</span>
469+
<span id="463">463</span>
470+
<span id="464">464</span>
471+
<span id="465">465</span>
472+
<span id="466">466</span>
473+
<span id="467">467</span>
474+
<span id="468">468</span>
475+
<span id="469">469</span>
476+
<span id="470">470</span>
477+
<span id="471">471</span>
478+
<span id="472">472</span>
479+
<span id="473">473</span>
480+
<span id="474">474</span>
481+
<span id="475">475</span>
482+
<span id="476">476</span>
483+
<span id="477">477</span>
484+
<span id="478">478</span>
485+
<span id="479">479</span>
486+
<span id="480">480</span>
487+
<span id="481">481</span>
488+
<span id="482">482</span>
489+
<span id="483">483</span>
490+
<span id="484">484</span>
460491
</pre><pre class="rust"><code><span class="comment">// * This file is part of the uutils coreutils package.</span>
461492
<span class="comment">// *</span>
462493
<span class="comment">// * (c) Alex Lyon &lt;arcterus@mail.com&gt;</span>
@@ -473,6 +504,8 @@
473504
<span class="kw">use</span> <span class="ident">remove_dir_all::remove_dir_all</span>;
474505
<span class="kw">use</span> <span class="ident">std::collections::VecDeque</span>;
475506
<span class="kw">use</span> <span class="ident">std::fs</span>;
507+
<span class="kw">use</span> <span class="ident">std::fs::File</span>;
508+
<span class="kw">use</span> <span class="ident">std::io::ErrorKind</span>;
476509
<span class="kw">use</span> <span class="ident">std::io</span>::{<span class="ident">stderr</span>, <span class="ident">stdin</span>, <span class="ident">BufRead</span>, <span class="ident">Write</span>};
477510
<span class="kw">use</span> <span class="ident">std::ops::BitOr</span>;
478511
<span class="kw">use</span> <span class="ident">std::path</span>::{<span class="ident">Path</span>, <span class="ident">PathBuf</span>};
@@ -486,6 +519,7 @@
486519
<span class="ident">Never</span>,
487520
<span class="ident">Once</span>,
488521
<span class="ident">Always</span>,
522+
<span class="ident">PromptProtected</span>,
489523
}
490524

491525
<span class="kw">struct</span> <span class="ident">Options</span> {
@@ -571,7 +605,7 @@
571605
}
572606
}
573607
} <span class="kw">else</span> {
574-
<span class="ident">InteractiveMode::Never</span>
608+
<span class="ident">InteractiveMode::PromptProtected</span>
575609
}
576610
},
577611
<span class="ident">one_fs</span>: <span class="ident">matches</span>.<span class="ident">contains_id</span>(<span class="ident">OPT_ONE_FILE_SYSTEM</span>),
@@ -843,7 +877,7 @@
843877
} <span class="kw">else</span> {
844878
<span class="bool-val">true</span>
845879
};
846-
<span class="kw">if</span> <span class="ident">response</span> {
880+
<span class="kw">if</span> <span class="ident">response</span> <span class="op">&amp;&amp;</span> <span class="ident">prompt_write_protected</span>(<span class="ident">path</span>, <span class="bool-val">false</span>, <span class="ident">options</span>) {
847881
<span class="kw">match</span> <span class="ident">fs::remove_file</span>(<span class="ident">path</span>) {
848882
<span class="prelude-val">Ok</span>(<span class="kw">_</span>) =&gt; {
849883
<span class="kw">if</span> <span class="ident">options</span>.<span class="ident">verbose</span> {
@@ -865,6 +899,34 @@
865899
<span class="bool-val">false</span>
866900
}
867901

902+
<span class="kw">fn</span> <span class="ident">prompt_write_protected</span>(<span class="ident">path</span>: <span class="kw-2">&amp;</span><span class="ident">Path</span>, <span class="ident">is_dir</span>: <span class="ident">bool</span>, <span class="ident">options</span>: <span class="kw-2">&amp;</span><span class="ident">Options</span>) -&gt; <span class="ident">bool</span> {
903+
<span class="kw">if</span> <span class="ident">options</span>.<span class="ident">interactive</span> <span class="op">==</span> <span class="ident">InteractiveMode::Never</span> {
904+
<span class="kw">return</span> <span class="bool-val">true</span>;
905+
}
906+
<span class="kw">match</span> <span class="ident">File::open</span>(<span class="ident">path</span>) {
907+
<span class="prelude-val">Ok</span>(<span class="kw">_</span>) =&gt; <span class="bool-val">true</span>,
908+
<span class="prelude-val">Err</span>(<span class="ident">err</span>) =&gt; {
909+
<span class="kw">if</span> <span class="ident">err</span>.<span class="ident">kind</span>() <span class="op">==</span> <span class="ident">ErrorKind::PermissionDenied</span> {
910+
<span class="kw">if</span> <span class="ident">is_dir</span> {
911+
<span class="ident">prompt</span>(<span class="kw-2">&amp;</span>(<span class="macro">format!</span>(<span class="string">&quot;rm: remove write-protected directory {}? &quot;</span>, <span class="ident">path</span>.<span class="ident">quote</span>())))
912+
} <span class="kw">else</span> {
913+
<span class="kw">if</span> <span class="ident">fs::metadata</span>(<span class="ident">path</span>).<span class="ident">unwrap</span>().<span class="ident">len</span>() <span class="op">==</span> <span class="number">0</span> {
914+
<span class="kw">return</span> <span class="ident">prompt</span>(
915+
<span class="kw-2">&amp;</span>(<span class="macro">format!</span>(
916+
<span class="string">&quot;rm: remove write-protected regular empty file {}? &quot;</span>,
917+
<span class="ident">path</span>.<span class="ident">quote</span>()
918+
)),
919+
);
920+
}
921+
<span class="ident">prompt</span>(<span class="kw-2">&amp;</span>(<span class="macro">format!</span>(<span class="string">&quot;rm: remove write-protected regular file {}? &quot;</span>, <span class="ident">path</span>.<span class="ident">quote</span>())))
922+
}
923+
} <span class="kw">else</span> {
924+
<span class="bool-val">true</span>
925+
}
926+
}
927+
}
928+
}
929+
868930
<span class="kw">fn</span> <span class="ident">prompt_file</span>(<span class="ident">path</span>: <span class="kw-2">&amp;</span><span class="ident">Path</span>, <span class="ident">is_dir</span>: <span class="ident">bool</span>) -&gt; <span class="ident">bool</span> {
869931
<span class="kw">if</span> <span class="ident">is_dir</span> {
870932
<span class="ident">prompt</span>(<span class="kw-2">&amp;</span>(<span class="macro">format!</span>(<span class="string">&quot;rm: remove directory {}? &quot;</span>, <span class="ident">path</span>.<span class="ident">quote</span>())))

‎dev/uu_rm/fn.uu_app.html

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,5 +5,5 @@
55
</a><div class="sidebar-elems"><h2 class="location"><a href="index.html">In uu_rm</a></h2></div></nav><main><div class="width-limiter"><div class="sub-container"><a class="sub-logo-container" href="../uu_rm/index.html"><img class="rust-logo" src="../rust-logo.svg" alt="logo"></a><nav class="sub"><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><div id="settings-menu" tabindex="-1">
66
<a href="../settings.html" title="settings"><img width="22" height="22" alt="Change settings" src="../wheel.svg"></a></div>
77
</div></form></nav></div><section id="main-content" class="content"><div class="main-heading">
8-
<h1 class="fqn"><span class="in-band">Function <a href="index.html">uu_rm</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_rm/rm.rs.html#142-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></div></main><div id="rustdoc-vars" data-root-path="../" data-current-crate="uu_rm" data-themes="ayu,dark,light" data-resource-suffix="" data-rustdoc-version="1.63.0 (4b91a6ea7 2022-08-08)" ></div>
8+
<h1 class="fqn"><span class="in-band">Function <a href="index.html">uu_rm</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_rm/rm.rs.html#145-235">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></div></main><div id="rustdoc-vars" data-root-path="../" data-current-crate="uu_rm" data-themes="ayu,dark,light" data-resource-suffix="" data-rustdoc-version="1.63.0 (4b91a6ea7 2022-08-08)" ></div>
99
</body></html>

0 commit comments

Comments
 (0)