Skip to content

Commit 327ee31

Browse files
sylvestresylvestre
committed
deploy: 055173b 
1 parent f17c43b commit 327ee31

17 files changed

+79
-25
lines changed

‎dev/search-index.js

Lines changed: 3 additions & 3 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎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="./base64/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="./basenc/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="./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">
5+
<nav class="sidebar"><a class="sidebar-logo" href="./basenc/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="./basenc/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="base64" 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="basenc" 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/table.rs.html

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -663,6 +663,7 @@
663663
<span id="658">658</span>
664664
<span id="659">659</span>
665665
<span id="660">660</span>
666+
<span id="661">661</span>
666667
</pre><pre class="rust"><code><span class="comment">// * This file is part of the uutils coreutils package.</span>
667668
<span class="comment">// *</span>
668669
<span class="comment">// * For the full copyright and license information, please view the LICENSE</span>
@@ -819,6 +820,7 @@
819820
..
820821
} <span class="op">=</span> <span class="ident">fs</span>.<span class="ident">usage</span>;
821822
<span class="kw">let</span> <span class="ident">bused</span> <span class="op">=</span> <span class="ident">blocks</span> <span class="op">-</span> <span class="ident">bfree</span>;
823+
<span class="kw">let</span> <span class="ident">fused</span> <span class="op">=</span> <span class="ident">files</span> <span class="op">-</span> <span class="ident">ffree</span>;
822824
<span class="self">Self</span> {
823825
<span class="ident">file</span>: <span class="ident">fs</span>.<span class="ident">file</span>,
824826
<span class="ident">fs_device</span>: <span class="ident">dev_name</span>,
@@ -842,12 +844,12 @@
842844
<span class="prelude-val">Some</span>(<span class="ident">bavail</span> <span class="kw">as</span> <span class="ident">f64</span> <span class="op">/</span> ((<span class="ident">bused</span> <span class="op">+</span> <span class="ident">bavail</span>) <span class="kw">as</span> <span class="ident">f64</span>))
843845
},
844846
<span class="ident">inodes</span>: <span class="ident">files</span>,
845-
<span class="ident">inodes_used</span>: <span class="ident">files</span> <span class="op">-</span> <span class="ident">ffree</span>,
847+
<span class="ident">inodes_used</span>: <span class="ident">fused</span>,
846848
<span class="ident">inodes_free</span>: <span class="ident">ffree</span>,
847849
<span class="ident">inodes_usage</span>: <span class="kw">if</span> <span class="ident">files</span> <span class="op">==</span> <span class="number">0</span> {
848850
<span class="prelude-val">None</span>
849851
} <span class="kw">else</span> {
850-
<span class="prelude-val">Some</span>(<span class="ident">ffree</span> <span class="kw">as</span> <span class="ident">f64</span> <span class="op">/</span> <span class="ident">files</span> <span class="kw">as</span> <span class="ident">f64</span>)
852+
<span class="prelude-val">Some</span>(<span class="ident">fused</span> <span class="kw">as</span> <span class="ident">f64</span> <span class="op">/</span> <span class="ident">files</span> <span class="kw">as</span> <span class="ident">f64</span>)
851853
},
852854
}
853855
}

‎dev/src/uu_mkdir/mkdir.rs.html

Lines changed: 9 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -218,6 +218,9 @@
218218
<span id="213">213</span>
219219
<span id="214">214</span>
220220
<span id="215">215</span>
221+
<span id="216">216</span>
222+
<span id="217">217</span>
223+
<span id="218">218</span>
221224
</pre><pre class="rust"><code><span class="comment">// * This file is part of the uutils coreutils package.</span>
222225
<span class="comment">// *</span>
223226
<span class="comment">// * (c) Nicholas Juszczak &lt;juszczakn@gmail.com&gt;</span>
@@ -284,12 +287,15 @@
284287
}
285288
<span class="prelude-val">Ok</span>(<span class="ident">new_mode</span>)
286289
}
287-
<span class="prelude-val">None</span> =&gt; <span class="prelude-val">Ok</span>(<span class="ident">DEFAULT_PERM</span>),
290+
<span class="prelude-val">None</span> =&gt; {
291+
<span class="comment">// If no mode argument is specified return the mode derived from umask</span>
292+
<span class="prelude-val">Ok</span>(<span class="op">!</span><span class="ident">mode::get_umask</span>() <span class="op">&amp;</span> <span class="number">0o0777</span>)
293+
}
288294
}
289295
}
290296

291297
<span class="attribute">#[<span class="ident">cfg</span>(<span class="ident">windows</span>)]</span>
292-
<span class="kw">fn</span> <span class="ident">strip_minus_from_mode</span>(<span class="ident">_args</span>: <span class="kw-2">&amp;mut</span> <span class="ident">Vec</span><span class="op">&lt;</span><span class="ident">String</span><span class="op">&gt;</span>) -&gt; <span class="ident">bool</span> {
298+
<span class="kw">fn</span> <span class="ident">strip_minus_from_mode</span>(<span class="ident">_args</span>: <span class="kw-2">&amp;mut</span> [<span class="ident">String</span>]) -&gt; <span class="ident">bool</span> {
293299
<span class="bool-val">false</span>
294300
}
295301

@@ -335,7 +341,7 @@
335341
.<span class="ident">short</span>(<span class="string">&#39;m&#39;</span>)
336342
.<span class="ident">long</span>(<span class="ident">options::MODE</span>)
337343
.<span class="ident">help</span>(<span class="string">&quot;set file mode (not implemented on windows)&quot;</span>)
338-
.<span class="ident">default_value</span>(<span class="string">&quot;755&quot;</span>),
344+
.<span class="ident">takes_value</span>(<span class="bool-val">true</span>),
339345
)
340346
.<span class="ident">arg</span>(
341347
<span class="ident">Arg::new</span>(<span class="ident">options::PARENTS</span>)

‎dev/src/uu_mv/mv.rs.html

Lines changed: 33 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -460,6 +460,22 @@
460460
<span id="455">455</span>
461461
<span id="456">456</span>
462462
<span id="457">457</span>
463+
<span id="458">458</span>
464+
<span id="459">459</span>
465+
<span id="460">460</span>
466+
<span id="461">461</span>
467+
<span id="462">462</span>
468+
<span id="463">463</span>
469+
<span id="464">464</span>
470+
<span id="465">465</span>
471+
<span id="466">466</span>
472+
<span id="467">467</span>
473+
<span id="468">468</span>
474+
<span id="469">469</span>
475+
<span id="470">470</span>
476+
<span id="471">471</span>
477+
<span id="472">472</span>
478+
<span id="473">473</span>
463479
</pre><pre class="rust"><code><span class="comment">// This file is part of the uutils coreutils package.</span>
464480
<span class="comment">//</span>
465481
<span class="comment">// (c) Orvar Segerström &lt;orvarsegerstrom@gmail.com&gt;</span>
@@ -747,7 +763,23 @@
747763
));
748764
}
749765
<span class="kw">let</span> <span class="ident">target_dir</span> <span class="op">=</span> <span class="ident">paths</span>.<span class="ident">last</span>().<span class="ident">unwrap</span>();
750-
<span class="ident">move_files_into_dir</span>(<span class="kw-2">&amp;</span><span class="ident">paths</span>[..<span class="ident">paths</span>.<span class="ident">len</span>() <span class="op">-</span> <span class="number">1</span>], <span class="ident">target_dir</span>, <span class="ident">b</span>)
766+
<span class="kw">let</span> <span class="ident">sources</span> <span class="op">=</span> <span class="kw-2">&amp;</span><span class="ident">paths</span>[..<span class="ident">paths</span>.<span class="ident">len</span>() <span class="op">-</span> <span class="number">1</span>];
767+
768+
<span class="comment">// Check if we have mv dir1 dir2 dir2</span>
769+
<span class="comment">// And generate an error if this is the case</span>
770+
<span class="kw">if</span> <span class="ident">sources</span>.<span class="ident">contains</span>(<span class="ident">target_dir</span>) {
771+
<span class="kw">return</span> <span class="prelude-val">Err</span>(<span class="ident">USimpleError::new</span>(
772+
<span class="number">1</span>,
773+
<span class="macro">format!</span>(
774+
<span class="string">&quot;cannot move {} to a subdirectory of itself, &#39;{}/{}&#39;&quot;</span>,
775+
<span class="ident">target_dir</span>.<span class="ident">quote</span>(),
776+
<span class="ident">target_dir</span>.<span class="ident">display</span>(),
777+
<span class="ident">target_dir</span>.<span class="ident">display</span>()
778+
),
779+
));
780+
}
781+
782+
<span class="ident">move_files_into_dir</span>(<span class="ident">sources</span>, <span class="ident">target_dir</span>, <span class="ident">b</span>)
751783
}
752784
}
753785
}

0 commit comments

Comments
 (0)