Skip to content

Commit a09ef8f

Browse files
sylvestresylvestre
committed
deploy: 2ed80ff 
1 parent 653077f commit a09ef8f

File tree

13 files changed

+68
-58
lines changed

13 files changed

+68
-58
lines changed

‎dev/src/uu_csplit/split_name.rs.html

+20-28
Original file line numberDiff line numberDiff line change
@@ -414,10 +414,6 @@
414414
<span id="414">414</span>
415415
<span id="415">415</span>
416416
<span id="416">416</span>
417-
<span id="417">417</span>
418-
<span id="418">418</span>
419-
<span id="419">419</span>
420-
<span id="420">420</span>
421417
</pre><pre class="rust"><code><span class="comment">// spell-checker:ignore (regex) diuox
422418

423419
</span><span class="kw">use </span>regex::Regex;
@@ -501,18 +497,16 @@
501497
* zero padding
502498
*/
503499
// decimal
504-
</span>(<span class="string">&quot;0&quot;</span>, <span class="string">&quot;d&quot;</span>) | (<span class="string">&quot;0&quot;</span>, <span class="string">&quot;i&quot;</span>) | (<span class="string">&quot;0&quot;</span>, <span class="string">&quot;u&quot;</span>) =&gt; {
505-
Box::new(<span class="kw">move </span>|n: usize| -&gt; String {
506-
<span class="macro">format!</span>(
507-
<span class="string">&quot;{}{}{:0width$}{}&quot;</span>,
508-
prefix,
509-
before,
510-
n,
511-
after,
512-
width = n_digits
513-
)
514-
})
515-
}
500+
</span>(<span class="string">&quot;0&quot;</span>, <span class="string">&quot;d&quot; </span>| <span class="string">&quot;i&quot; </span>| <span class="string">&quot;u&quot;</span>) =&gt; Box::new(<span class="kw">move </span>|n: usize| -&gt; String {
501+
<span class="macro">format!</span>(
502+
<span class="string">&quot;{}{}{:0width$}{}&quot;</span>,
503+
prefix,
504+
before,
505+
n,
506+
after,
507+
width = n_digits
508+
)
509+
}),
516510
<span class="comment">// octal
517511
</span>(<span class="string">&quot;0&quot;</span>, <span class="string">&quot;o&quot;</span>) =&gt; Box::new(<span class="kw">move </span>|n: usize| -&gt; String {
518512
<span class="macro">format!</span>(
@@ -588,18 +582,16 @@
588582
* Left adjusted
589583
*/
590584
// decimal
591-
</span>(<span class="string">&quot;-&quot;</span>, <span class="string">&quot;d&quot;</span>) | (<span class="string">&quot;-&quot;</span>, <span class="string">&quot;i&quot;</span>) | (<span class="string">&quot;-&quot;</span>, <span class="string">&quot;u&quot;</span>) =&gt; {
592-
Box::new(<span class="kw">move </span>|n: usize| -&gt; String {
593-
<span class="macro">format!</span>(
594-
<span class="string">&quot;{}{}{:&lt;#width$}{}&quot;</span>,
595-
prefix,
596-
before,
597-
n,
598-
after,
599-
width = n_digits
600-
)
601-
})
602-
}
585+
</span>(<span class="string">&quot;-&quot;</span>, <span class="string">&quot;d&quot; </span>| <span class="string">&quot;i&quot; </span>| <span class="string">&quot;u&quot;</span>) =&gt; Box::new(<span class="kw">move </span>|n: usize| -&gt; String {
586+
<span class="macro">format!</span>(
587+
<span class="string">&quot;{}{}{:&lt;#width$}{}&quot;</span>,
588+
prefix,
589+
before,
590+
n,
591+
after,
592+
width = n_digits
593+
)
594+
}),
603595
<span class="comment">// octal
604596
</span>(<span class="string">&quot;-&quot;</span>, <span class="string">&quot;o&quot;</span>) =&gt; Box::new(<span class="kw">move </span>|n: usize| -&gt; String {
605597
<span class="macro">format!</span>(

‎dev/src/uu_date/date.rs.html

+28-2
Original file line numberDiff line numberDiff line change
@@ -426,6 +426,19 @@
426426
<span id="426">426</span>
427427
<span id="427">427</span>
428428
<span id="428">428</span>
429+
<span id="429">429</span>
430+
<span id="430">430</span>
431+
<span id="431">431</span>
432+
<span id="432">432</span>
433+
<span id="433">433</span>
434+
<span id="434">434</span>
435+
<span id="435">435</span>
436+
<span id="436">436</span>
437+
<span id="437">437</span>
438+
<span id="438">438</span>
439+
<span id="439">439</span>
440+
<span id="440">440</span>
441+
<span id="441">441</span>
429442
</pre><pre class="rust"><code><span class="comment">// This file is part of the uutils coreutils package.
430443
//
431444
// (c) Anthony Deschamps &lt;anthony.j.deschamps@gmail.com&gt;
@@ -436,7 +449,8 @@
436449

437450
// spell-checker:ignore (chrono) Datelike Timelike ; (format) DATEFILE MMDDhhmm ; (vars) datetime datetimes
438451

439-
</span><span class="kw">use </span>chrono::{DateTime, FixedOffset, Local, Offset, Utc};
452+
</span><span class="kw">use </span>chrono::format::{Item, StrftimeItems};
453+
<span class="kw">use </span>chrono::{DateTime, FixedOffset, Local, Offset, Utc};
440454
<span class="attribute">#[cfg(windows)]
441455
</span><span class="kw">use </span>chrono::{Datelike, Timelike};
442456
<span class="kw">use </span>clap::{crate_version, Arg, ArgAction, Command};
@@ -671,7 +685,19 @@
671685
<span class="prelude-val">Ok</span>(date) =&gt; {
672686
<span class="comment">// GNU `date` uses `%N` for nano seconds, however crate::chrono uses `%f`
673687
</span><span class="kw">let </span>format_string = <span class="kw-2">&amp;</span>format_string.replace(<span class="string">&quot;%N&quot;</span>, <span class="string">&quot;%f&quot;</span>);
674-
<span class="kw">let </span>formatted = date.format(format_string).to_string().replace(<span class="string">&quot;%f&quot;</span>, <span class="string">&quot;%N&quot;</span>);
688+
<span class="comment">// Hack to work around panic in chrono,
689+
// TODO - remove when a fix for https://github.com/chronotope/chrono/issues/623 is released
690+
</span><span class="kw">let </span>format_items = StrftimeItems::new(format_string);
691+
<span class="kw">if </span>format_items.clone().any(|i| i == Item::Error) {
692+
<span class="kw">return </span><span class="prelude-val">Err</span>(USimpleError::new(
693+
<span class="number">1</span>,
694+
<span class="macro">format!</span>(<span class="string">&quot;invalid format {}&quot;</span>, format_string.replace(<span class="string">&quot;%f&quot;</span>, <span class="string">&quot;%N&quot;</span>)),
695+
));
696+
}
697+
<span class="kw">let </span>formatted = date
698+
.format_with_items(format_items)
699+
.to_string()
700+
.replace(<span class="string">&quot;%f&quot;</span>, <span class="string">&quot;%N&quot;</span>);
675701
<span class="macro">println!</span>(<span class="string">&quot;{}&quot;</span>, formatted);
676702
}
677703
<span class="prelude-val">Err</span>((input, _err)) =&gt; <span class="macro">show_error!</span>(<span class="string">&quot;invalid date {}&quot;</span>, input.quote()),

‎dev/src/uu_dd/parseargs.rs.html

+1-1
Original file line numberDiff line numberDiff line change
@@ -1149,7 +1149,7 @@
11491149
<span class="kw">let </span>(num, multiplier) = <span class="kw">match </span>(s.find(<span class="string">&#39;c&#39;</span>), s.rfind(<span class="string">&#39;w&#39;</span>), s.rfind(<span class="string">&#39;b&#39;</span>)) {
11501150
(<span class="prelude-val">None</span>, <span class="prelude-val">None</span>, <span class="prelude-val">None</span>) =&gt; <span class="kw">match </span>parser.parse(s) {
11511151
<span class="prelude-val">Ok</span>(n) =&gt; (n, <span class="number">1</span>),
1152-
<span class="prelude-val">Err</span>(ParseSizeError::InvalidSuffix(<span class="kw">_</span>)) | <span class="prelude-val">Err</span>(ParseSizeError::ParseFailure(<span class="kw">_</span>)) =&gt; {
1152+
<span class="prelude-val">Err</span>(ParseSizeError::InvalidSuffix(<span class="kw">_</span>) | ParseSizeError::ParseFailure(<span class="kw">_</span>)) =&gt; {
11531153
<span class="kw">return </span><span class="prelude-val">Err</span>(ParseError::InvalidNumber(full.to_string()))
11541154
}
11551155
<span class="prelude-val">Err</span>(ParseSizeError::SizeTooBig(<span class="kw">_</span>)) =&gt; {

‎dev/src/uu_numfmt/options.rs.html

+2-2
Original file line numberDiff line numberDiff line change
@@ -477,7 +477,7 @@
477477
}
478478

479479
<span class="comment">// GNU numfmt allows to mix the characters &quot; &quot;, &quot;&#39;&quot;, and &quot;0&quot; in any way, so we do the same
480-
</span><span class="kw">while </span><span class="macro">matches!</span>(iter.peek(), <span class="prelude-val">Some</span>(<span class="string">&#39; &#39;</span>) | <span class="prelude-val">Some</span>(<span class="string">&#39;\&#39;&#39;</span>) | <span class="prelude-val">Some</span>(<span class="string">&#39;0&#39;</span>)) {
480+
</span><span class="kw">while </span><span class="macro">matches!</span>(iter.peek(), <span class="prelude-val">Some</span>(<span class="string">&#39; &#39; </span>| <span class="string">&#39;\&#39;&#39; </span>| <span class="string">&#39;0&#39;</span>)) {
481481
<span class="kw">match </span>iter.next().unwrap() {
482482
<span class="string">&#39; &#39; </span>=&gt; (),
483483
<span class="string">&#39;\&#39;&#39; </span>=&gt; options.grouping = <span class="bool-val">true</span>,
@@ -520,7 +520,7 @@
520520
<span class="kw">if let </span><span class="prelude-val">Some</span>(<span class="string">&#39;.&#39;</span>) = iter.peek() {
521521
iter.next();
522522

523-
<span class="kw">if </span><span class="macro">matches!</span>(iter.peek(), <span class="prelude-val">Some</span>(<span class="string">&#39; &#39;</span>) | <span class="prelude-val">Some</span>(<span class="string">&#39;+&#39;</span>) | <span class="prelude-val">Some</span>(<span class="string">&#39;-&#39;</span>)) {
523+
<span class="kw">if </span><span class="macro">matches!</span>(iter.peek(), <span class="prelude-val">Some</span>(<span class="string">&#39; &#39; </span>| <span class="string">&#39;+&#39; </span>| <span class="string">&#39;-&#39;</span>)) {
524524
<span class="kw">return </span><span class="prelude-val">Err</span>(<span class="macro">format!</span>(<span class="string">&quot;invalid precision in format &#39;{}&#39;&quot;</span>, s));
525525
}
526526

‎dev/src/uu_od/parse_formats.rs.html

+5-9
Original file line numberDiff line numberDiff line change
@@ -535,8 +535,6 @@
535535
<span id="535">535</span>
536536
<span id="536">536</span>
537537
<span id="537">537</span>
538-
<span id="538">538</span>
539-
<span id="539">539</span>
540538
</pre><pre class="rust"><code><span class="comment">// spell-checker:ignore formatteriteminfo docopt fvox fvoxw vals acdx
541539

542540
</span><span class="kw">use </span>uucore::display::Quotable;
@@ -594,28 +592,26 @@
594592

595593
(FormatType::DecimalInt, <span class="number">1</span>) =&gt; <span class="prelude-val">Some</span>(FORMAT_ITEM_DEC8S),
596594
(FormatType::DecimalInt, <span class="number">2</span>) =&gt; <span class="prelude-val">Some</span>(FORMAT_ITEM_DEC16S),
597-
(FormatType::DecimalInt, <span class="number">0</span>) | (FormatType::DecimalInt, <span class="number">4</span>) =&gt; <span class="prelude-val">Some</span>(FORMAT_ITEM_DEC32S),
595+
(FormatType::DecimalInt, <span class="number">0 </span>| <span class="number">4</span>) =&gt; <span class="prelude-val">Some</span>(FORMAT_ITEM_DEC32S),
598596
(FormatType::DecimalInt, <span class="number">8</span>) =&gt; <span class="prelude-val">Some</span>(FORMAT_ITEM_DEC64S),
599597

600598
(FormatType::OctalInt, <span class="number">1</span>) =&gt; <span class="prelude-val">Some</span>(FORMAT_ITEM_OCT8),
601599
(FormatType::OctalInt, <span class="number">2</span>) =&gt; <span class="prelude-val">Some</span>(FORMAT_ITEM_OCT16),
602-
(FormatType::OctalInt, <span class="number">0</span>) | (FormatType::OctalInt, <span class="number">4</span>) =&gt; <span class="prelude-val">Some</span>(FORMAT_ITEM_OCT32),
600+
(FormatType::OctalInt, <span class="number">0 </span>| <span class="number">4</span>) =&gt; <span class="prelude-val">Some</span>(FORMAT_ITEM_OCT32),
603601
(FormatType::OctalInt, <span class="number">8</span>) =&gt; <span class="prelude-val">Some</span>(FORMAT_ITEM_OCT64),
604602

605603
(FormatType::UnsignedInt, <span class="number">1</span>) =&gt; <span class="prelude-val">Some</span>(FORMAT_ITEM_DEC8U),
606604
(FormatType::UnsignedInt, <span class="number">2</span>) =&gt; <span class="prelude-val">Some</span>(FORMAT_ITEM_DEC16U),
607-
(FormatType::UnsignedInt, <span class="number">0</span>) | (FormatType::UnsignedInt, <span class="number">4</span>) =&gt; <span class="prelude-val">Some</span>(FORMAT_ITEM_DEC32U),
605+
(FormatType::UnsignedInt, <span class="number">0 </span>| <span class="number">4</span>) =&gt; <span class="prelude-val">Some</span>(FORMAT_ITEM_DEC32U),
608606
(FormatType::UnsignedInt, <span class="number">8</span>) =&gt; <span class="prelude-val">Some</span>(FORMAT_ITEM_DEC64U),
609607

610608
(FormatType::HexadecimalInt, <span class="number">1</span>) =&gt; <span class="prelude-val">Some</span>(FORMAT_ITEM_HEX8),
611609
(FormatType::HexadecimalInt, <span class="number">2</span>) =&gt; <span class="prelude-val">Some</span>(FORMAT_ITEM_HEX16),
612-
(FormatType::HexadecimalInt, <span class="number">0</span>) | (FormatType::HexadecimalInt, <span class="number">4</span>) =&gt; {
613-
<span class="prelude-val">Some</span>(FORMAT_ITEM_HEX32)
614-
}
610+
(FormatType::HexadecimalInt, <span class="number">0 </span>| <span class="number">4</span>) =&gt; <span class="prelude-val">Some</span>(FORMAT_ITEM_HEX32),
615611
(FormatType::HexadecimalInt, <span class="number">8</span>) =&gt; <span class="prelude-val">Some</span>(FORMAT_ITEM_HEX64),
616612

617613
(FormatType::Float, <span class="number">2</span>) =&gt; <span class="prelude-val">Some</span>(FORMAT_ITEM_F16),
618-
(FormatType::Float, <span class="number">0</span>) | (FormatType::Float, <span class="number">4</span>) =&gt; <span class="prelude-val">Some</span>(FORMAT_ITEM_F32),
614+
(FormatType::Float, <span class="number">0 </span>| <span class="number">4</span>) =&gt; <span class="prelude-val">Some</span>(FORMAT_ITEM_F32),
619615
(FormatType::Float, <span class="number">8</span>) =&gt; <span class="prelude-val">Some</span>(FORMAT_ITEM_F64),
620616

621617
<span class="kw">_ </span>=&gt; <span class="prelude-val">None</span>,

‎dev/src/uu_od/parse_nrofbytes.rs.html

+4-4
Original file line numberDiff line numberDiff line change
@@ -111,11 +111,11 @@
111111
multiply = <span class="number">512</span>;
112112
len -= <span class="number">1</span>;
113113
}
114-
<span class="prelude-val">Some</span>(<span class="string">&#39;k&#39;</span>) | <span class="prelude-val">Some</span>(<span class="string">&#39;K&#39;</span>) =&gt; {
114+
<span class="prelude-val">Some</span>(<span class="string">&#39;k&#39; </span>| <span class="string">&#39;K&#39;</span>) =&gt; {
115115
multiply = <span class="number">1024</span>;
116116
len -= <span class="number">1</span>;
117117
}
118-
<span class="prelude-val">Some</span>(<span class="string">&#39;m&#39;</span>) | <span class="prelude-val">Some</span>(<span class="string">&#39;M&#39;</span>) =&gt; {
118+
<span class="prelude-val">Some</span>(<span class="string">&#39;m&#39; </span>| <span class="string">&#39;M&#39;</span>) =&gt; {
119119
multiply = <span class="number">1024 </span>* <span class="number">1024</span>;
120120
len -= <span class="number">1</span>;
121121
}
@@ -141,8 +141,8 @@
141141
<span class="prelude-val">Some</span>(<span class="string">&#39;B&#39;</span>) <span class="kw">if </span>radix != <span class="number">16 </span>=&gt; {
142142
len -= <span class="number">2</span>;
143143
multiply = <span class="kw">match </span>ends_with.next() {
144-
<span class="prelude-val">Some</span>(<span class="string">&#39;k&#39;</span>) | <span class="prelude-val">Some</span>(<span class="string">&#39;K&#39;</span>) =&gt; <span class="number">1000</span>,
145-
<span class="prelude-val">Some</span>(<span class="string">&#39;m&#39;</span>) | <span class="prelude-val">Some</span>(<span class="string">&#39;M&#39;</span>) =&gt; <span class="number">1000 </span>* <span class="number">1000</span>,
144+
<span class="prelude-val">Some</span>(<span class="string">&#39;k&#39; </span>| <span class="string">&#39;K&#39;</span>) =&gt; <span class="number">1000</span>,
145+
<span class="prelude-val">Some</span>(<span class="string">&#39;m&#39; </span>| <span class="string">&#39;M&#39;</span>) =&gt; <span class="number">1000 </span>* <span class="number">1000</span>,
146146
<span class="prelude-val">Some</span>(<span class="string">&#39;G&#39;</span>) =&gt; <span class="number">1000 </span>* <span class="number">1000 </span>* <span class="number">1000</span>,
147147
<span class="attribute">#[cfg(target_pointer_width = <span class="string">&quot;64&quot;</span>)]
148148
</span><span class="prelude-val">Some</span>(<span class="string">&#39;T&#39;</span>) =&gt; <span class="number">1000 </span>* <span class="number">1000 </span>* <span class="number">1000 </span>* <span class="number">1000</span>,

‎dev/src/uu_sort/sort.rs.html

+2-2
Original file line numberDiff line numberDiff line change
@@ -3225,7 +3225,7 @@
32253225
matches
32263226
.get_one::&lt;String&gt;(options::check::CHECK)
32273227
.map(|s| s.as_str()),
3228-
<span class="prelude-val">Some</span>(options::check::SILENT) | <span class="prelude-val">Some</span>(options::check::QUIET)
3228+
<span class="prelude-val">Some</span>(options::check::SILENT | options::check::QUIET)
32293229
)
32303230
{
32313231
settings.check_silent = <span class="bool-val">true</span>;
@@ -3719,7 +3719,7 @@
37193719

37203720
<span class="kw">let </span>first = char_indices.peek();
37213721

3722-
<span class="kw">if </span><span class="macro">matches!</span>(first, <span class="prelude-val">Some</span>((<span class="kw">_</span>, NEGATIVE)) | <span class="prelude-val">Some</span>((<span class="kw">_</span>, POSITIVE))) {
3722+
<span class="kw">if </span><span class="macro">matches!</span>(first, <span class="prelude-val">Some</span>((<span class="kw">_</span>, NEGATIVE) | (<span class="kw">_</span>, POSITIVE))) {
37233723
char_indices.next();
37243724
}
37253725

0 commit comments

Comments
 (0)