Skip to content

Commit 2936434

Browse files
sylvestresylvestre
committed
deploy: f0e8d44 
1 parent 59e99b3 commit 2936434

14 files changed

+47
-37
lines changed

‎dev/src/uu_dircolors/dircolors.rs.html

+26-4
Original file line numberDiff line numberDiff line change
@@ -441,6 +441,17 @@
441441
<a href="#441" id="441">441</a>
442442
<a href="#442" id="442">442</a>
443443
<a href="#443" id="443">443</a>
444+
<a href="#444" id="444">444</a>
445+
<a href="#445" id="445">445</a>
446+
<a href="#446" id="446">446</a>
447+
<a href="#447" id="447">447</a>
448+
<a href="#448" id="448">448</a>
449+
<a href="#449" id="449">449</a>
450+
<a href="#450" id="450">450</a>
451+
<a href="#451" id="451">451</a>
452+
<a href="#452" id="452">452</a>
453+
<a href="#453" id="453">453</a>
454+
<a href="#454" id="454">454</a>
444455
</pre><pre class="rust"><code><span class="comment">// This file is part of the uutils coreutils package.
445456
//
446457
// (c) Jian Zeng &lt;anonymousknight96@gmail.com&gt;
@@ -455,6 +466,7 @@
455466
<span class="kw">use </span>std::env;
456467
<span class="kw">use </span>std::fs::File;
457468
<span class="kw">use </span>std::io::{BufRead, BufReader};
469+
<span class="kw">use </span>std::path::Path;
458470

459471
<span class="kw">use </span>clap::{crate_version, Arg, ArgAction, Command};
460472
<span class="kw">use </span>uucore::display::Quotable;
@@ -485,7 +497,6 @@
485497
}
486498

487499
<span class="kw">pub fn </span>guess_syntax() -&gt; OutputFmt {
488-
<span class="kw">use </span>std::path::Path;
489500
<span class="kw">match </span>env::var(<span class="string">&quot;SHELL&quot;</span>) {
490501
<span class="prelude-val">Ok</span>(<span class="kw-2">ref </span>s) <span class="kw">if </span>!s.is_empty() =&gt; {
491502
<span class="kw">let </span>shell_path: <span class="kw-2">&amp;</span>Path = s.as_ref();
@@ -581,15 +592,26 @@
581592
<span class="kw">let </span>fin = BufReader::new(std::io::stdin());
582593
result = parse(fin.lines().filter_map(Result::ok), <span class="kw-2">&amp;</span>out_format, files[<span class="number">0</span>]);
583594
} <span class="kw">else </span>{
584-
<span class="kw">match </span>File::open(files[<span class="number">0</span>]) {
595+
<span class="kw">let </span>path = Path::new(files[<span class="number">0</span>]);
596+
<span class="kw">if </span>path.is_dir() {
597+
<span class="kw">return </span><span class="prelude-val">Err</span>(USimpleError::new(
598+
<span class="number">2</span>,
599+
<span class="macro">format!</span>(<span class="string">&quot;expected file, got directory {}&quot;</span>, path.quote()),
600+
));
601+
}
602+
<span class="kw">match </span>File::open(path) {
585603
<span class="prelude-val">Ok</span>(f) =&gt; {
586604
<span class="kw">let </span>fin = BufReader::new(f);
587-
result = parse(fin.lines().filter_map(Result::ok), <span class="kw-2">&amp;</span>out_format, files[<span class="number">0</span>]);
605+
result = parse(
606+
fin.lines().map_while(Result::ok),
607+
<span class="kw-2">&amp;</span>out_format,
608+
<span class="kw-2">&amp;</span>path.to_string_lossy(),
609+
);
588610
}
589611
<span class="prelude-val">Err</span>(e) =&gt; {
590612
<span class="kw">return </span><span class="prelude-val">Err</span>(USimpleError::new(
591613
<span class="number">1</span>,
592-
<span class="macro">format!</span>(<span class="string">&quot;{}: {}&quot;</span>, files[<span class="number">0</span>].maybe_quote(), e),
614+
<span class="macro">format!</span>(<span class="string">&quot;{}: {}&quot;</span>, path.maybe_quote(), e),
593615
));
594616
}
595617
}

‎dev/src/uu_true/true.rs.html

+2-12
Original file line numberDiff line numberDiff line change
@@ -62,11 +62,6 @@
6262
<a href="#62" id="62">62</a>
6363
<a href="#63" id="63">63</a>
6464
<a href="#64" id="64">64</a>
65-
<a href="#65" id="65">65</a>
66-
<a href="#66" id="66">66</a>
67-
<a href="#67" id="67">67</a>
68-
<a href="#68" id="68">68</a>
69-
<a href="#69" id="69">69</a>
7065
</pre><pre class="rust"><code><span class="comment">// * This file is part of the uutils coreutils package.
7166
// *
7267
// * (c) Jordi Boggiano &lt;j.boggiano@seld.be&gt;
@@ -76,14 +71,9 @@
7671
</span><span class="kw">use </span>clap::{Arg, ArgAction, Command};
7772
<span class="kw">use </span>std::{ffi::OsString, io::Write};
7873
<span class="kw">use </span>uucore::error::{set_exit_code, UResult};
74+
<span class="kw">use </span>uucore::help_about;
7975

80-
<span class="kw">static </span>ABOUT: <span class="kw-2">&amp;</span>str = <span class="string">&quot;\
81-
Returns true, a successful exit status.
82-
83-
Immediately returns with the exit status `0`, except when invoked with one of the recognized
84-
options. In those cases it will try to write the help or version text. Any IO error during this
85-
operation causes the program to return `1` instead.
86-
&quot;</span>;
76+
<span class="kw">const </span>ABOUT: <span class="kw-2">&amp;</span>str = <span class="macro">help_about!</span>(<span class="string">&quot;true.md&quot;</span>);
8777

8878
<span class="attr">#[uucore::main]
8979
</span><span class="kw">pub fn </span>uumain(args: <span class="kw">impl </span>uucore::Args) -&gt; UResult&lt;()&gt; {

‎dev/src/uu_unexpand/unexpand.rs.html

+3-5
Original file line numberDiff line numberDiff line change
@@ -431,7 +431,6 @@
431431
<a href="#431" id="431">431</a>
432432
<a href="#432" id="432">432</a>
433433
<a href="#433" id="433">433</a>
434-
<a href="#434" id="434">434</a>
435434
</pre><pre class="rust"><code><span class="comment">// * This file is part of the uutils coreutils package.
436435
// *
437436
// * (c) Virgile Andreani &lt;virgile.andreani@anbuco.fr&gt;
@@ -453,11 +452,10 @@
453452
<span class="kw">use </span>unicode_width::UnicodeWidthChar;
454453
<span class="kw">use </span>uucore::display::Quotable;
455454
<span class="kw">use </span>uucore::error::{FromIo, UError, UResult};
456-
<span class="kw">use </span>uucore::{crash, crash_if_err, format_usage};
455+
<span class="kw">use </span>uucore::{crash, crash_if_err, format_usage, help_about, help_usage};
457456

458-
<span class="kw">static </span>USAGE: <span class="kw-2">&amp;</span>str = <span class="string">&quot;{} [OPTION]... [FILE]...&quot;</span>;
459-
<span class="kw">static </span>ABOUT: <span class="kw-2">&amp;</span>str = <span class="string">&quot;Convert blanks in each FILE to tabs, writing to standard output.\n\n\
460-
With no FILE, or when FILE is -, read standard input.&quot;</span>;
457+
<span class="kw">const </span>USAGE: <span class="kw-2">&amp;</span>str = <span class="macro">help_usage!</span>(<span class="string">&quot;unexpand.md&quot;</span>);
458+
<span class="kw">const </span>ABOUT: <span class="kw-2">&amp;</span>str = <span class="macro">help_about!</span>(<span class="string">&quot;unexpand.md&quot;</span>);
461459

462460
<span class="kw">const </span>DEFAULT_TABSTOP: usize = <span class="number">8</span>;
463461

0 commit comments

Comments
 (0)