Skip to content

Commit d28e25e

Browse files
sylvestresylvestre
committed
deploy: c249eba 
1 parent 27c614d commit d28e25e

File tree

8 files changed

+72
-50
lines changed

8 files changed

+72
-50
lines changed

‎dev/settings.html

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
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="./vdir/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"><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.62.1 (e092d0b6b 2022-07-16)" ></div>
5+
<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>
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="./vdir/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"><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.62.1 (e092d0b6b 2022-07-16)" ></div>
77
</body></html>

‎dev/src/uu_basenc/basenc.rs.html

+10-4
Original file line numberDiff line numberDiff line change
@@ -83,6 +83,9 @@
8383
<span id="78">78</span>
8484
<span id="79">79</span>
8585
<span id="80">80</span>
86+
<span id="81">81</span>
87+
<span id="82">82</span>
88+
<span id="83">83</span>
8689
</pre><pre class="rust"><code><span class="comment">// This file is part of the uutils coreutils package.</span>
8790
<span class="comment">//</span>
8891
<span class="comment">// (c) Jordy Dickinson &lt;jordy.dickinson@gmail.com&gt;</span>
@@ -103,6 +106,7 @@
103106
};
104107

105108
<span class="kw">use</span> <span class="ident">std::io</span>::{<span class="ident">stdin</span>, <span class="ident">Read</span>};
109+
<span class="kw">use</span> <span class="ident">uucore::error::UClapError</span>;
106110

107111
<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;\
108112
With no FILE, or when FILE is -, read standard input.
@@ -134,10 +138,12 @@
134138
}
135139

136140
<span class="kw">fn</span> <span class="ident">parse_cmd_args</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="ident">Config</span>, <span class="ident">Format</span>)<span class="op">&gt;</span> {
137-
<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>(
138-
<span class="ident">args</span>.<span class="ident">collect_str</span>(<span class="ident">InvalidEncodingHandling::ConvertLossy</span>)
139-
.<span class="ident">accept_any</span>(),
140-
);
141+
<span class="kw">let</span> <span class="ident">matches</span> <span class="op">=</span> <span class="ident">uu_app</span>()
142+
.<span class="ident">try_get_matches_from</span>(
143+
<span class="ident">args</span>.<span class="ident">collect_str</span>(<span class="ident">InvalidEncodingHandling::ConvertLossy</span>)
144+
.<span class="ident">accept_any</span>(),
145+
)
146+
.<span class="ident">with_exit_code</span>(<span class="number">1</span>)<span class="question-mark">?</span>;
141147
<span class="kw">let</span> <span class="ident">format</span> <span class="op">=</span> <span class="ident">ENCODINGS</span>
142148
.<span class="ident">iter</span>()
143149
.<span class="ident">find</span>(<span class="op">|</span><span class="ident">encoding</span><span class="op">|</span> <span class="ident">matches</span>.<span class="ident">is_present</span>(<span class="ident">encoding</span>.<span class="number">0</span>))

‎dev/src/uu_wc/count_fast.rs.html

+22-28
Original file line numberDiff line numberDiff line change
@@ -166,9 +166,6 @@
166166
<span id="161">161</span>
167167
<span id="162">162</span>
168168
<span id="163">163</span>
169-
<span id="164">164</span>
170-
<span id="165">165</span>
171-
<span id="166">166</span>
172169
</pre><pre class="rust"><code><span class="kw">use</span> <span class="ident"><span class="kw">crate</span>::word_count::WordCount</span>;
173170

174171
<span class="kw">use</span> <span class="ident"><span class="kw">super</span>::WordCountable</span>;
@@ -288,32 +285,21 @@
288285
}
289286
}
290287

291-
<span class="kw">pub</span>(<span class="kw">crate</span>) <span class="kw">fn</span> <span class="ident">count_bytes_and_lines_fast</span><span class="op">&lt;</span><span class="ident">R</span>: <span class="ident">Read</span><span class="op">&gt;</span>(
292-
<span class="ident">handle</span>: <span class="kw-2">&amp;mut</span> <span class="ident">R</span>,
293-
) -&gt; (<span class="ident">WordCount</span>, <span class="prelude-ty">Option</span><span class="op">&lt;</span><span class="ident">io::Error</span><span class="op">&gt;</span>) {
294-
<span class="kw">let</span> <span class="kw-2">mut</span> <span class="ident">total</span> <span class="op">=</span> <span class="ident">WordCount::default</span>();
295-
<span class="kw">let</span> <span class="kw-2">mut</span> <span class="ident">buf</span> <span class="op">=</span> [<span class="number">0</span>; <span class="ident">BUF_SIZE</span>];
296-
<span class="kw">loop</span> {
297-
<span class="kw">match</span> <span class="ident">handle</span>.<span class="ident">read</span>(<span class="kw-2">&amp;mut</span> <span class="ident">buf</span>) {
298-
<span class="prelude-val">Ok</span>(<span class="number">0</span>) =&gt; <span class="kw">return</span> (<span class="ident">total</span>, <span class="prelude-val">None</span>),
299-
<span class="prelude-val">Ok</span>(<span class="ident">n</span>) =&gt; {
300-
<span class="ident">total</span>.<span class="ident">bytes</span> <span class="op">+</span><span class="op">=</span> <span class="ident">n</span>;
301-
<span class="ident">total</span>.<span class="ident">lines</span> <span class="op">+</span><span class="op">=</span> <span class="ident">bytecount::count</span>(<span class="kw-2">&amp;</span><span class="ident">buf</span>[..<span class="ident">n</span>], <span class="string">b&#39;\n&#39;</span>);
302-
}
303-
<span class="prelude-val">Err</span>(<span class="kw-2">ref</span> <span class="ident">e</span>) <span class="kw">if</span> <span class="ident">e</span>.<span class="ident">kind</span>() <span class="op">==</span> <span class="ident">ErrorKind::Interrupted</span> =&gt; <span class="kw">continue</span>,
304-
<span class="prelude-val">Err</span>(<span class="ident">e</span>) =&gt; <span class="kw">return</span> (<span class="ident">total</span>, <span class="prelude-val">Some</span>(<span class="ident">e</span>)),
305-
}
306-
}
307-
}
308-
309-
<span class="doccomment">/// Returns a WordCount that counts the number of Unicode characters encoded in UTF-8 read via a Reader.</span>
288+
<span class="doccomment">/// Returns a WordCount that counts the number of bytes, lines, and/or the number of Unicode characters encoded in UTF-8 read via a Reader.</span>
310289
<span class="doccomment">///</span>
311-
<span class="doccomment">/// This corresponds to the `-m` command line flag to wc.</span>
290+
<span class="doccomment">/// This corresponds to the `-c`, `-l` and `-m` command line flags to wc.</span>
312291
<span class="doccomment">///</span>
313292
<span class="doccomment">/// # Arguments</span>
314293
<span class="doccomment">///</span>
315294
<span class="doccomment">/// * `R` - A Reader from which the UTF-8 stream will be read.</span>
316-
<span class="kw">pub</span>(<span class="kw">crate</span>) <span class="kw">fn</span> <span class="ident">count_chars_fast</span><span class="op">&lt;</span><span class="ident">R</span>: <span class="ident">Read</span><span class="op">&gt;</span>(<span class="ident">handle</span>: <span class="kw-2">&amp;mut</span> <span class="ident">R</span>) -&gt; (<span class="ident">WordCount</span>, <span class="prelude-ty">Option</span><span class="op">&lt;</span><span class="ident">io::Error</span><span class="op">&gt;</span>) {
295+
<span class="kw">pub</span>(<span class="kw">crate</span>) <span class="kw">fn</span> <span class="ident">count_bytes_chars_and_lines_fast</span><span class="op">&lt;</span>
296+
<span class="ident">R</span>: <span class="ident">Read</span>,
297+
<span class="kw">const</span> <span class="ident">COUNT_BYTES</span>: <span class="ident">bool</span>,
298+
<span class="kw">const</span> <span class="ident">COUNT_CHARS</span>: <span class="ident">bool</span>,
299+
<span class="kw">const</span> <span class="ident">COUNT_LINES</span>: <span class="ident">bool</span>,
300+
<span class="op">&gt;</span>(
301+
<span class="ident">handle</span>: <span class="kw-2">&amp;mut</span> <span class="ident">R</span>,
302+
) -&gt; (<span class="ident">WordCount</span>, <span class="prelude-ty">Option</span><span class="op">&lt;</span><span class="ident">io::Error</span><span class="op">&gt;</span>) {
317303
<span class="doccomment">/// Mask of the value bits of a continuation byte</span>
318304
<span class="kw">const</span> <span class="ident">CONT_MASK</span>: <span class="ident">u8</span> <span class="op">=</span> <span class="number">0b0011_1111u8</span>;
319305
<span class="doccomment">/// Value of the tag bits (tag mask is !CONT_MASK) of a continuation byte</span>
@@ -325,10 +311,18 @@
325311
<span class="kw">match</span> <span class="ident">handle</span>.<span class="ident">read</span>(<span class="kw-2">&amp;mut</span> <span class="ident">buf</span>) {
326312
<span class="prelude-val">Ok</span>(<span class="number">0</span>) =&gt; <span class="kw">return</span> (<span class="ident">total</span>, <span class="prelude-val">None</span>),
327313
<span class="prelude-val">Ok</span>(<span class="ident">n</span>) =&gt; {
328-
<span class="ident">total</span>.<span class="ident">chars</span> <span class="op">+</span><span class="op">=</span> <span class="ident">buf</span>[..<span class="ident">n</span>]
329-
.<span class="ident">iter</span>()
330-
.<span class="ident">filter</span>(<span class="op">|</span><span class="op">&amp;&amp;</span><span class="ident">byte</span><span class="op">|</span> (<span class="ident">byte</span> <span class="op">&amp;</span> <span class="op">!</span><span class="ident">CONT_MASK</span>) <span class="op">!</span><span class="op">=</span> <span class="ident">TAG_CONT_U8</span>)
331-
.<span class="ident">count</span>();
314+
<span class="kw">if</span> <span class="ident">COUNT_BYTES</span> {
315+
<span class="ident">total</span>.<span class="ident">bytes</span> <span class="op">+</span><span class="op">=</span> <span class="ident">n</span>;
316+
}
317+
<span class="kw">if</span> <span class="ident">COUNT_CHARS</span> {
318+
<span class="ident">total</span>.<span class="ident">chars</span> <span class="op">+</span><span class="op">=</span> <span class="ident">buf</span>[..<span class="ident">n</span>]
319+
.<span class="ident">iter</span>()
320+
.<span class="ident">filter</span>(<span class="op">|</span><span class="op">&amp;&amp;</span><span class="ident">byte</span><span class="op">|</span> (<span class="ident">byte</span> <span class="op">&amp;</span> <span class="op">!</span><span class="ident">CONT_MASK</span>) <span class="op">!</span><span class="op">=</span> <span class="ident">TAG_CONT_U8</span>)
321+
.<span class="ident">count</span>();
322+
}
323+
<span class="kw">if</span> <span class="ident">COUNT_LINES</span> {
324+
<span class="ident">total</span>.<span class="ident">lines</span> <span class="op">+</span><span class="op">=</span> <span class="ident">bytecount::count</span>(<span class="kw-2">&amp;</span><span class="ident">buf</span>[..<span class="ident">n</span>], <span class="string">b&#39;\n&#39;</span>);
325+
}
332326
}
333327
<span class="prelude-val">Err</span>(<span class="kw-2">ref</span> <span class="ident">e</span>) <span class="kw">if</span> <span class="ident">e</span>.<span class="ident">kind</span>() <span class="op">==</span> <span class="ident">ErrorKind::Interrupted</span> =&gt; <span class="kw">continue</span>,
334328
<span class="prelude-val">Err</span>(<span class="ident">e</span>) =&gt; <span class="kw">return</span> (<span class="ident">total</span>, <span class="prelude-val">Some</span>(<span class="ident">e</span>)),

0 commit comments

Comments
 (0)