Skip to content

Commit 3a754cc

Browse files
sylvestresylvestre
committed
deploy: 055173b 
1 parent b63cd0b commit 3a754cc

File tree

23 files changed

+139
-103
lines changed

23 files changed

+139
-103
lines changed

‎dev/src/uu_chcon/chcon.rs.html

Lines changed: 7 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -764,8 +764,6 @@
764764
<span id="762">762</span>
765765
<span id="763">763</span>
766766
<span id="764">764</span>
767-
<span id="765">765</span>
768-
<span id="766">766</span>
769767
</pre><pre class="rust"><code><span class="comment">// spell-checker:ignore (vars) RFILE</span>
770768

771769
<span class="attribute">#![<span class="ident">allow</span>(<span class="ident">clippy::upper_case_acronyms</span>)]</span>
@@ -1176,23 +1174,21 @@
11761174
<span class="kw">impl</span> <span class="ident">RecursiveMode</span> {
11771175
<span class="kw">fn</span> <span class="ident">is_recursive</span>(<span class="self">self</span>) -&gt; <span class="ident">bool</span> {
11781176
<span class="kw">match</span> <span class="self">self</span> {
1179-
<span class="ident">RecursiveMode::NotRecursive</span> =&gt; <span class="bool-val">false</span>,
1177+
<span class="ident"><span class="self">Self</span>::NotRecursive</span> =&gt; <span class="bool-val">false</span>,
11801178

1181-
<span class="ident">RecursiveMode::RecursiveButDoNotFollowSymLinks</span>
1182-
<span class="op">|</span> <span class="ident">RecursiveMode::RecursiveAndFollowAllDirSymLinks</span>
1183-
<span class="op">|</span> <span class="ident">RecursiveMode::RecursiveAndFollowArgDirSymLinks</span> =&gt; <span class="bool-val">true</span>,
1179+
<span class="ident"><span class="self">Self</span>::RecursiveButDoNotFollowSymLinks</span>
1180+
<span class="op">|</span> <span class="ident"><span class="self">Self</span>::RecursiveAndFollowAllDirSymLinks</span>
1181+
<span class="op">|</span> <span class="ident"><span class="self">Self</span>::RecursiveAndFollowArgDirSymLinks</span> =&gt; <span class="bool-val">true</span>,
11841182
}
11851183
}
11861184

11871185
<span class="kw">fn</span> <span class="ident">fts_open_options</span>(<span class="self">self</span>) -&gt; <span class="ident">c_int</span> {
11881186
<span class="kw">match</span> <span class="self">self</span> {
1189-
<span class="ident">RecursiveMode::NotRecursive</span> <span class="op">|</span> <span class="ident">RecursiveMode::RecursiveButDoNotFollowSymLinks</span> =&gt; {
1190-
<span class="ident">fts_sys::FTS_PHYSICAL</span>
1191-
}
1187+
<span class="ident"><span class="self">Self</span>::NotRecursive</span> <span class="op">|</span> <span class="ident"><span class="self">Self</span>::RecursiveButDoNotFollowSymLinks</span> =&gt; <span class="ident">fts_sys::FTS_PHYSICAL</span>,
11921188

1193-
<span class="ident">RecursiveMode::RecursiveAndFollowAllDirSymLinks</span> =&gt; <span class="ident">fts_sys::FTS_LOGICAL</span>,
1189+
<span class="ident"><span class="self">Self</span>::RecursiveAndFollowAllDirSymLinks</span> =&gt; <span class="ident">fts_sys::FTS_LOGICAL</span>,
11941190

1195-
<span class="ident">RecursiveMode::RecursiveAndFollowArgDirSymLinks</span> =&gt; {
1191+
<span class="ident"><span class="self">Self</span>::RecursiveAndFollowArgDirSymLinks</span> =&gt; {
11961192
<span class="ident">fts_sys::FTS_PHYSICAL</span> <span class="op">|</span> <span class="ident">fts_sys::FTS_COMFOLLOW</span>
11971193
}
11981194
}

‎dev/src/uu_chroot/error.rs.html

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -138,25 +138,25 @@
138138
<span class="kw">impl</span> <span class="ident">Display</span> <span class="kw">for</span> <span class="ident">ChrootError</span> {
139139
<span class="kw">fn</span> <span class="ident">fmt</span>(<span class="kw-2">&amp;</span><span class="self">self</span>, <span class="ident">f</span>: <span class="kw-2">&amp;mut</span> <span class="ident">std::fmt::Formatter</span>) -&gt; <span class="ident">std::fmt::Result</span> {
140140
<span class="kw">match</span> <span class="self">self</span> {
141-
<span class="ident">ChrootError::CannotEnter</span>(<span class="ident">s</span>, <span class="ident">e</span>) =&gt; <span class="macro">write!</span>(<span class="ident">f</span>, <span class="string">&quot;cannot chroot to {}: {}&quot;</span>, <span class="ident">s</span>.<span class="ident">quote</span>(), <span class="ident">e</span>,),
142-
<span class="ident">ChrootError::CommandFailed</span>(<span class="ident">s</span>, <span class="ident">e</span>) =&gt; {
141+
<span class="ident"><span class="self">Self</span>::CannotEnter</span>(<span class="ident">s</span>, <span class="ident">e</span>) =&gt; <span class="macro">write!</span>(<span class="ident">f</span>, <span class="string">&quot;cannot chroot to {}: {}&quot;</span>, <span class="ident">s</span>.<span class="ident">quote</span>(), <span class="ident">e</span>,),
142+
<span class="ident"><span class="self">Self</span>::CommandFailed</span>(<span class="ident">s</span>, <span class="ident">e</span>) =&gt; {
143143
<span class="macro">write!</span>(<span class="ident">f</span>, <span class="string">&quot;failed to run command {}: {}&quot;</span>, <span class="ident">s</span>.<span class="ident">to_string</span>().<span class="ident">quote</span>(), <span class="ident">e</span>,)
144144
}
145-
<span class="ident">ChrootError::InvalidUserspec</span>(<span class="ident">s</span>) =&gt; <span class="macro">write!</span>(<span class="ident">f</span>, <span class="string">&quot;invalid userspec: {}&quot;</span>, <span class="ident">s</span>.<span class="ident">quote</span>(),),
146-
<span class="ident">ChrootError::MissingNewRoot</span> =&gt; <span class="macro">write!</span>(
145+
<span class="ident"><span class="self">Self</span>::InvalidUserspec</span>(<span class="ident">s</span>) =&gt; <span class="macro">write!</span>(<span class="ident">f</span>, <span class="string">&quot;invalid userspec: {}&quot;</span>, <span class="ident">s</span>.<span class="ident">quote</span>(),),
146+
<span class="ident"><span class="self">Self</span>::MissingNewRoot</span> =&gt; <span class="macro">write!</span>(
147147
<span class="ident">f</span>,
148148
<span class="string">&quot;Missing operand: NEWROOT\nTry &#39;{} --help&#39; for more information.&quot;</span>,
149149
<span class="ident">uucore::execution_phrase</span>(),
150150
),
151-
<span class="ident">ChrootError::NoSuchGroup</span>(<span class="ident">s</span>) =&gt; <span class="macro">write!</span>(<span class="ident">f</span>, <span class="string">&quot;no such group: {}&quot;</span>, <span class="ident">s</span>.<span class="ident">maybe_quote</span>(),),
152-
<span class="ident">ChrootError::NoSuchDirectory</span>(<span class="ident">s</span>) =&gt; <span class="macro">write!</span>(
151+
<span class="ident"><span class="self">Self</span>::NoSuchGroup</span>(<span class="ident">s</span>) =&gt; <span class="macro">write!</span>(<span class="ident">f</span>, <span class="string">&quot;no such group: {}&quot;</span>, <span class="ident">s</span>.<span class="ident">maybe_quote</span>(),),
152+
<span class="ident"><span class="self">Self</span>::NoSuchDirectory</span>(<span class="ident">s</span>) =&gt; <span class="macro">write!</span>(
153153
<span class="ident">f</span>,
154154
<span class="string">&quot;cannot change root directory to {}: no such directory&quot;</span>,
155155
<span class="ident">s</span>.<span class="ident">quote</span>(),
156156
),
157-
<span class="ident">ChrootError::SetGidFailed</span>(<span class="ident">s</span>, <span class="ident">e</span>) =&gt; <span class="macro">write!</span>(<span class="ident">f</span>, <span class="string">&quot;cannot set gid to {}: {}&quot;</span>, <span class="ident">s</span>, <span class="ident">e</span>),
158-
<span class="ident">ChrootError::SetGroupsFailed</span>(<span class="ident">e</span>) =&gt; <span class="macro">write!</span>(<span class="ident">f</span>, <span class="string">&quot;cannot set groups: {}&quot;</span>, <span class="ident">e</span>),
159-
<span class="ident">ChrootError::SetUserFailed</span>(<span class="ident">s</span>, <span class="ident">e</span>) =&gt; {
157+
<span class="ident"><span class="self">Self</span>::SetGidFailed</span>(<span class="ident">s</span>, <span class="ident">e</span>) =&gt; <span class="macro">write!</span>(<span class="ident">f</span>, <span class="string">&quot;cannot set gid to {}: {}&quot;</span>, <span class="ident">s</span>, <span class="ident">e</span>),
158+
<span class="ident"><span class="self">Self</span>::SetGroupsFailed</span>(<span class="ident">e</span>) =&gt; <span class="macro">write!</span>(<span class="ident">f</span>, <span class="string">&quot;cannot set groups: {}&quot;</span>, <span class="ident">e</span>),
159+
<span class="ident"><span class="self">Self</span>::SetUserFailed</span>(<span class="ident">s</span>, <span class="ident">e</span>) =&gt; {
160160
<span class="macro">write!</span>(<span class="ident">f</span>, <span class="string">&quot;cannot set user to {}: {}&quot;</span>, <span class="ident">s</span>.<span class="ident">maybe_quote</span>(), <span class="ident">e</span>)
161161
}
162162
}

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2784,8 +2784,8 @@
27842784
<span class="kw">impl</span> <span class="ident">OverwriteMode</span> {
27852785
<span class="kw">fn</span> <span class="ident">verify</span>(<span class="kw-2">&amp;</span><span class="self">self</span>, <span class="ident">path</span>: <span class="kw-2">&amp;</span><span class="ident">Path</span>) -&gt; <span class="ident">CopyResult</span><span class="op">&lt;</span>()<span class="op">&gt;</span> {
27862786
<span class="kw">match</span> <span class="kw-2">*</span><span class="self">self</span> {
2787-
<span class="ident">OverwriteMode::NoClobber</span> =&gt; <span class="prelude-val">Err</span>(<span class="ident">Error::NotAllFilesCopied</span>),
2788-
<span class="ident">OverwriteMode::Interactive</span>(<span class="kw">_</span>) =&gt; {
2787+
<span class="ident"><span class="self">Self</span>::NoClobber</span> =&gt; <span class="prelude-val">Err</span>(<span class="ident">Error::NotAllFilesCopied</span>),
2788+
<span class="ident"><span class="self">Self</span>::Interactive</span>(<span class="kw">_</span>) =&gt; {
27892789
<span class="kw">if</span> <span class="macro">prompt_yes!</span>(<span class="string">&quot;{}: overwrite {}? &quot;</span>, <span class="ident">uucore::util_name</span>(), <span class="ident">path</span>.<span class="ident">quote</span>()) {
27902790
<span class="prelude-val">Ok</span>(())
27912791
} <span class="kw">else</span> {
@@ -2795,7 +2795,7 @@
27952795
)))
27962796
}
27972797
}
2798-
<span class="ident">OverwriteMode::Clobber</span>(<span class="kw">_</span>) =&gt; <span class="prelude-val">Ok</span>(()),
2798+
<span class="ident"><span class="self">Self</span>::Clobber</span>(<span class="kw">_</span>) =&gt; <span class="prelude-val">Ok</span>(()),
27992799
}
28002800
}
28012801
}

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

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -907,16 +907,16 @@
907907
<span class="ident"><span class="self">Self</span>::StatusLevelNotRecognized</span>(<span class="ident">arg</span>) =&gt; {
908908
<span class="macro">write!</span>(<span class="ident">f</span>, <span class="string">&quot;status=LEVEL not recognized -&gt; {}&quot;</span>, <span class="ident">arg</span>)
909909
}
910-
<span class="ident">ParseError::BsOutOfRange</span> =&gt; {
910+
<span class="ident"><span class="self">Self</span>::BsOutOfRange</span> =&gt; {
911911
<span class="macro">write!</span>(<span class="ident">f</span>, <span class="string">&quot;bs=N cannot fit into memory&quot;</span>)
912912
}
913-
<span class="ident">ParseError::IbsOutOfRange</span> =&gt; {
913+
<span class="ident"><span class="self">Self</span>::IbsOutOfRange</span> =&gt; {
914914
<span class="macro">write!</span>(<span class="ident">f</span>, <span class="string">&quot;ibs=N cannot fit into memory&quot;</span>)
915915
}
916-
<span class="ident">ParseError::ObsOutOfRange</span> =&gt; {
916+
<span class="ident"><span class="self">Self</span>::ObsOutOfRange</span> =&gt; {
917917
<span class="macro">write!</span>(<span class="ident">f</span>, <span class="string">&quot;obs=N cannot fit into memory&quot;</span>)
918918
}
919-
<span class="ident">ParseError::CbsOutOfRange</span> =&gt; {
919+
<span class="ident"><span class="self">Self</span>::CbsOutOfRange</span> =&gt; {
920920
<span class="macro">write!</span>(<span class="ident">f</span>, <span class="string">&quot;cbs=N cannot fit into memory&quot;</span>)
921921
}
922922
<span class="ident"><span class="self">Self</span>::Unimplemented</span>(<span class="ident">arg</span>) =&gt; {

‎dev/src/uu_expr/tokens.rs.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -217,7 +217,7 @@
217217
}
218218
}
219219
<span class="kw">fn</span> <span class="ident">is_a_close_paren</span>(<span class="kw-2">&amp;</span><span class="self">self</span>) -&gt; <span class="ident">bool</span> {
220-
<span class="macro">matches!</span>(<span class="kw-2">*</span><span class="self">self</span>, <span class="ident">Token::ParClose</span>)
220+
<span class="macro">matches!</span>(<span class="kw-2">*</span><span class="self">self</span>, <span class="ident"><span class="self">Self</span>::ParClose</span>)
221221
}
222222
}
223223

‎dev/src/uu_groups/groups.rs.html

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -169,9 +169,9 @@
169169
<span class="kw">impl</span> <span class="ident">Display</span> <span class="kw">for</span> <span class="ident">GroupsError</span> {
170170
<span class="kw">fn</span> <span class="ident">fmt</span>(<span class="kw-2">&amp;</span><span class="self">self</span>, <span class="ident">f</span>: <span class="kw-2">&amp;mut</span> <span class="ident">std::fmt::Formatter</span>) -&gt; <span class="ident">std::fmt::Result</span> {
171171
<span class="kw">match</span> <span class="self">self</span> {
172-
<span class="ident">GroupsError::GetGroupsFailed</span> =&gt; <span class="macro">write!</span>(<span class="ident">f</span>, <span class="string">&quot;failed to fetch groups&quot;</span>),
173-
<span class="ident">GroupsError::GroupNotFound</span>(<span class="ident">gid</span>) =&gt; <span class="macro">write!</span>(<span class="ident">f</span>, <span class="string">&quot;cannot find name for group ID {}&quot;</span>, <span class="ident">gid</span>),
174-
<span class="ident">GroupsError::UserNotFound</span>(<span class="ident">user</span>) =&gt; <span class="macro">write!</span>(<span class="ident">f</span>, <span class="string">&quot;{}: no such user&quot;</span>, <span class="ident">user</span>.<span class="ident">quote</span>()),
172+
<span class="ident"><span class="self">Self</span>::GetGroupsFailed</span> =&gt; <span class="macro">write!</span>(<span class="ident">f</span>, <span class="string">&quot;failed to fetch groups&quot;</span>),
173+
<span class="ident"><span class="self">Self</span>::GroupNotFound</span>(<span class="ident">gid</span>) =&gt; <span class="macro">write!</span>(<span class="ident">f</span>, <span class="string">&quot;cannot find name for group ID {}&quot;</span>, <span class="ident">gid</span>),
174+
<span class="ident"><span class="self">Self</span>::UserNotFound</span>(<span class="ident">user</span>) =&gt; <span class="macro">write!</span>(<span class="ident">f</span>, <span class="string">&quot;{}: no such user&quot;</span>, <span class="ident">user</span>.<span class="ident">quote</span>()),
175175
}
176176
}
177177
}

‎dev/src/uu_hashsum/hashsum.rs.html

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1132,8 +1132,8 @@
11321132
<span class="kw">impl</span> <span class="ident">std::fmt::Display</span> <span class="kw">for</span> <span class="ident">HashsumError</span> {
11331133
<span class="kw">fn</span> <span class="ident">fmt</span>(<span class="kw-2">&amp;</span><span class="self">self</span>, <span class="ident">f</span>: <span class="kw-2">&amp;mut</span> <span class="ident">std::fmt::Formatter</span>) -&gt; <span class="ident">std::fmt::Result</span> {
11341134
<span class="kw">match</span> <span class="self">self</span> {
1135-
<span class="ident">HashsumError::InvalidRegex</span> =&gt; <span class="macro">write!</span>(<span class="ident">f</span>, <span class="string">&quot;invalid regular expression&quot;</span>),
1136-
<span class="ident">HashsumError::InvalidFormat</span> =&gt; <span class="prelude-val">Ok</span>(()),
1135+
<span class="ident"><span class="self">Self</span>::InvalidRegex</span> =&gt; <span class="macro">write!</span>(<span class="ident">f</span>, <span class="string">&quot;invalid regular expression&quot;</span>),
1136+
<span class="ident"><span class="self">Self</span>::InvalidFormat</span> =&gt; <span class="prelude-val">Ok</span>(()),
11371137
}
11381138
}
11391139
}

‎dev/src/uu_nohup/nohup.rs.html

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -279,7 +279,7 @@
279279
<span class="kw">impl</span> <span class="ident">UError</span> <span class="kw">for</span> <span class="ident">NohupError</span> {
280280
<span class="kw">fn</span> <span class="ident">code</span>(<span class="kw-2">&amp;</span><span class="self">self</span>) -&gt; <span class="ident">i32</span> {
281281
<span class="kw">match</span> <span class="self">self</span> {
282-
<span class="ident">NohupError::OpenFailed</span>(<span class="ident">code</span>, <span class="kw">_</span>) <span class="op">|</span> <span class="ident">NohupError::OpenFailed2</span>(<span class="ident">code</span>, <span class="kw">_</span>, <span class="kw">_</span>, <span class="kw">_</span>) =&gt; <span class="kw-2">*</span><span class="ident">code</span>,
282+
<span class="ident"><span class="self">Self</span>::OpenFailed</span>(<span class="ident">code</span>, <span class="kw">_</span>) <span class="op">|</span> <span class="ident"><span class="self">Self</span>::OpenFailed2</span>(<span class="ident">code</span>, <span class="kw">_</span>, <span class="kw">_</span>, <span class="kw">_</span>) =&gt; <span class="kw-2">*</span><span class="ident">code</span>,
283283
<span class="kw">_</span> =&gt; <span class="number">2</span>,
284284
}
285285
}
@@ -288,9 +288,9 @@
288288
<span class="kw">impl</span> <span class="ident">Display</span> <span class="kw">for</span> <span class="ident">NohupError</span> {
289289
<span class="kw">fn</span> <span class="ident">fmt</span>(<span class="kw-2">&amp;</span><span class="self">self</span>, <span class="ident">f</span>: <span class="kw-2">&amp;mut</span> <span class="ident">Formatter</span>) -&gt; <span class="ident">std::fmt::Result</span> {
290290
<span class="kw">match</span> <span class="self">self</span> {
291-
<span class="ident">NohupError::CannotDetach</span> =&gt; <span class="macro">write!</span>(<span class="ident">f</span>, <span class="string">&quot;Cannot detach from console&quot;</span>),
292-
<span class="ident">NohupError::CannotReplace</span>(<span class="ident">s</span>, <span class="ident">e</span>) =&gt; <span class="macro">write!</span>(<span class="ident">f</span>, <span class="string">&quot;Cannot replace {}: {}&quot;</span>, <span class="ident">s</span>, <span class="ident">e</span>),
293-
<span class="ident">NohupError::OpenFailed</span>(<span class="kw">_</span>, <span class="ident">e</span>) =&gt; {
291+
<span class="ident"><span class="self">Self</span>::CannotDetach</span> =&gt; <span class="macro">write!</span>(<span class="ident">f</span>, <span class="string">&quot;Cannot detach from console&quot;</span>),
292+
<span class="ident"><span class="self">Self</span>::CannotReplace</span>(<span class="ident">s</span>, <span class="ident">e</span>) =&gt; <span class="macro">write!</span>(<span class="ident">f</span>, <span class="string">&quot;Cannot replace {}: {}&quot;</span>, <span class="ident">s</span>, <span class="ident">e</span>),
293+
<span class="ident"><span class="self">Self</span>::OpenFailed</span>(<span class="kw">_</span>, <span class="ident">e</span>) =&gt; {
294294
<span class="macro">write!</span>(<span class="ident">f</span>, <span class="string">&quot;failed to open {}: {}&quot;</span>, <span class="ident">NOHUP_OUT</span>.<span class="ident">quote</span>(), <span class="ident">e</span>)
295295
}
296296
<span class="ident">NohupError::OpenFailed2</span>(<span class="kw">_</span>, <span class="ident">e1</span>, <span class="ident">s</span>, <span class="ident">e2</span>) =&gt; <span class="macro">write!</span>(

0 commit comments

Comments
 (0)