Skip to content

Commit f17c43b

Browse files
sylvestresylvestre
committed
deploy: 055173b 
1 parent 50be4f2 commit f17c43b

File tree

11 files changed

+198
-44
lines changed

11 files changed

+198
-44
lines changed

‎dev/src/uu_df/df.rs.html

Lines changed: 32 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -760,6 +760,19 @@
760760
<span id="755">755</span>
761761
<span id="756">756</span>
762762
<span id="757">757</span>
763+
<span id="758">758</span>
764+
<span id="759">759</span>
765+
<span id="760">760</span>
766+
<span id="761">761</span>
767+
<span id="762">762</span>
768+
<span id="763">763</span>
769+
<span id="764">764</span>
770+
<span id="765">765</span>
771+
<span id="766">766</span>
772+
<span id="767">767</span>
773+
<span id="768">768</span>
774+
<span id="769">769</span>
775+
<span id="770">770</span>
763776
</pre><pre class="rust"><code><span class="comment">// This file is part of the uutils coreutils package.</span>
764777
<span class="comment">//</span>
765778
<span class="comment">// (c) Fangxu Hu &lt;framlog@gmail.com&gt;</span>
@@ -774,9 +787,9 @@
774787
<span class="kw">mod</span> <span class="ident">table</span>;
775788

776789
<span class="kw">use</span> <span class="ident">uucore::display::Quotable</span>;
777-
<span class="kw">use</span> <span class="ident">uucore::error</span>::{<span class="ident">UError</span>, <span class="ident">UResult</span>};
778-
<span class="kw">use</span> <span class="ident">uucore::format_usage</span>;
790+
<span class="kw">use</span> <span class="ident">uucore::error</span>::{<span class="ident">UError</span>, <span class="ident">UResult</span>, <span class="ident">USimpleError</span>};
779791
<span class="kw">use</span> <span class="ident">uucore::fsext</span>::{<span class="ident">read_fs_list</span>, <span class="ident">MountInfo</span>};
792+
<span class="kw">use</span> <span class="ident">uucore</span>::{<span class="ident">format_usage</span>, <span class="ident">show</span>};
780793

781794
<span class="kw">use</span> <span class="ident">clap</span>::{<span class="ident">crate_version</span>, <span class="ident">Arg</span>, <span class="ident">ArgMatches</span>, <span class="ident">Command</span>};
782795

@@ -1073,10 +1086,17 @@
10731086

10741087
<span class="comment">// Convert each path into a `Filesystem`, which contains</span>
10751088
<span class="comment">// both the mount information and usage information.</span>
1076-
<span class="ident">paths</span>
1077-
.<span class="ident">iter</span>()
1078-
.<span class="ident">filter_map</span>(<span class="op">|</span><span class="ident">p</span><span class="op">|</span> <span class="ident">Filesystem::from_path</span>(<span class="kw-2">&amp;</span><span class="ident">mounts</span>, <span class="ident">p</span>))
1079-
.<span class="ident">collect</span>()
1089+
<span class="kw">let</span> <span class="kw-2">mut</span> <span class="ident">result</span> <span class="op">=</span> <span class="macro">vec!</span>[];
1090+
<span class="kw">for</span> <span class="ident">path</span> <span class="kw">in</span> <span class="ident">paths</span> {
1091+
<span class="kw">match</span> <span class="ident">Filesystem::from_path</span>(<span class="kw-2">&amp;</span><span class="ident">mounts</span>, <span class="ident">path</span>) {
1092+
<span class="prelude-val">Some</span>(<span class="ident">fs</span>) =&gt; <span class="ident">result</span>.<span class="ident">push</span>(<span class="ident">fs</span>),
1093+
<span class="prelude-val">None</span> =&gt; <span class="macro">show!</span>(<span class="ident">USimpleError::new</span>(
1094+
<span class="number">1</span>,
1095+
<span class="macro">format!</span>(<span class="string">&quot;{}: No such file or directory&quot;</span>, <span class="ident">path</span>.<span class="ident">as_ref</span>().<span class="ident">display</span>())
1096+
)),
1097+
}
1098+
}
1099+
<span class="ident">result</span>
10801100
}
10811101

10821102
<span class="attribute">#[<span class="ident">derive</span>(<span class="ident">Debug</span>)]</span>
@@ -1123,6 +1143,12 @@
11231143
}
11241144
};
11251145

1146+
<span class="comment">// This can happen if paths are given as command-line arguments</span>
1147+
<span class="comment">// but none of the paths exist.</span>
1148+
<span class="kw">if</span> <span class="ident">filesystems</span>.<span class="ident">is_empty</span>() {
1149+
<span class="kw">return</span> <span class="prelude-val">Ok</span>(());
1150+
}
1151+
11261152
<span class="comment">// The running total of filesystem sizes and usage.</span>
11271153
<span class="comment">//</span>
11281154
<span class="comment">// This accumulator is computed in case we need to display the</span>

‎dev/src/uu_df/table.rs.html

Lines changed: 122 additions & 14 deletions
Large diffs are not rendered by default.

‎dev/src/uu_factor/miller_rabin.rs.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -284,7 +284,7 @@
284284
<span class="kw">continue</span>;
285285
}
286286

287-
<span class="kw">let</span> <span class="ident">a</span> <span class="op">=</span> <span class="ident">m</span>.<span class="ident">from_u64</span>(<span class="ident">_a</span>);
287+
<span class="kw">let</span> <span class="ident">a</span> <span class="op">=</span> <span class="ident">m</span>.<span class="ident">to_mod</span>(<span class="ident">_a</span>);
288288

289289
<span class="comment">// x = a^r mod n</span>
290290
<span class="kw">let</span> <span class="kw-2">mut</span> <span class="ident">x</span> <span class="op">=</span> <span class="ident">m</span>.<span class="ident">pow</span>(<span class="ident">a</span>, <span class="ident">r</span>);

‎dev/src/uu_factor/numeric/montgomery.rs.html

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -250,7 +250,7 @@
250250

251251
<span class="kw">fn</span> <span class="ident">new</span>(<span class="ident">m</span>: <span class="ident">u64</span>) -&gt; <span class="self">Self</span>;
252252
<span class="kw">fn</span> <span class="ident">modulus</span>(<span class="kw-2">&amp;</span><span class="self">self</span>) -&gt; <span class="ident">u64</span>;
253-
<span class="kw">fn</span> <span class="ident">from_u64</span>(<span class="kw-2">&amp;</span><span class="self">self</span>, <span class="ident">n</span>: <span class="ident">u64</span>) -&gt; <span class="ident"><span class="self">Self</span>::ModInt</span>;
253+
<span class="kw">fn</span> <span class="ident">to_mod</span>(<span class="kw-2">&amp;</span><span class="self">self</span>, <span class="ident">n</span>: <span class="ident">u64</span>) -&gt; <span class="ident"><span class="self">Self</span>::ModInt</span>;
254254
<span class="kw">fn</span> <span class="ident">to_u64</span>(<span class="kw-2">&amp;</span><span class="self">self</span>, <span class="ident">n</span>: <span class="ident"><span class="self">Self</span>::ModInt</span>) -&gt; <span class="ident">u64</span>;
255255
<span class="kw">fn</span> <span class="ident">add</span>(<span class="kw-2">&amp;</span><span class="self">self</span>, <span class="ident">a</span>: <span class="ident"><span class="self">Self</span>::ModInt</span>, <span class="ident">b</span>: <span class="ident"><span class="self">Self</span>::ModInt</span>) -&gt; <span class="ident"><span class="self">Self</span>::ModInt</span>;
256256
<span class="kw">fn</span> <span class="ident">mul</span>(<span class="kw-2">&amp;</span><span class="self">self</span>, <span class="ident">a</span>: <span class="ident"><span class="self">Self</span>::ModInt</span>, <span class="ident">b</span>: <span class="ident"><span class="self">Self</span>::ModInt</span>) -&gt; <span class="ident"><span class="self">Self</span>::ModInt</span>;
@@ -281,13 +281,13 @@
281281
}
282282

283283
<span class="kw">fn</span> <span class="ident">one</span>(<span class="kw-2">&amp;</span><span class="self">self</span>) -&gt; <span class="ident"><span class="self">Self</span>::ModInt</span> {
284-
<span class="self">self</span>.<span class="ident">from_u64</span>(<span class="number">1</span>)
284+
<span class="self">self</span>.<span class="ident">to_mod</span>(<span class="number">1</span>)
285285
}
286286
<span class="kw">fn</span> <span class="ident">minus_one</span>(<span class="kw-2">&amp;</span><span class="self">self</span>) -&gt; <span class="ident"><span class="self">Self</span>::ModInt</span> {
287-
<span class="self">self</span>.<span class="ident">from_u64</span>(<span class="self">self</span>.<span class="ident">modulus</span>() <span class="op">-</span> <span class="number">1</span>)
287+
<span class="self">self</span>.<span class="ident">to_mod</span>(<span class="self">self</span>.<span class="ident">modulus</span>() <span class="op">-</span> <span class="number">1</span>)
288288
}
289289
<span class="kw">fn</span> <span class="ident">zero</span>(<span class="kw-2">&amp;</span><span class="self">self</span>) -&gt; <span class="ident"><span class="self">Self</span>::ModInt</span> {
290-
<span class="self">self</span>.<span class="ident">from_u64</span>(<span class="number">0</span>)
290+
<span class="self">self</span>.<span class="ident">to_mod</span>(<span class="number">0</span>)
291291
}
292292
}
293293

@@ -347,7 +347,7 @@
347347
<span class="self">self</span>.<span class="ident">n</span>.<span class="ident">as_u64</span>()
348348
}
349349

350-
<span class="kw">fn</span> <span class="ident">from_u64</span>(<span class="kw-2">&amp;</span><span class="self">self</span>, <span class="ident">x</span>: <span class="ident">u64</span>) -&gt; <span class="ident"><span class="self">Self</span>::ModInt</span> {
350+
<span class="kw">fn</span> <span class="ident">to_mod</span>(<span class="kw-2">&amp;</span><span class="self">self</span>, <span class="ident">x</span>: <span class="ident">u64</span>) -&gt; <span class="ident"><span class="self">Self</span>::ModInt</span> {
351351
<span class="comment">// TODO: optimise!</span>
352352
<span class="macro">debug_assert!</span>(<span class="ident">x</span> <span class="op">&lt;</span> <span class="self">self</span>.<span class="ident">n</span>.<span class="ident">as_u64</span>());
353353
<span class="kw">let</span> <span class="ident">r</span> <span class="op">=</span> <span class="ident">T::from_double_width</span>(
@@ -423,9 +423,9 @@
423423
<span class="kw">let</span> <span class="ident">n</span> <span class="op">=</span> <span class="number">2</span> <span class="op">*</span> <span class="ident">n</span> <span class="op">+</span> <span class="number">1</span>;
424424
<span class="kw">let</span> <span class="ident">m</span> <span class="op">=</span> <span class="ident">Montgomery</span>::<span class="op">&lt;</span><span class="ident">A</span><span class="op">&gt;</span><span class="ident">::new</span>(<span class="ident">n</span>);
425425
<span class="kw">for</span> <span class="ident">x</span> <span class="kw">in</span> <span class="number">0</span>..<span class="ident">n</span> {
426-
<span class="kw">let</span> <span class="ident">m_x</span> <span class="op">=</span> <span class="ident">m</span>.<span class="ident">from_u64</span>(<span class="ident">x</span>);
426+
<span class="kw">let</span> <span class="ident">m_x</span> <span class="op">=</span> <span class="ident">m</span>.<span class="ident">to_mod</span>(<span class="ident">x</span>);
427427
<span class="kw">for</span> <span class="ident">y</span> <span class="kw">in</span> <span class="number">0</span>..<span class="op">=</span><span class="ident">x</span> {
428-
<span class="kw">let</span> <span class="ident">m_y</span> <span class="op">=</span> <span class="ident">m</span>.<span class="ident">from_u64</span>(<span class="ident">y</span>);
428+
<span class="kw">let</span> <span class="ident">m_y</span> <span class="op">=</span> <span class="ident">m</span>.<span class="ident">to_mod</span>(<span class="ident">y</span>);
429429
<span class="macro">println!</span>(<span class="string">&quot;{n:?}, {x:?}, {y:?}&quot;</span>, <span class="ident">n</span> <span class="op">=</span> <span class="ident">n</span>, <span class="ident">x</span> <span class="op">=</span> <span class="ident">x</span>, <span class="ident">y</span> <span class="op">=</span> <span class="ident">y</span>);
430430
<span class="macro">assert_eq!</span>((<span class="ident">x</span> <span class="op">+</span> <span class="ident">y</span>) <span class="op">%</span> <span class="ident">n</span>, <span class="ident">m</span>.<span class="ident">to_u64</span>(<span class="ident">m</span>.<span class="ident">add</span>(<span class="ident">m_x</span>, <span class="ident">m_y</span>)));
431431
}
@@ -439,9 +439,9 @@
439439
<span class="kw">let</span> <span class="ident">n</span> <span class="op">=</span> <span class="number">2</span> <span class="op">*</span> <span class="ident">n</span> <span class="op">+</span> <span class="number">1</span>;
440440
<span class="kw">let</span> <span class="ident">m</span> <span class="op">=</span> <span class="ident">Montgomery</span>::<span class="op">&lt;</span><span class="ident">A</span><span class="op">&gt;</span><span class="ident">::new</span>(<span class="ident">n</span>);
441441
<span class="kw">for</span> <span class="ident">x</span> <span class="kw">in</span> <span class="number">0</span>..<span class="ident">n</span> {
442-
<span class="kw">let</span> <span class="ident">m_x</span> <span class="op">=</span> <span class="ident">m</span>.<span class="ident">from_u64</span>(<span class="ident">x</span>);
442+
<span class="kw">let</span> <span class="ident">m_x</span> <span class="op">=</span> <span class="ident">m</span>.<span class="ident">to_mod</span>(<span class="ident">x</span>);
443443
<span class="kw">for</span> <span class="ident">y</span> <span class="kw">in</span> <span class="number">0</span>..<span class="op">=</span><span class="ident">x</span> {
444-
<span class="kw">let</span> <span class="ident">m_y</span> <span class="op">=</span> <span class="ident">m</span>.<span class="ident">from_u64</span>(<span class="ident">y</span>);
444+
<span class="kw">let</span> <span class="ident">m_y</span> <span class="op">=</span> <span class="ident">m</span>.<span class="ident">to_mod</span>(<span class="ident">y</span>);
445445
<span class="macro">assert_eq!</span>((<span class="ident">x</span> <span class="op">*</span> <span class="ident">y</span>) <span class="op">%</span> <span class="ident">n</span>, <span class="ident">m</span>.<span class="ident">to_u64</span>(<span class="ident">m</span>.<span class="ident">mul</span>(<span class="ident">m_x</span>, <span class="ident">m_y</span>)));
446446
}
447447
}
@@ -454,7 +454,7 @@
454454
<span class="kw">let</span> <span class="ident">n</span> <span class="op">=</span> <span class="number">2</span> <span class="op">*</span> <span class="ident">n</span> <span class="op">+</span> <span class="number">1</span>;
455455
<span class="kw">let</span> <span class="ident">m</span> <span class="op">=</span> <span class="ident">Montgomery</span>::<span class="op">&lt;</span><span class="ident">A</span><span class="op">&gt;</span><span class="ident">::new</span>(<span class="ident">n</span>);
456456
<span class="kw">for</span> <span class="ident">x</span> <span class="kw">in</span> <span class="number">0</span>..<span class="ident">n</span> {
457-
<span class="kw">let</span> <span class="ident">x_</span> <span class="op">=</span> <span class="ident">m</span>.<span class="ident">from_u64</span>(<span class="ident">x</span>);
457+
<span class="kw">let</span> <span class="ident">x_</span> <span class="op">=</span> <span class="ident">m</span>.<span class="ident">to_mod</span>(<span class="ident">x</span>);
458458
<span class="macro">assert_eq!</span>(<span class="ident">x</span>, <span class="ident">m</span>.<span class="ident">to_u64</span>(<span class="ident">x_</span>));
459459
}
460460
}

‎dev/src/uu_factor/rho.rs.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -70,7 +70,7 @@
7070
<span class="kw">let</span> <span class="kw-2">mut</span> <span class="ident">rand</span> <span class="op">=</span> {
7171
<span class="kw">let</span> <span class="ident">range</span> <span class="op">=</span> <span class="ident">Uniform::new</span>(<span class="number">1</span>, <span class="ident">n</span>.<span class="ident">modulus</span>());
7272
<span class="kw">let</span> <span class="kw-2">mut</span> <span class="ident">rng</span> <span class="op">=</span> <span class="ident">SmallRng::from_rng</span>(<span class="kw-2">&amp;mut</span> <span class="ident">thread_rng</span>()).<span class="ident">unwrap</span>();
73-
<span class="kw">move</span> <span class="op">|</span><span class="op">|</span> <span class="ident">n</span>.<span class="ident">from_u64</span>(<span class="ident">range</span>.<span class="ident">sample</span>(<span class="kw-2">&amp;mut</span> <span class="ident">rng</span>))
73+
<span class="kw">move</span> <span class="op">|</span><span class="op">|</span> <span class="ident">n</span>.<span class="ident">to_mod</span>(<span class="ident">range</span>.<span class="ident">sample</span>(<span class="kw-2">&amp;mut</span> <span class="ident">rng</span>))
7474
};
7575

7676
<span class="kw">let</span> <span class="ident">quadratic</span> <span class="op">=</span> <span class="op">|</span><span class="ident">a</span>, <span class="ident">b</span><span class="op">|</span> <span class="kw">move</span> <span class="op">|</span><span class="ident">x</span><span class="op">|</span> <span class="ident">n</span>.<span class="ident">add</span>(<span class="ident">n</span>.<span class="ident">mul</span>(<span class="ident">a</span>, <span class="ident">n</span>.<span class="ident">mul</span>(<span class="ident">x</span>, <span class="ident">x</span>)), <span class="ident">b</span>);

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

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -450,6 +450,16 @@
450450
<span id="445">445</span>
451451
<span id="446">446</span>
452452
<span id="447">447</span>
453+
<span id="448">448</span>
454+
<span id="449">449</span>
455+
<span id="450">450</span>
456+
<span id="451">451</span>
457+
<span id="452">452</span>
458+
<span id="453">453</span>
459+
<span id="454">454</span>
460+
<span id="455">455</span>
461+
<span id="456">456</span>
462+
<span id="457">457</span>
453463
</pre><pre class="rust"><code><span class="comment">// This file is part of the uutils coreutils package.</span>
454464
<span class="comment">//</span>
455465
<span class="comment">// (c) Orvar Segerström &lt;orvarsegerstrom@gmail.com&gt;</span>
@@ -710,6 +720,16 @@
710720
<span class="ident">move_files_into_dir</span>(<span class="kw-2">&amp;</span>[<span class="ident">source</span>.<span class="ident">clone</span>()], <span class="ident">target</span>, <span class="ident">b</span>)
711721
}
712722
} <span class="kw">else</span> <span class="kw">if</span> <span class="ident">target</span>.<span class="ident">exists</span>() <span class="op">&amp;&amp;</span> <span class="ident">source</span>.<span class="ident">is_dir</span>() {
723+
<span class="kw">match</span> <span class="ident">b</span>.<span class="ident">overwrite</span> {
724+
<span class="ident">OverwriteMode::NoClobber</span> =&gt; <span class="kw">return</span> <span class="prelude-val">Ok</span>(()),
725+
<span class="ident">OverwriteMode::Interactive</span> =&gt; {
726+
<span class="macro">println!</span>(<span class="string">&quot;{}: overwrite {}? &quot;</span>, <span class="ident">uucore::util_name</span>(), <span class="ident">target</span>.<span class="ident">quote</span>());
727+
<span class="kw">if</span> <span class="op">!</span><span class="ident">read_yes</span>() {
728+
<span class="kw">return</span> <span class="prelude-val">Ok</span>(());
729+
}
730+
}
731+
<span class="ident">OverwriteMode::Force</span> =&gt; {}
732+
};
713733
<span class="prelude-val">Err</span>(<span class="ident">MvError::NonDirectoryToDirectory</span>(
714734
<span class="ident">source</span>.<span class="ident">quote</span>().<span class="ident">to_string</span>(),
715735
<span class="ident">target</span>.<span class="ident">quote</span>().<span class="ident">to_string</span>(),

0 commit comments

Comments
 (0)