Skip to content

Commit a65e20e

Browse files
sylvestresylvestre
committed
deploy: c249eba 
1 parent 1861ca0 commit a65e20e

14 files changed

+169
-52
lines changed

‎dev/search-index.js

+1-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎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_split/platform/mod.rs.html

+8
Original file line numberDiff line numberDiff line change
@@ -14,11 +14,19 @@
1414
<span id="9">9</span>
1515
<span id="10">10</span>
1616
<span id="11">11</span>
17+
<span id="12">12</span>
18+
<span id="13">13</span>
19+
<span id="14">14</span>
20+
<span id="15">15</span>
1721
</pre><pre class="rust"><code><span class="attribute">#[<span class="ident">cfg</span>(<span class="ident">unix</span>)]</span>
1822
<span class="kw">pub</span> <span class="kw">use</span> <span class="ident"><span class="self">self</span>::unix::instantiate_current_writer</span>;
23+
<span class="attribute">#[<span class="ident">cfg</span>(<span class="ident">unix</span>)]</span>
24+
<span class="kw">pub</span> <span class="kw">use</span> <span class="ident"><span class="self">self</span>::unix::paths_refer_to_same_file</span>;
1925

2026
<span class="attribute">#[<span class="ident">cfg</span>(<span class="ident">windows</span>)]</span>
2127
<span class="kw">pub</span> <span class="kw">use</span> <span class="ident"><span class="self">self</span>::windows::instantiate_current_writer</span>;
28+
<span class="attribute">#[<span class="ident">cfg</span>(<span class="ident">windows</span>)]</span>
29+
<span class="kw">pub</span> <span class="kw">use</span> <span class="ident"><span class="self">self</span>::windows::paths_refer_to_same_file</span>;
2230

2331
<span class="attribute">#[<span class="ident">cfg</span>(<span class="ident">unix</span>)]</span>
2432
<span class="kw">mod</span> <span class="ident">unix</span>;

‎dev/src/uu_split/platform/unix.rs.html

+48-12
Original file line numberDiff line numberDiff line change
@@ -128,11 +128,32 @@
128128
<span id="123">123</span>
129129
<span id="124">124</span>
130130
<span id="125">125</span>
131+
<span id="126">126</span>
132+
<span id="127">127</span>
133+
<span id="128">128</span>
134+
<span id="129">129</span>
135+
<span id="130">130</span>
136+
<span id="131">131</span>
137+
<span id="132">132</span>
138+
<span id="133">133</span>
139+
<span id="134">134</span>
140+
<span id="135">135</span>
141+
<span id="136">136</span>
142+
<span id="137">137</span>
143+
<span id="138">138</span>
144+
<span id="139">139</span>
145+
<span id="140">140</span>
146+
<span id="141">141</span>
147+
<span id="142">142</span>
148+
<span id="143">143</span>
131149
</pre><pre class="rust"><code><span class="kw">use</span> <span class="ident">std::env</span>;
132150
<span class="kw">use</span> <span class="ident">std::io::Write</span>;
133-
<span class="kw">use</span> <span class="ident">std::io</span>::{<span class="ident">BufWriter</span>, <span class="prelude-ty">Result</span>};
151+
<span class="kw">use</span> <span class="ident">std::io</span>::{<span class="ident">BufWriter</span>, <span class="ident">Error</span>, <span class="ident">ErrorKind</span>, <span class="prelude-ty">Result</span>};
152+
<span class="kw">use</span> <span class="ident">std::path::Path</span>;
134153
<span class="kw">use</span> <span class="ident">std::process</span>::{<span class="ident">Child</span>, <span class="ident">Command</span>, <span class="ident">Stdio</span>};
135154
<span class="kw">use</span> <span class="ident">uucore::crash</span>;
155+
<span class="kw">use</span> <span class="ident">uucore::fs</span>;
156+
<span class="kw">use</span> <span class="ident">uucore::fs::FileInformation</span>;
136157

137158
<span class="doccomment">/// A writer that writes to a shell_process&#39; stdin</span>
138159
<span class="doccomment">///</span>
@@ -196,7 +217,7 @@
196217
<span class="doccomment">///</span>
197218
<span class="doccomment">/// * `command` - The shell command to execute</span>
198219
<span class="doccomment">/// * `filepath` - Path of the output file (forwarded to command as $FILE)</span>
199-
<span class="kw">fn</span> <span class="ident">new</span>(<span class="ident">command</span>: <span class="kw-2">&amp;</span><span class="ident">str</span>, <span class="ident">filepath</span>: <span class="kw-2">&amp;</span><span class="ident">str</span>) -&gt; <span class="self">Self</span> {
220+
<span class="kw">fn</span> <span class="ident">new</span>(<span class="ident">command</span>: <span class="kw-2">&amp;</span><span class="ident">str</span>, <span class="ident">filepath</span>: <span class="kw-2">&amp;</span><span class="ident">str</span>) -&gt; <span class="prelude-ty">Result</span><span class="op">&lt;</span><span class="self">Self</span><span class="op">&gt;</span> {
200221
<span class="comment">// set $FILE, save previous value (if there was one)</span>
201222
<span class="kw">let</span> <span class="ident">_with_env_var_set</span> <span class="op">=</span> <span class="ident">WithEnvVarSet::new</span>(<span class="string">&quot;FILE&quot;</span>, <span class="ident">filepath</span>);
202223

@@ -205,10 +226,9 @@
205226
.<span class="ident">arg</span>(<span class="string">&quot;-c&quot;</span>)
206227
.<span class="ident">arg</span>(<span class="ident">command</span>)
207228
.<span class="ident">stdin</span>(<span class="ident">Stdio::piped</span>())
208-
.<span class="ident">spawn</span>()
209-
.<span class="ident">expect</span>(<span class="string">&quot;Couldn&#39;t spawn filter command&quot;</span>);
229+
.<span class="ident">spawn</span>()<span class="question-mark">?</span>;
210230

211-
<span class="self">Self</span> { <span class="ident">shell_process</span> }
231+
<span class="prelude-val">Ok</span>(<span class="self">Self</span> { <span class="ident">shell_process</span> })
212232
}
213233
}
214234

@@ -237,22 +257,38 @@
237257
<span class="kw">pub</span> <span class="kw">fn</span> <span class="ident">instantiate_current_writer</span>(
238258
<span class="ident">filter</span>: <span class="kw-2">&amp;</span><span class="prelude-ty">Option</span><span class="op">&lt;</span><span class="ident">String</span><span class="op">&gt;</span>,
239259
<span class="ident">filename</span>: <span class="kw-2">&amp;</span><span class="ident">str</span>,
240-
) -&gt; <span class="ident">BufWriter</span><span class="op">&lt;</span><span class="ident">Box</span><span class="op">&lt;</span><span class="kw">dyn</span> <span class="ident">Write</span><span class="op">&gt;</span><span class="op">&gt;</span> {
260+
) -&gt; <span class="prelude-ty">Result</span><span class="op">&lt;</span><span class="ident">BufWriter</span><span class="op">&lt;</span><span class="ident">Box</span><span class="op">&lt;</span><span class="kw">dyn</span> <span class="ident">Write</span><span class="op">&gt;</span><span class="op">&gt;</span><span class="op">&gt;</span> {
241261
<span class="kw">match</span> <span class="ident">filter</span> {
242-
<span class="prelude-val">None</span> =&gt; <span class="ident">BufWriter::new</span>(<span class="ident">Box::new</span>(
262+
<span class="prelude-val">None</span> =&gt; <span class="prelude-val">Ok</span>(<span class="ident">BufWriter::new</span>(<span class="ident">Box::new</span>(
243263
<span class="comment">// write to the next file</span>
244264
<span class="ident">std::fs::OpenOptions::new</span>()
245265
.<span class="ident">write</span>(<span class="bool-val">true</span>)
246266
.<span class="ident">create</span>(<span class="bool-val">true</span>)
267+
.<span class="ident">truncate</span>(<span class="bool-val">true</span>)
247268
.<span class="ident">open</span>(<span class="ident">std::path::Path::new</span>(<span class="kw-2">&amp;</span><span class="ident">filename</span>))
248-
.<span class="ident">unwrap</span>(),
249-
) <span class="kw">as</span> <span class="ident">Box</span><span class="op">&lt;</span><span class="kw">dyn</span> <span class="ident">Write</span><span class="op">&gt;</span>),
250-
<span class="prelude-val">Some</span>(<span class="kw-2">ref</span> <span class="ident">filter_command</span>) =&gt; <span class="ident">BufWriter::new</span>(<span class="ident">Box::new</span>(
269+
.<span class="ident">map_err</span>(<span class="op">|</span><span class="kw">_</span><span class="op">|</span> {
270+
<span class="ident">Error::new</span>(
271+
<span class="ident">ErrorKind::Other</span>,
272+
<span class="macro">format!</span>(<span class="string">&quot;unable to open &#39;{}&#39;; aborting&quot;</span>, <span class="ident">filename</span>),
273+
)
274+
})<span class="question-mark">?</span>,
275+
) <span class="kw">as</span> <span class="ident">Box</span><span class="op">&lt;</span><span class="kw">dyn</span> <span class="ident">Write</span><span class="op">&gt;</span>)),
276+
<span class="prelude-val">Some</span>(<span class="kw-2">ref</span> <span class="ident">filter_command</span>) =&gt; <span class="prelude-val">Ok</span>(<span class="ident">BufWriter::new</span>(<span class="ident">Box::new</span>(
251277
<span class="comment">// spawn a shell command and write to it</span>
252-
<span class="ident">FilterWriter::new</span>(<span class="ident">filter_command</span>, <span class="ident">filename</span>),
253-
) <span class="kw">as</span> <span class="ident">Box</span><span class="op">&lt;</span><span class="kw">dyn</span> <span class="ident">Write</span><span class="op">&gt;</span>),
278+
<span class="ident">FilterWriter::new</span>(<span class="ident">filter_command</span>, <span class="ident">filename</span>)<span class="question-mark">?</span>,
279+
) <span class="kw">as</span> <span class="ident">Box</span><span class="op">&lt;</span><span class="kw">dyn</span> <span class="ident">Write</span><span class="op">&gt;</span>)),
254280
}
255281
}
282+
283+
<span class="kw">pub</span> <span class="kw">fn</span> <span class="ident">paths_refer_to_same_file</span>(<span class="ident">p1</span>: <span class="kw-2">&amp;</span><span class="ident">str</span>, <span class="ident">p2</span>: <span class="kw-2">&amp;</span><span class="ident">str</span>) -&gt; <span class="ident">bool</span> {
284+
<span class="comment">// We have to take symlinks and relative paths into account.</span>
285+
<span class="kw">let</span> <span class="ident">p1</span> <span class="op">=</span> <span class="kw">if</span> <span class="ident">p1</span> <span class="op">==</span> <span class="string">&quot;-&quot;</span> {
286+
<span class="ident">FileInformation::from_file</span>(<span class="kw-2">&amp;</span><span class="ident">std::io::stdin</span>())
287+
} <span class="kw">else</span> {
288+
<span class="ident">FileInformation::from_path</span>(<span class="ident">Path::new</span>(<span class="kw-2">&amp;</span><span class="ident">p1</span>), <span class="bool-val">true</span>)
289+
};
290+
<span class="ident">fs::infos_refer_to_same_file</span>(<span class="ident">p1</span>, <span class="ident">FileInformation::from_path</span>(<span class="ident">Path::new</span>(<span class="ident">p2</span>), <span class="bool-val">true</span>))
291+
}
256292
</code></pre></div>
257293
</section></div></main><div id="rustdoc-vars" data-root-path="../../../" data-current-crate="uu_split" data-themes="ayu,dark,light" data-resource-suffix="" data-rustdoc-version="1.62.1 (e092d0b6b 2022-07-16)" ></div>
258294
</body></html>

0 commit comments

Comments
 (0)