Skip to content

Commit 8cb5084

Browse files
sylvestresylvestre
committed
deploy: 055173b 
1 parent e806fa7 commit 8cb5084

13 files changed

+43
-65
lines changed

‎dev/src/uu_cp/cp.rs.html

Lines changed: 27 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -1600,6 +1600,12 @@
16001600
<span id="1598">1598</span>
16011601
<span id="1599">1599</span>
16021602
<span id="1600">1600</span>
1603+
<span id="1601">1601</span>
1604+
<span id="1602">1602</span>
1605+
<span id="1603">1603</span>
1606+
<span id="1604">1604</span>
1607+
<span id="1605">1605</span>
1608+
<span id="1606">1606</span>
16031609
</pre><pre class="rust"><code><span class="attribute">#![<span class="ident">allow</span>(<span class="ident">clippy::missing_safety_doc</span>)]</span>
16041610

16051611
<span class="comment">// This file is part of the uutils coreutils package.</span>
@@ -1896,6 +1902,13 @@
18961902
];
18971903

18981904
<span class="kw">pub</span> <span class="kw">fn</span> <span class="ident">uu_app</span><span class="op">&lt;</span><span class="lifetime">&#39;a</span><span class="op">&gt;</span>() -&gt; <span class="ident">App</span><span class="op">&lt;</span><span class="lifetime">&#39;a</span><span class="op">&gt;</span> {
1905+
<span class="kw">const</span> <span class="ident">MODE_ARGS</span>: <span class="kw-2">&amp;</span>[<span class="kw-2">&amp;</span><span class="ident">str</span>] <span class="op">=</span> <span class="kw-2">&amp;</span>[
1906+
<span class="ident">options::LINK</span>,
1907+
<span class="ident">options::REFLINK</span>,
1908+
<span class="ident">options::SYMBOLIC_LINK</span>,
1909+
<span class="ident">options::ATTRIBUTES_ONLY</span>,
1910+
<span class="ident">options::COPY_CONTENTS</span>,
1911+
];
18991912
<span class="ident">App::new</span>(<span class="ident">uucore::util_name</span>())
19001913
.<span class="ident">version</span>(<span class="macro">crate_version!</span>())
19011914
.<span class="ident">about</span>(<span class="ident">ABOUT</span>)
@@ -1916,17 +1929,17 @@
19161929
.<span class="ident">arg</span>(<span class="ident">Arg::new</span>(<span class="ident">options::INTERACTIVE</span>)
19171930
.<span class="ident">short</span>(<span class="string">&#39;i&#39;</span>)
19181931
.<span class="ident">long</span>(<span class="ident">options::INTERACTIVE</span>)
1919-
.<span class="ident">conflicts_with</span>(<span class="ident">options::NO_CLOBBER</span>)
1932+
.<span class="ident">overrides_with</span>(<span class="ident">options::NO_CLOBBER</span>)
19201933
.<span class="ident">help</span>(<span class="string">&quot;ask before overwriting files&quot;</span>))
19211934
.<span class="ident">arg</span>(<span class="ident">Arg::new</span>(<span class="ident">options::LINK</span>)
19221935
.<span class="ident">short</span>(<span class="string">&#39;l&#39;</span>)
19231936
.<span class="ident">long</span>(<span class="ident">options::LINK</span>)
1924-
.<span class="ident">overrides_with</span>(<span class="ident">options::REFLINK</span>)
1937+
.<span class="ident">overrides_with_all</span>(<span class="ident">MODE_ARGS</span>)
19251938
.<span class="ident">help</span>(<span class="string">&quot;hard-link files instead of copying&quot;</span>))
19261939
.<span class="ident">arg</span>(<span class="ident">Arg::new</span>(<span class="ident">options::NO_CLOBBER</span>)
19271940
.<span class="ident">short</span>(<span class="string">&#39;n&#39;</span>)
19281941
.<span class="ident">long</span>(<span class="ident">options::NO_CLOBBER</span>)
1929-
.<span class="ident">conflicts_with</span>(<span class="ident">options::INTERACTIVE</span>)
1942+
.<span class="ident">overrides_with</span>(<span class="ident">options::INTERACTIVE</span>)
19301943
.<span class="ident">help</span>(<span class="string">&quot;don&#39;t overwrite a file that already exists&quot;</span>))
19311944
.<span class="ident">arg</span>(<span class="ident">Arg::new</span>(<span class="ident">options::RECURSIVE</span>)
19321945
.<span class="ident">short</span>(<span class="string">&#39;r&#39;</span>)
@@ -1946,8 +1959,7 @@
19461959
.<span class="ident">arg</span>(<span class="ident">Arg::new</span>(<span class="ident">options::SYMBOLIC_LINK</span>)
19471960
.<span class="ident">short</span>(<span class="string">&#39;s&#39;</span>)
19481961
.<span class="ident">long</span>(<span class="ident">options::SYMBOLIC_LINK</span>)
1949-
.<span class="ident">conflicts_with</span>(<span class="ident">options::LINK</span>)
1950-
.<span class="ident">overrides_with</span>(<span class="ident">options::REFLINK</span>)
1962+
.<span class="ident">overrides_with_all</span>(<span class="ident">MODE_ARGS</span>)
19511963
.<span class="ident">help</span>(<span class="string">&quot;make symbolic links instead of copying&quot;</span>))
19521964
.<span class="ident">arg</span>(<span class="ident">Arg::new</span>(<span class="ident">options::FORCE</span>)
19531965
.<span class="ident">short</span>(<span class="string">&#39;f&#39;</span>)
@@ -1957,7 +1969,7 @@
19571969
Currently not implemented for Windows.&quot;</span>))
19581970
.<span class="ident">arg</span>(<span class="ident">Arg::new</span>(<span class="ident">options::REMOVE_DESTINATION</span>)
19591971
.<span class="ident">long</span>(<span class="ident">options::REMOVE_DESTINATION</span>)
1960-
.<span class="ident">conflicts_with</span>(<span class="ident">options::FORCE</span>)
1972+
.<span class="ident">overrides_with</span>(<span class="ident">options::FORCE</span>)
19611973
.<span class="ident">help</span>(<span class="string">&quot;remove each existing destination file before attempting to open it \
19621974
(contrast with --force). On Windows, current only works for writeable files.&quot;</span>))
19631975
.<span class="ident">arg</span>(<span class="ident">backup_control::arguments::backup</span>())
@@ -1972,11 +1984,11 @@
19721984
.<span class="ident">long</span>(<span class="ident">options::REFLINK</span>)
19731985
.<span class="ident">takes_value</span>(<span class="bool-val">true</span>)
19741986
.<span class="ident">value_name</span>(<span class="string">&quot;WHEN&quot;</span>)
1987+
.<span class="ident">overrides_with_all</span>(<span class="ident">MODE_ARGS</span>)
19751988
.<span class="ident">help</span>(<span class="string">&quot;control clone/CoW copies. See below&quot;</span>))
19761989
.<span class="ident">arg</span>(<span class="ident">Arg::new</span>(<span class="ident">options::ATTRIBUTES_ONLY</span>)
19771990
.<span class="ident">long</span>(<span class="ident">options::ATTRIBUTES_ONLY</span>)
1978-
.<span class="ident">conflicts_with</span>(<span class="ident">options::COPY_CONTENTS</span>)
1979-
.<span class="ident">overrides_with</span>(<span class="ident">options::REFLINK</span>)
1991+
.<span class="ident">overrides_with_all</span>(<span class="ident">MODE_ARGS</span>)
19801992
.<span class="ident">help</span>(<span class="string">&quot;Don&#39;t copy the file data, just the attributes&quot;</span>))
19811993
.<span class="ident">arg</span>(<span class="ident">Arg::new</span>(<span class="ident">options::PRESERVE</span>)
19821994
.<span class="ident">long</span>(<span class="ident">options::PRESERVE</span>)
@@ -1986,21 +1998,21 @@
19861998
.<span class="ident">possible_values</span>(<span class="ident">PRESERVABLE_ATTRIBUTES</span>)
19871999
.<span class="ident">min_values</span>(<span class="number">0</span>)
19882000
.<span class="ident">value_name</span>(<span class="string">&quot;ATTR_LIST&quot;</span>)
1989-
.<span class="ident">conflicts_with_all</span>(<span class="kw-2">&amp;</span>[<span class="ident">options::PRESERVE_DEFAULT_ATTRIBUTES</span>, <span class="ident">options::NO_PRESERVE</span>])
2001+
.<span class="ident">overrides_with_all</span>(<span class="kw-2">&amp;</span>[<span class="ident">options::ARCHIVE</span>, <span class="ident">options::PRESERVE_DEFAULT_ATTRIBUTES</span>, <span class="ident">options::NO_PRESERVE</span>])
19902002
<span class="comment">// -d sets this option</span>
19912003
<span class="comment">// --archive sets this option</span>
19922004
.<span class="ident">help</span>(<span class="string">&quot;Preserve the specified attributes (default: mode, ownership (unix only), timestamps), \
19932005
if possible additional attributes: context, links, xattr, all&quot;</span>))
19942006
.<span class="ident">arg</span>(<span class="ident">Arg::new</span>(<span class="ident">options::PRESERVE_DEFAULT_ATTRIBUTES</span>)
19952007
.<span class="ident">short</span>(<span class="string">&#39;p&#39;</span>)
19962008
.<span class="ident">long</span>(<span class="ident">options::PRESERVE_DEFAULT_ATTRIBUTES</span>)
1997-
.<span class="ident">conflicts_with_all</span>(<span class="kw-2">&amp;</span>[<span class="ident">options::PRESERVE</span>, <span class="ident">options::NO_PRESERVE</span>, <span class="ident">options::ARCHIVE</span>])
2009+
.<span class="ident">overrides_with_all</span>(<span class="kw-2">&amp;</span>[<span class="ident">options::PRESERVE</span>, <span class="ident">options::NO_PRESERVE</span>, <span class="ident">options::ARCHIVE</span>])
19982010
.<span class="ident">help</span>(<span class="string">&quot;same as --preserve=mode,ownership(unix only),timestamps&quot;</span>))
19992011
.<span class="ident">arg</span>(<span class="ident">Arg::new</span>(<span class="ident">options::NO_PRESERVE</span>)
20002012
.<span class="ident">long</span>(<span class="ident">options::NO_PRESERVE</span>)
20012013
.<span class="ident">takes_value</span>(<span class="bool-val">true</span>)
20022014
.<span class="ident">value_name</span>(<span class="string">&quot;ATTR_LIST&quot;</span>)
2003-
.<span class="ident">conflicts_with_all</span>(<span class="kw-2">&amp;</span>[<span class="ident">options::PRESERVE_DEFAULT_ATTRIBUTES</span>, <span class="ident">options::PRESERVE</span>, <span class="ident">options::ARCHIVE</span>])
2015+
.<span class="ident">overrides_with_all</span>(<span class="kw-2">&amp;</span>[<span class="ident">options::PRESERVE_DEFAULT_ATTRIBUTES</span>, <span class="ident">options::PRESERVE</span>, <span class="ident">options::ARCHIVE</span>])
20042016
.<span class="ident">help</span>(<span class="string">&quot;don&#39;t preserve the specified attributes&quot;</span>))
20052017
.<span class="ident">arg</span>(<span class="ident">Arg::new</span>(<span class="ident">options::PARENTS</span>)
20062018
.<span class="ident">long</span>(<span class="ident">options::PARENTS</span>)
@@ -2009,18 +2021,18 @@
20092021
.<span class="ident">arg</span>(<span class="ident">Arg::new</span>(<span class="ident">options::NO_DEREFERENCE</span>)
20102022
.<span class="ident">short</span>(<span class="string">&#39;P&#39;</span>)
20112023
.<span class="ident">long</span>(<span class="ident">options::NO_DEREFERENCE</span>)
2012-
.<span class="ident">conflicts_with</span>(<span class="ident">options::DEREFERENCE</span>)
2024+
.<span class="ident">overrides_with</span>(<span class="ident">options::DEREFERENCE</span>)
20132025
<span class="comment">// -d sets this option</span>
20142026
.<span class="ident">help</span>(<span class="string">&quot;never follow symbolic links in SOURCE&quot;</span>))
20152027
.<span class="ident">arg</span>(<span class="ident">Arg::new</span>(<span class="ident">options::DEREFERENCE</span>)
20162028
.<span class="ident">short</span>(<span class="string">&#39;L&#39;</span>)
20172029
.<span class="ident">long</span>(<span class="ident">options::DEREFERENCE</span>)
2018-
.<span class="ident">conflicts_with</span>(<span class="ident">options::NO_DEREFERENCE</span>)
2030+
.<span class="ident">overrides_with</span>(<span class="ident">options::NO_DEREFERENCE</span>)
20192031
.<span class="ident">help</span>(<span class="string">&quot;always follow symbolic links in SOURCE&quot;</span>))
20202032
.<span class="ident">arg</span>(<span class="ident">Arg::new</span>(<span class="ident">options::ARCHIVE</span>)
20212033
.<span class="ident">short</span>(<span class="string">&#39;a&#39;</span>)
20222034
.<span class="ident">long</span>(<span class="ident">options::ARCHIVE</span>)
2023-
.<span class="ident">conflicts_with_all</span>(<span class="kw-2">&amp;</span>[<span class="ident">options::PRESERVE_DEFAULT_ATTRIBUTES</span>, <span class="ident">options::PRESERVE</span>, <span class="ident">options::NO_PRESERVE</span>])
2035+
.<span class="ident">overrides_with_all</span>(<span class="kw-2">&amp;</span>[<span class="ident">options::PRESERVE_DEFAULT_ATTRIBUTES</span>, <span class="ident">options::PRESERVE</span>, <span class="ident">options::NO_PRESERVE</span>])
20242036
.<span class="ident">help</span>(<span class="string">&quot;Same as -dR --preserve=all&quot;</span>))
20252037
.<span class="ident">arg</span>(<span class="ident">Arg::new</span>(<span class="ident">options::NO_DEREFERENCE_PRESERVE_LINKS</span>)
20262038
.<span class="ident">short</span>(<span class="string">&#39;d&#39;</span>)
@@ -2033,7 +2045,7 @@
20332045
<span class="comment">// TODO: implement the following args</span>
20342046
.<span class="ident">arg</span>(<span class="ident">Arg::new</span>(<span class="ident">options::COPY_CONTENTS</span>)
20352047
.<span class="ident">long</span>(<span class="ident">options::COPY_CONTENTS</span>)
2036-
.<span class="ident">conflicts_with</span>(<span class="ident">options::ATTRIBUTES_ONLY</span>)
2048+
.<span class="ident">overrides_with</span>(<span class="ident">options::ATTRIBUTES_ONLY</span>)
20372049
.<span class="ident">help</span>(<span class="string">&quot;NotImplemented: copy contents of special files when recursive&quot;</span>))
20382050
.<span class="ident">arg</span>(<span class="ident">Arg::new</span>(<span class="ident">options::SPARSE</span>)
20392051
.<span class="ident">long</span>(<span class="ident">options::SPARSE</span>)

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

Lines changed: 4 additions & 38 deletions
Original file line numberDiff line numberDiff line change
@@ -433,23 +433,6 @@
433433
<span id="431">431</span>
434434
<span id="432">432</span>
435435
<span id="433">433</span>
436-
<span id="434">434</span>
437-
<span id="435">435</span>
438-
<span id="436">436</span>
439-
<span id="437">437</span>
440-
<span id="438">438</span>
441-
<span id="439">439</span>
442-
<span id="440">440</span>
443-
<span id="441">441</span>
444-
<span id="442">442</span>
445-
<span id="443">443</span>
446-
<span id="444">444</span>
447-
<span id="445">445</span>
448-
<span id="446">446</span>
449-
<span id="447">447</span>
450-
<span id="448">448</span>
451-
<span id="449">449</span>
452-
<span id="450">450</span>
453436
</pre><pre class="rust"><code><span class="comment">// This file is part of the uutils coreutils package.</span>
454437
<span class="comment">//</span>
455438
<span class="comment">// (c) Fangxu Hu &lt;framlog@gmail.com&gt;</span>
@@ -461,18 +444,14 @@
461444
<span class="kw">mod</span> <span class="ident">table</span>;
462445

463446
<span class="attribute">#[<span class="ident">cfg</span>(<span class="ident">unix</span>)]</span>
464-
<span class="kw">use</span> <span class="ident">uucore::fsext::statfs_fn</span>;
447+
<span class="kw">use</span> <span class="ident">uucore::fsext::statfs</span>;
465448
<span class="kw">use</span> <span class="ident">uucore::fsext</span>::{<span class="ident">read_fs_list</span>, <span class="ident">FsUsage</span>, <span class="ident">MountInfo</span>};
466449
<span class="kw">use</span> <span class="ident">uucore</span>::{<span class="ident">error::UResult</span>, <span class="ident">format_usage</span>};
467450

468451
<span class="kw">use</span> <span class="ident">clap</span>::{<span class="ident">crate_version</span>, <span class="ident">App</span>, <span class="ident">AppSettings</span>, <span class="ident">Arg</span>, <span class="ident">ArgMatches</span>};
469452

470453
<span class="kw">use</span> <span class="ident">std::collections::HashSet</span>;
471-
<span class="attribute">#[<span class="ident">cfg</span>(<span class="ident">unix</span>)]</span>
472-
<span class="kw">use</span> <span class="ident">std::ffi::CString</span>;
473454
<span class="kw">use</span> <span class="ident">std::iter::FromIterator</span>;
474-
<span class="attribute">#[<span class="ident">cfg</span>(<span class="ident">unix</span>)]</span>
475-
<span class="kw">use</span> <span class="ident">std::mem</span>;
476455

477456
<span class="attribute">#[<span class="ident">cfg</span>(<span class="ident">windows</span>)]</span>
478457
<span class="kw">use</span> <span class="ident">std::path::Path</span>;
@@ -635,23 +614,10 @@
635614
}
636615
};
637616
<span class="attribute">#[<span class="ident">cfg</span>(<span class="ident">unix</span>)]</span>
638-
<span class="kw">unsafe</span> {
639-
<span class="kw">let</span> <span class="ident">path</span> <span class="op">=</span> <span class="ident">CString::new</span>(<span class="ident">_stat_path</span>).<span class="ident">unwrap</span>();
640-
<span class="kw">let</span> <span class="kw-2">mut</span> <span class="ident">statvfs</span> <span class="op">=</span> <span class="ident">mem::zeroed</span>();
641-
<span class="kw">if</span> <span class="ident">statfs_fn</span>(<span class="ident">path</span>.<span class="ident">as_ptr</span>(), <span class="kw-2">&amp;mut</span> <span class="ident">statvfs</span>) <span class="op">&lt;</span> <span class="number">0</span> {
642-
<span class="prelude-val">None</span>
643-
} <span class="kw">else</span> {
644-
<span class="prelude-val">Some</span>(<span class="self">Self</span> {
645-
<span class="ident">mount_info</span>,
646-
<span class="ident">usage</span>: <span class="ident">FsUsage::new</span>(<span class="ident">statvfs</span>),
647-
})
648-
}
649-
}
617+
<span class="kw">let</span> <span class="ident">usage</span> <span class="op">=</span> <span class="ident">FsUsage::new</span>(<span class="ident">statfs</span>(<span class="ident">_stat_path</span>).<span class="ident">ok</span>()<span class="question-mark">?</span>);
650618
<span class="attribute">#[<span class="ident">cfg</span>(<span class="ident">windows</span>)]</span>
651-
<span class="prelude-val">Some</span>(<span class="self">Self</span> {
652-
<span class="ident">mount_info</span>,
653-
<span class="ident">usage</span>: <span class="ident">FsUsage::new</span>(<span class="ident">Path::new</span>(<span class="kw-2">&amp;</span><span class="ident">_stat_path</span>)),
654-
})
619+
<span class="kw">let</span> <span class="ident">usage</span> <span class="op">=</span> <span class="ident">FsUsage::new</span>(<span class="ident">Path::new</span>(<span class="kw-2">&amp;</span><span class="ident">_stat_path</span>));
620+
<span class="prelude-val">Some</span>(<span class="self">Self</span> { <span class="ident">mount_info</span>, <span class="ident">usage</span> })
655621
}
656622
}
657623

0 commit comments

Comments
 (0)