Skip to content

Commit 3d113c5

Browse files
committed
deploy: 315305e
1 parent 59f0b0f commit 3d113c5

13 files changed

+83
-69
lines changed

dev/settings.html

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
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="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>
2-
<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>
2+
<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="./base64/index.html"><div class="logo-container"><img class="rust-logo" src="./rust-logo.svg" alt="logo"></div>
33
</a><h2 class="location"></h2>
44
</nav>
5-
<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>
6-
</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"><div class="main-heading">
5+
<nav class="sidebar"><a class="sidebar-logo" href="./base64/index.html"><div class="logo-container"><img class="rust-logo" src="./rust-logo.svg" alt="logo"></div>
6+
</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="./base64/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">
77
<h1 class="fqn"><span class="in-band">Rustdoc settings</span></h1><span class="out-of-band"><a id="back" href="javascript:void(0)">Back</a></span></div><div class="settings"><div class="setting-line"><label class="toggle"><input type="checkbox" id="use-system-theme" checked><span class="slider"></span></label><div>Use system theme</div></div><div class="setting-line"><div class="radio-line" id="theme"><span class="setting-name">Theme</span><div class="choices"><label for="theme-light" class="choice">
88
<input type="radio" name="theme" id="theme-light" value="light" checked>light</label><label for="theme-dark" class="choice">
99
<input type="radio" name="theme" id="theme-dark" value="dark" >dark</label><label for="theme-ayu" class="choice">
@@ -13,5 +13,5 @@ <h1 class="fqn"><span class="in-band">Rustdoc settings</span></h1><span class="o
1313
<input type="radio" name="preferred-light-theme" id="preferred-light-theme-ayu" value="ayu" >ayu</label></div></div></div><div class="setting-line"><div class="radio-line" id="preferred-dark-theme"><span class="setting-name">Preferred dark theme</span><div class="choices"><label for="preferred-dark-theme-light" class="choice">
1414
<input type="radio" name="preferred-dark-theme" id="preferred-dark-theme-light" value="light" >light</label><label for="preferred-dark-theme-dark" class="choice">
1515
<input type="radio" name="preferred-dark-theme" id="preferred-dark-theme-dark" value="dark" checked>dark</label><label for="preferred-dark-theme-ayu" class="choice">
16-
<input type="radio" name="preferred-dark-theme" id="preferred-dark-theme-ayu" value="ayu" >ayu</label></div></div></div><div class="setting-line"><label class="toggle"><input type="checkbox" id="auto-hide-large-items" checked><span class="slider"></span></label><div>Auto-hide item contents for large items.</div></div><div class="setting-line"><label class="toggle"><input type="checkbox" id="auto-hide-method-docs" ><span class="slider"></span></label><div>Auto-hide item methods' documentation</div></div><div class="setting-line"><label class="toggle"><input type="checkbox" id="auto-hide-trait-implementations" ><span class="slider"></span></label><div>Auto-hide trait implementation documentation</div></div><div class="setting-line"><label class="toggle"><input type="checkbox" id="go-to-only-result" ><span class="slider"></span></label><div>Directly go to item in search if there is only one result</div></div><div class="setting-line"><label class="toggle"><input type="checkbox" id="line-numbers" ><span class="slider"></span></label><div>Show line numbers on code examples</div></div><div class="setting-line"><label class="toggle"><input type="checkbox" id="disable-shortcuts" ><span class="slider"></span></label><div>Disable keyboard shortcuts</div></div></div><link rel="stylesheet" href="./settings.css"><script src="./settings.js"></script></section><section id="search" class="content hidden"></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.60.0 (7737e0b5c 2022-04-04)" ></div>
16+
<input type="radio" name="preferred-dark-theme" id="preferred-dark-theme-ayu" value="ayu" >ayu</label></div></div></div><div class="setting-line"><label class="toggle"><input type="checkbox" id="auto-hide-large-items" checked><span class="slider"></span></label><div>Auto-hide item contents for large items.</div></div><div class="setting-line"><label class="toggle"><input type="checkbox" id="auto-hide-method-docs" ><span class="slider"></span></label><div>Auto-hide item methods' documentation</div></div><div class="setting-line"><label class="toggle"><input type="checkbox" id="auto-hide-trait-implementations" ><span class="slider"></span></label><div>Auto-hide trait implementation documentation</div></div><div class="setting-line"><label class="toggle"><input type="checkbox" id="go-to-only-result" ><span class="slider"></span></label><div>Directly go to item in search if there is only one result</div></div><div class="setting-line"><label class="toggle"><input type="checkbox" id="line-numbers" ><span class="slider"></span></label><div>Show line numbers on code examples</div></div><div class="setting-line"><label class="toggle"><input type="checkbox" id="disable-shortcuts" ><span class="slider"></span></label><div>Disable keyboard shortcuts</div></div></div><link rel="stylesheet" href="./settings.css"><script src="./settings.js"></script></section><section id="search" class="content hidden"></section></div></main><div id="rustdoc-vars" data-root-path="./" data-current-crate="base64" data-themes="ayu,dark,light" data-resource-suffix="" data-rustdoc-version="1.60.0 (7737e0b5c 2022-04-04)" ></div>
1717
</body></html>

dev/src/uu_df/df.rs.html

Lines changed: 2 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -778,10 +778,6 @@
778778
<span id="773">773</span>
779779
<span id="774">774</span>
780780
<span id="775">775</span>
781-
<span id="776">776</span>
782-
<span id="777">777</span>
783-
<span id="778">778</span>
784-
<span id="779">779</span>
785781
</pre><pre class="rust"><code><span class="comment">// This file is part of the uutils coreutils package.</span>
786782
<span class="comment">//</span>
787783
<span class="comment">// (c) Fangxu Hu &lt;framlog@gmail.com&gt;</span>
@@ -845,7 +841,6 @@
845841
<span class="kw">struct</span> <span class="ident">Options</span> {
846842
<span class="ident">show_local_fs</span>: <span class="ident">bool</span>,
847843
<span class="ident">show_all_fs</span>: <span class="ident">bool</span>,
848-
<span class="ident">show_listed_fs</span>: <span class="ident">bool</span>,
849844
<span class="ident">block_size</span>: <span class="ident">BlockSize</span>,
850845

851846
<span class="doccomment">/// Optional list of filesystem types to include in the output table.</span>
@@ -872,7 +867,6 @@
872867
<span class="self">Self</span> {
873868
<span class="ident">show_local_fs</span>: <span class="ident">Default::default</span>(),
874869
<span class="ident">show_all_fs</span>: <span class="ident">Default::default</span>(),
875-
<span class="ident">show_listed_fs</span>: <span class="ident">Default::default</span>(),
876870
<span class="ident">block_size</span>: <span class="ident">Default::default</span>(),
877871
<span class="ident">include</span>: <span class="ident">Default::default</span>(),
878872
<span class="ident">exclude</span>: <span class="ident">Default::default</span>(),
@@ -941,7 +935,6 @@
941935
<span class="prelude-val">Ok</span>(<span class="self">Self</span> {
942936
<span class="ident">show_local_fs</span>: <span class="ident">matches</span>.<span class="ident">is_present</span>(<span class="ident">OPT_LOCAL</span>),
943937
<span class="ident">show_all_fs</span>: <span class="ident">matches</span>.<span class="ident">is_present</span>(<span class="ident">OPT_ALL</span>),
944-
<span class="ident">show_listed_fs</span>: <span class="bool-val">false</span>,
945938
<span class="ident">block_size</span>: <span class="ident">block_size_from_matches</span>(<span class="ident">matches</span>)
946939
.<span class="ident">map_err</span>(<span class="op">|</span><span class="kw">_</span><span class="op">|</span> <span class="ident">OptionsError::InvalidBlockSize</span>)<span class="question-mark">?</span>,
947940
<span class="ident">include</span>,
@@ -972,7 +965,7 @@
972965
}
973966

974967
<span class="comment">// Don&#39;t show pseudo filesystems unless `--all` has been given.</span>
975-
<span class="kw">if</span> <span class="ident">mi</span>.<span class="ident">dummy</span> <span class="op">&amp;&amp;</span> <span class="op">!</span><span class="ident">opt</span>.<span class="ident">show_all_fs</span> <span class="op">&amp;&amp;</span> <span class="op">!</span><span class="ident">opt</span>.<span class="ident">show_listed_fs</span> {
968+
<span class="kw">if</span> <span class="ident">mi</span>.<span class="ident">dummy</span> <span class="op">&amp;&amp;</span> <span class="op">!</span><span class="ident">opt</span>.<span class="ident">show_all_fs</span> {
976969
<span class="kw">return</span> <span class="bool-val">false</span>;
977970
}
978971

@@ -1178,7 +1171,7 @@
11781171
<span class="comment">// If the filesystem is not empty, or if the options require</span>
11791172
<span class="comment">// showing all filesystems, then print the data as a row in</span>
11801173
<span class="comment">// the output table.</span>
1181-
<span class="kw">if</span> <span class="ident">opt</span>.<span class="ident">show_all_fs</span> <span class="op">|</span><span class="op">|</span> <span class="ident">opt</span>.<span class="ident">show_listed_fs</span> <span class="op">|</span><span class="op">|</span> <span class="ident">filesystem</span>.<span class="ident">usage</span>.<span class="ident">blocks</span> <span class="op">&gt;</span> <span class="number">0</span> {
1174+
<span class="kw">if</span> <span class="ident">opt</span>.<span class="ident">show_all_fs</span> <span class="op">|</span><span class="op">|</span> <span class="ident">filesystem</span>.<span class="ident">usage</span>.<span class="ident">blocks</span> <span class="op">&gt;</span> <span class="number">0</span> {
11821175
<span class="kw">let</span> <span class="ident">row</span> <span class="op">=</span> <span class="ident">Row::from</span>(<span class="ident">filesystem</span>);
11831176
<span class="macro">println!</span>(<span class="string">&quot;{}&quot;</span>, <span class="ident">DisplayRow::new</span>(<span class="kw-2">&amp;</span><span class="ident">row</span>, <span class="kw-2">&amp;</span><span class="ident">opt</span>));
11841177
<span class="ident">total</span> <span class="op">+</span><span class="op">=</span> <span class="ident">row</span>;
@@ -1451,7 +1444,6 @@
14511444
<span class="kw">fn</span> <span class="ident">test_dummy_included</span>() {
14521445
<span class="kw">let</span> <span class="ident">opt</span> <span class="op">=</span> <span class="ident">Options</span> {
14531446
<span class="ident">show_all_fs</span>: <span class="bool-val">true</span>,
1454-
<span class="ident">show_listed_fs</span>: <span class="bool-val">true</span>,
14551447
..<span class="ident">Default::default</span>()
14561448
};
14571449
<span class="kw">let</span> <span class="ident">m</span> <span class="op">=</span> <span class="ident">mount_info</span>(<span class="string">&quot;ext4&quot;</span>, <span class="string">&quot;/mnt/foo&quot;</span>, <span class="bool-val">false</span>, <span class="bool-val">true</span>);

dev/src/uu_uniq/uniq.rs.html

Lines changed: 17 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -429,6 +429,14 @@
429429
<span id="424">424</span>
430430
<span id="425">425</span>
431431
<span id="426">426</span>
432+
<span id="427">427</span>
433+
<span id="428">428</span>
434+
<span id="429">429</span>
435+
<span id="430">430</span>
436+
<span id="431">431</span>
437+
<span id="432">432</span>
438+
<span id="433">433</span>
439+
<span id="434">434</span>
432440
</pre><pre class="rust"><code><span class="comment">// * This file is part of the uutils coreutils package.</span>
433441
<span class="comment">// *</span>
434442
<span class="comment">// * (c) Chirag B Jadwani &lt;chirag.jadwani@gmail.com&gt;</span>
@@ -443,7 +451,7 @@
443451
<span class="kw">use</span> <span class="ident">std::str::FromStr</span>;
444452
<span class="kw">use</span> <span class="ident">strum_macros</span>::{<span class="ident">AsRefStr</span>, <span class="ident">EnumString</span>};
445453
<span class="kw">use</span> <span class="ident">uucore::display::Quotable</span>;
446-
<span class="kw">use</span> <span class="ident">uucore::error</span>::{<span class="ident">FromIo</span>, <span class="ident">UResult</span>, <span class="ident">USimpleError</span>};
454+
<span class="kw">use</span> <span class="ident">uucore::error</span>::{<span class="ident">FromIo</span>, <span class="ident">UResult</span>, <span class="ident">USimpleError</span>, <span class="ident">UUsageError</span>};
447455
<span class="kw">use</span> <span class="ident">uucore::format_usage</span>;
448456

449457
<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;Report or omit repeated lines.&quot;</span>;
@@ -715,6 +723,14 @@
715723
<span class="ident">ignore_case</span>: <span class="ident">matches</span>.<span class="ident">is_present</span>(<span class="ident">options::IGNORE_CASE</span>),
716724
<span class="ident">zero_terminated</span>: <span class="ident">matches</span>.<span class="ident">is_present</span>(<span class="ident">options::ZERO_TERMINATED</span>),
717725
};
726+
727+
<span class="kw">if</span> <span class="ident">uniq</span>.<span class="ident">show_counts</span> <span class="op">&amp;&amp;</span> <span class="ident">uniq</span>.<span class="ident">all_repeated</span> {
728+
<span class="kw">return</span> <span class="prelude-val">Err</span>(<span class="ident">UUsageError::new</span>(
729+
<span class="number">1</span>,
730+
<span class="string">&quot;printing all duplicated lines and repeat counts is meaningless&quot;</span>,
731+
));
732+
}
733+
718734
<span class="ident">uniq</span>.<span class="ident">print_uniq</span>(
719735
<span class="kw-2">&amp;mut</span> <span class="ident">open_input_file</span>(<span class="kw-2">&amp;</span><span class="ident">in_file_name</span>)<span class="question-mark">?</span>,
720736
<span class="kw-2">&amp;mut</span> <span class="ident">open_output_file</span>(<span class="kw-2">&amp;</span><span class="ident">out_file_name</span>)<span class="question-mark">?</span>,

0 commit comments

Comments
 (0)