Skip to content

Commit 890e1b5

Browse files
committed
deploy: c249eba
1 parent c7d59a0 commit 890e1b5

29 files changed

+163
-97
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="./vdir/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="./dir/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="./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">
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">
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="vdir" 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="dir" 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_false/false.rs.html

+23-11
Original file line numberDiff line numberDiff line change
@@ -70,14 +70,20 @@
7070
<span id="64">64</span>
7171
<span id="65">65</span>
7272
<span id="66">66</span>
73+
<span id="67">67</span>
74+
<span id="68">68</span>
75+
<span id="69">69</span>
76+
<span id="70">70</span>
77+
<span id="71">71</span>
78+
<span id="72">72</span>
7379
</pre><pre class="rust"><code><span class="comment">// * This file is part of the uutils coreutils package.</span>
7480
<span class="comment">// *</span>
7581
<span class="comment">// * (c) Jordi Boggiano &lt;j.boggiano@seld.be&gt;</span>
7682
<span class="comment">// *</span>
7783
<span class="comment">// * For the full copyright and license information, please view the LICENSE</span>
7884
<span class="comment">// * file that was distributed with this source code.</span>
79-
<span class="kw">use</span> <span class="ident">clap</span>::{<span class="ident">Arg</span>, <span class="ident">Command</span>};
80-
<span class="kw">use</span> <span class="ident">std::io::Write</span>;
85+
<span class="kw">use</span> <span class="ident">clap</span>::{<span class="ident">Arg</span>, <span class="ident">ArgAction</span>, <span class="ident">Command</span>};
86+
<span class="kw">use</span> <span class="ident">std</span>::{<span class="ident">ffi::OsString</span>, <span class="ident">io::Write</span>};
8187
<span class="kw">use</span> <span class="ident">uucore::error</span>::{<span class="ident">set_exit_code</span>, <span class="ident">UResult</span>};
8288

8389
<span class="kw">static</span> <span class="ident">ABOUT</span>: <span class="kw-2">&amp;</span><span class="ident">str</span> <span class="op">=</span> <span class="string">&quot;\
@@ -98,13 +104,18 @@
98104
<span class="comment">// and unwind through the standard library allocation handling machinery.</span>
99105
<span class="ident">set_exit_code</span>(<span class="number">1</span>);
100106

101-
<span class="kw">if</span> <span class="kw">let</span> <span class="prelude-val">Ok</span>(<span class="ident">matches</span>) <span class="op">=</span> <span class="ident">command</span>.<span class="ident">try_get_matches_from_mut</span>(<span class="ident">args</span>) {
102-
<span class="kw">let</span> <span class="ident">error</span> <span class="op">=</span> <span class="kw">if</span> <span class="ident">matches</span>.<span class="ident">index_of</span>(<span class="string">&quot;help&quot;</span>).<span class="ident">is_some</span>() {
103-
<span class="ident">command</span>.<span class="ident">print_help</span>()
104-
} <span class="kw">else</span> <span class="kw">if</span> <span class="ident">matches</span>.<span class="ident">index_of</span>(<span class="string">&quot;version&quot;</span>).<span class="ident">is_some</span>() {
105-
<span class="macro">writeln!</span>(<span class="ident">std::io::stdout</span>(), <span class="string">&quot;{}&quot;</span>, <span class="ident">command</span>.<span class="ident">render_version</span>())
106-
} <span class="kw">else</span> {
107-
<span class="prelude-val">Ok</span>(())
107+
<span class="kw">let</span> <span class="ident">args</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">args</span>.<span class="ident">collect</span>();
108+
<span class="kw">if</span> <span class="ident">args</span>.<span class="ident">len</span>() <span class="op">&gt;</span> <span class="number">2</span> {
109+
<span class="kw">return</span> <span class="prelude-val">Ok</span>(());
110+
}
111+
112+
<span class="kw">if</span> <span class="kw">let</span> <span class="prelude-val">Err</span>(<span class="ident">e</span>) <span class="op">=</span> <span class="ident">command</span>.<span class="ident">try_get_matches_from_mut</span>(<span class="ident">args</span>) {
113+
<span class="kw">let</span> <span class="ident">error</span> <span class="op">=</span> <span class="kw">match</span> <span class="ident">e</span>.<span class="ident">kind</span>() {
114+
<span class="ident">clap::ErrorKind::DisplayHelp</span> =&gt; <span class="ident">command</span>.<span class="ident">print_help</span>(),
115+
<span class="ident">clap::ErrorKind::DisplayVersion</span> =&gt; {
116+
<span class="macro">writeln!</span>(<span class="ident">std::io::stdout</span>(), <span class="string">&quot;{}&quot;</span>, <span class="ident">command</span>.<span class="ident">render_version</span>())
117+
}
118+
<span class="kw">_</span> =&gt; <span class="prelude-val">Ok</span>(()),
108119
};
109120

110121
<span class="comment">// Try to display this error.</span>
@@ -128,12 +139,13 @@
128139
<span class="ident">Arg::new</span>(<span class="string">&quot;help&quot;</span>)
129140
.<span class="ident">long</span>(<span class="string">&quot;help&quot;</span>)
130141
.<span class="ident">help</span>(<span class="string">&quot;Print help information&quot;</span>)
131-
.<span class="ident">exclusive</span>(<span class="bool-val">true</span>),
142+
.<span class="ident">action</span>(<span class="ident">ArgAction::Help</span>),
132143
)
133144
.<span class="ident">arg</span>(
134145
<span class="ident">Arg::new</span>(<span class="string">&quot;version&quot;</span>)
135146
.<span class="ident">long</span>(<span class="string">&quot;version&quot;</span>)
136-
.<span class="ident">help</span>(<span class="string">&quot;Print version information&quot;</span>),
147+
.<span class="ident">help</span>(<span class="string">&quot;Print version information&quot;</span>)
148+
.<span class="ident">action</span>(<span class="ident">ArgAction::Version</span>),
137149
)
138150
}
139151
</code></pre></div>

dev/src/uu_readlink/readlink.rs.html

+12-8
Original file line numberDiff line numberDiff line change
@@ -184,6 +184,8 @@
184184
<span id="178">178</span>
185185
<span id="179">179</span>
186186
<span id="180">180</span>
187+
<span id="181">181</span>
188+
<span id="182">182</span>
187189
</pre><pre class="rust"><code><span class="comment">// * This file is part of the uutils coreutils package.</span>
188190
<span class="comment">// *</span>
189191
<span class="comment">// * (c) Haitao Li &lt;lihaitao@gmail.com&gt;</span>
@@ -222,7 +224,7 @@
222224
<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> {
223225
<span class="kw">let</span> <span class="ident">matches</span> <span class="op">=</span> <span class="ident">uu_app</span>().<span class="ident">get_matches_from</span>(<span class="ident">args</span>);
224226

225-
<span class="kw">let</span> <span class="kw-2">mut</span> <span class="ident">no_newline</span> <span class="op">=</span> <span class="ident">matches</span>.<span class="ident">contains_id</span>(<span class="ident">OPT_NO_NEWLINE</span>);
227+
<span class="kw">let</span> <span class="kw-2">mut</span> <span class="ident">no_trailing_delimiter</span> <span class="op">=</span> <span class="ident">matches</span>.<span class="ident">contains_id</span>(<span class="ident">OPT_NO_NEWLINE</span>);
226228
<span class="kw">let</span> <span class="ident">use_zero</span> <span class="op">=</span> <span class="ident">matches</span>.<span class="ident">contains_id</span>(<span class="ident">OPT_ZERO</span>);
227229
<span class="kw">let</span> <span class="ident">silent</span> <span class="op">=</span> <span class="ident">matches</span>.<span class="ident">contains_id</span>(<span class="ident">OPT_SILENT</span>) <span class="op">|</span><span class="op">|</span> <span class="ident">matches</span>.<span class="ident">contains_id</span>(<span class="ident">OPT_QUIET</span>);
228230
<span class="kw">let</span> <span class="ident">verbose</span> <span class="op">=</span> <span class="ident">matches</span>.<span class="ident">contains_id</span>(<span class="ident">OPT_VERBOSE</span>);
@@ -252,9 +254,9 @@
252254
<span class="kw">return</span> <span class="prelude-val">Err</span>(<span class="ident">UUsageError::new</span>(<span class="number">1</span>, <span class="string">&quot;missing operand&quot;</span>));
253255
}
254256

255-
<span class="kw">if</span> <span class="ident">no_newline</span> <span class="op">&amp;&amp;</span> <span class="ident">files</span>.<span class="ident">len</span>() <span class="op">&gt;</span> <span class="number">1</span> <span class="op">&amp;&amp;</span> <span class="op">!</span><span class="ident">silent</span> {
257+
<span class="kw">if</span> <span class="ident">no_trailing_delimiter</span> <span class="op">&amp;&amp;</span> <span class="ident">files</span>.<span class="ident">len</span>() <span class="op">&gt;</span> <span class="number">1</span> <span class="op">&amp;&amp;</span> <span class="op">!</span><span class="ident">silent</span> {
256258
<span class="macro">show_error!</span>(<span class="string">&quot;ignoring --no-newline with multiple arguments&quot;</span>);
257-
<span class="ident">no_newline</span> <span class="op">=</span> <span class="bool-val">false</span>;
259+
<span class="ident">no_trailing_delimiter</span> <span class="op">=</span> <span class="bool-val">false</span>;
258260
}
259261

260262
<span class="kw">for</span> <span class="ident">f</span> <span class="kw">in</span> <span class="kw-2">&amp;</span><span class="ident">files</span> {
@@ -265,7 +267,9 @@
265267
<span class="ident">canonicalize</span>(<span class="kw-2">&amp;</span><span class="ident">p</span>, <span class="ident">can_mode</span>, <span class="ident">res_mode</span>)
266268
};
267269
<span class="kw">match</span> <span class="ident">path_result</span> {
268-
<span class="prelude-val">Ok</span>(<span class="ident">path</span>) =&gt; <span class="ident">show</span>(<span class="kw-2">&amp;</span><span class="ident">path</span>, <span class="ident">no_newline</span>, <span class="ident">use_zero</span>).<span class="ident">map_err_context</span>(<span class="ident">String::new</span>)<span class="question-mark">?</span>,
270+
<span class="prelude-val">Ok</span>(<span class="ident">path</span>) =&gt; {
271+
<span class="ident">show</span>(<span class="kw-2">&amp;</span><span class="ident">path</span>, <span class="ident">no_trailing_delimiter</span>, <span class="ident">use_zero</span>).<span class="ident">map_err_context</span>(<span class="ident">String::new</span>)<span class="question-mark">?</span>;
272+
}
269273
<span class="prelude-val">Err</span>(<span class="ident">err</span>) =&gt; {
270274
<span class="kw">if</span> <span class="ident">verbose</span> {
271275
<span class="kw">return</span> <span class="prelude-val">Err</span>(<span class="ident">USimpleError::new</span>(
@@ -353,12 +357,12 @@
353357
)
354358
}
355359

356-
<span class="kw">fn</span> <span class="ident">show</span>(<span class="ident">path</span>: <span class="kw-2">&amp;</span><span class="ident">Path</span>, <span class="ident">no_newline</span>: <span class="ident">bool</span>, <span class="ident">use_zero</span>: <span class="ident">bool</span>) -&gt; <span class="ident">std::io::Result</span><span class="op">&lt;</span>()<span class="op">&gt;</span> {
360+
<span class="kw">fn</span> <span class="ident">show</span>(<span class="ident">path</span>: <span class="kw-2">&amp;</span><span class="ident">Path</span>, <span class="ident">no_trailing_delimiter</span>: <span class="ident">bool</span>, <span class="ident">use_zero</span>: <span class="ident">bool</span>) -&gt; <span class="ident">std::io::Result</span><span class="op">&lt;</span>()<span class="op">&gt;</span> {
357361
<span class="kw">let</span> <span class="ident">path</span> <span class="op">=</span> <span class="ident">path</span>.<span class="ident">to_str</span>().<span class="ident">unwrap</span>();
358-
<span class="kw">if</span> <span class="ident">use_zero</span> {
359-
<span class="macro">print!</span>(<span class="string">&quot;{}\0&quot;</span>, <span class="ident">path</span>);
360-
} <span class="kw">else</span> <span class="kw">if</span> <span class="ident">no_newline</span> {
362+
<span class="kw">if</span> <span class="ident">no_trailing_delimiter</span> {
361363
<span class="macro">print!</span>(<span class="string">&quot;{}&quot;</span>, <span class="ident">path</span>);
364+
} <span class="kw">else</span> <span class="kw">if</span> <span class="ident">use_zero</span> {
365+
<span class="macro">print!</span>(<span class="string">&quot;{}\0&quot;</span>, <span class="ident">path</span>);
362366
} <span class="kw">else</span> {
363367
<span class="macro">println!</span>(<span class="string">&quot;{}&quot;</span>, <span class="ident">path</span>);
364368
}

0 commit comments

Comments
 (0)