Skip to content

Commit 418a049

Browse files
committed
deploy: f0e8d44
1 parent d6572fe commit 418a049

File tree

189 files changed

+1025
-1057
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

189 files changed

+1025
-1057
lines changed

dev/source-files.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -114,7 +114,7 @@ var sourcesIndex = JSON.parse('{\
114114
"uu_comm":["",[],["comm.rs"]],\
115115
"uu_cp":["",[["platform",[],["linux.rs","mod.rs"]]],["copydir.rs","cp.rs"]],\
116116
"uu_csplit":["",[],["csplit.rs","csplit_error.rs","patterns.rs","split_name.rs"]],\
117-
"uu_cut":["",[],["cut.rs","searcher.rs","whitespace_searcher.rs"]],\
117+
"uu_cut":["",[],["cut.rs","matcher.rs","searcher.rs"]],\
118118
"uu_date":["",[],["date.rs"]],\
119119
"uu_dd":["",[],["blocks.rs","conversion_tables.rs","datastructures.rs","dd.rs","numbers.rs","parseargs.rs","progress.rs"]],\
120120
"uu_df":["",[],["blocks.rs","columns.rs","df.rs","filesystem.rs","table.rs"]],\

dev/src/uu_cat/cat.rs.html

+1-1
Original file line numberDiff line numberDiff line change
@@ -1072,7 +1072,7 @@
10721072
ft <span class="kw">if </span>ft.is_file() =&gt; <span class="prelude-val">Ok</span>(InputType::File),
10731073
ft <span class="kw">if </span>ft.is_symlink() =&gt; <span class="prelude-val">Ok</span>(InputType::SymLink),
10741074
<span class="kw">_ </span>=&gt; <span class="prelude-val">Err</span>(CatError::UnknownFiletype {
1075-
ft_debug: <span class="macro">format!</span>(<span class="string">&quot;{:?}&quot;</span>, ft),
1075+
ft_debug: <span class="macro">format!</span>(<span class="string">&quot;{ft:?}&quot;</span>),
10761076
}),
10771077
}
10781078
}

dev/src/uu_chcon/chcon.rs.html

+1-1
Original file line numberDiff line numberDiff line change
@@ -862,7 +862,7 @@
862862
<span class="kw">return </span><span class="prelude-val">Err</span>(r.into());
863863
}
864864

865-
<span class="kw">return </span><span class="prelude-val">Err</span>(UUsageError::new(libc::EXIT_FAILURE, <span class="macro">format!</span>(<span class="string">&quot;{}.\n&quot;</span>, r)));
865+
<span class="kw">return </span><span class="prelude-val">Err</span>(UUsageError::new(libc::EXIT_FAILURE, <span class="macro">format!</span>(<span class="string">&quot;{r}.\n&quot;</span>)));
866866
}
867867
};
868868

dev/src/uu_chcon/errors.rs.html

+2-2
Original file line numberDiff line numberDiff line change
@@ -143,10 +143,10 @@
143143

144144
<span class="kw">pub</span>(<span class="kw">crate</span>) <span class="kw">fn </span>report_full_error(<span class="kw-2">mut </span>err: <span class="kw-2">&amp;</span><span class="kw">dyn </span>std::error::Error) -&gt; String {
145145
<span class="kw">let </span><span class="kw-2">mut </span>desc = String::with_capacity(<span class="number">256</span>);
146-
<span class="macro">write!</span>(desc, <span class="string">&quot;{}&quot;</span>, err).unwrap();
146+
<span class="macro">write!</span>(desc, <span class="string">&quot;{err}&quot;</span>).unwrap();
147147
<span class="kw">while let </span><span class="prelude-val">Some</span>(source) = err.source() {
148148
err = source;
149-
<span class="macro">write!</span>(desc, <span class="string">&quot;. {}&quot;</span>, err).unwrap();
149+
<span class="macro">write!</span>(desc, <span class="string">&quot;. {err}&quot;</span>).unwrap();
150150
}
151151
desc
152152
}

dev/src/uu_chmod/chmod.rs.html

+1-1
Original file line numberDiff line numberDiff line change
@@ -457,7 +457,7 @@
457457
<span class="kw">let </span>modes = matches.get_one::&lt;String&gt;(options::MODE).unwrap(); <span class="comment">// should always be Some because required
458458
</span><span class="kw">let </span>cmode = <span class="kw">if </span>mode_had_minus_prefix {
459459
<span class="comment">// clap parsing is finished, now put prefix back
460-
</span><span class="macro">format!</span>(<span class="string">&quot;-{}&quot;</span>, modes)
460+
</span><span class="macro">format!</span>(<span class="string">&quot;-{modes}&quot;</span>)
461461
} <span class="kw">else </span>{
462462
modes.to_string()
463463
};

dev/src/uu_chroot/error.rs.html

+2-2
Original file line numberDiff line numberDiff line change
@@ -164,8 +164,8 @@
164164
<span class="string">&quot;cannot change root directory to {}: no such directory&quot;</span>,
165165
s.quote(),
166166
),
167-
<span class="self">Self</span>::SetGidFailed(s, e) =&gt; <span class="macro">write!</span>(f, <span class="string">&quot;cannot set gid to {}: {}&quot;</span>, s, e),
168-
<span class="self">Self</span>::SetGroupsFailed(e) =&gt; <span class="macro">write!</span>(f, <span class="string">&quot;cannot set groups: {}&quot;</span>, e),
167+
<span class="self">Self</span>::SetGidFailed(s, e) =&gt; <span class="macro">write!</span>(f, <span class="string">&quot;cannot set gid to {s}: {e}&quot;</span>),
168+
<span class="self">Self</span>::SetGroupsFailed(e) =&gt; <span class="macro">write!</span>(f, <span class="string">&quot;cannot set groups: {e}&quot;</span>),
169169
<span class="self">Self</span>::SetUserFailed(s, e) =&gt; {
170170
<span class="macro">write!</span>(f, <span class="string">&quot;cannot set user to {}: {}&quot;</span>, s.maybe_quote(), e)
171171
}

dev/src/uu_cksum/cksum.rs.html

+2-2
Original file line numberDiff line numberDiff line change
@@ -274,13 +274,13 @@
274274

275275
<span class="kw">if </span>files.is_empty() {
276276
<span class="kw">let </span>(crc, size) = cksum(<span class="string">&quot;-&quot;</span>)<span class="question-mark">?</span>;
277-
<span class="macro">println!</span>(<span class="string">&quot;{} {}&quot;</span>, crc, size);
277+
<span class="macro">println!</span>(<span class="string">&quot;{crc} {size}&quot;</span>);
278278
<span class="kw">return </span><span class="prelude-val">Ok</span>(());
279279
}
280280

281281
<span class="kw">for </span>fname <span class="kw">in </span><span class="kw-2">&amp;</span>files {
282282
<span class="kw">match </span>cksum(fname.as_ref()).map_err_context(|| <span class="macro">format!</span>(<span class="string">&quot;{}&quot;</span>, fname.maybe_quote())) {
283-
<span class="prelude-val">Ok</span>((crc, size)) =&gt; <span class="macro">println!</span>(<span class="string">&quot;{} {} {}&quot;</span>, crc, size, fname),
283+
<span class="prelude-val">Ok</span>((crc, size)) =&gt; <span class="macro">println!</span>(<span class="string">&quot;{crc} {size} {fname}&quot;</span>),
284284
<span class="prelude-val">Err</span>(err) =&gt; <span class="macro">show!</span>(err),
285285
};
286286
}

dev/src/uu_cp/copydir.rs.html

+1-1
Original file line numberDiff line numberDiff line change
@@ -836,7 +836,7 @@
836836
// the target directory.
837837
</span><span class="kw">let </span>context = <span class="kw">match </span>Context::new(root, target) {
838838
<span class="prelude-val">Ok</span>(c) =&gt; c,
839-
<span class="prelude-val">Err</span>(e) =&gt; <span class="kw">return </span><span class="prelude-val">Err</span>(<span class="macro">format!</span>(<span class="string">&quot;failed to get current directory {}&quot;</span>, e).into()),
839+
<span class="prelude-val">Err</span>(e) =&gt; <span class="kw">return </span><span class="prelude-val">Err</span>(<span class="macro">format!</span>(<span class="string">&quot;failed to get current directory {e}&quot;</span>).into()),
840840
};
841841

842842
<span class="comment">// Traverse the contents of the directory, copying each one.

dev/src/uu_cp/cp.rs.html

+4-6
Original file line numberDiff line numberDiff line change
@@ -1864,7 +1864,6 @@
18641864
<a href="#1864" id="1864">1864</a>
18651865
<a href="#1865" id="1865">1865</a>
18661866
<a href="#1866" id="1866">1866</a>
1867-
<a href="#1867" id="1867">1867</a>
18681867
</pre><pre class="rust"><code><span class="attr">#![allow(clippy::missing_safety_doc)]
18691868
#![allow(clippy::extra_unused_lifetimes)]
18701869

@@ -2613,7 +2612,7 @@
26132612
<span class="kw">let </span>recursive = matches.get_flag(options::RECURSIVE) || matches.get_flag(options::ARCHIVE);
26142613

26152614
<span class="kw">let </span>backup_mode = <span class="kw">match </span>backup_control::determine_backup_mode(matches) {
2616-
<span class="prelude-val">Err</span>(e) =&gt; <span class="kw">return </span><span class="prelude-val">Err</span>(Error::Backup(<span class="macro">format!</span>(<span class="string">&quot;{}&quot;</span>, e))),
2615+
<span class="prelude-val">Err</span>(e) =&gt; <span class="kw">return </span><span class="prelude-val">Err</span>(Error::Backup(<span class="macro">format!</span>(<span class="string">&quot;{e}&quot;</span>))),
26172616
<span class="prelude-val">Ok</span>(mode) =&gt; mode,
26182617
};
26192618

@@ -2732,9 +2731,8 @@
27322731
<span class="string">&quot;never&quot; </span>=&gt; SparseMode::Never,
27332732
<span class="kw">_ </span>=&gt; {
27342733
<span class="kw">return </span><span class="prelude-val">Err</span>(Error::InvalidArgument(<span class="macro">format!</span>(
2735-
<span class="string">&quot;invalid argument {} for \&#39;sparse\&#39;&quot;</span>,
2736-
val
2737-
)));
2734+
<span class="string">&quot;invalid argument {val} for \&#39;sparse\&#39;&quot;
2735+
</span>)));
27382736
}
27392737
}
27402738
} <span class="kw">else </span>{
@@ -3724,7 +3722,7 @@
37243722

37253723
<span class="attr">#[test]
37263724
</span><span class="kw">fn </span>test_aligned_ancestors() {
3727-
<span class="kw">let </span>actual = aligned_ancestors(<span class="kw-2">&amp;</span>Path::new(<span class="string">&quot;a/b/c&quot;</span>), <span class="kw-2">&amp;</span>Path::new(<span class="string">&quot;d/a/b/c&quot;</span>));
3725+
<span class="kw">let </span>actual = aligned_ancestors(Path::new(<span class="string">&quot;a/b/c&quot;</span>), Path::new(<span class="string">&quot;d/a/b/c&quot;</span>));
37283726
<span class="kw">let </span>expected = <span class="macro">vec!</span>[
37293727
(Path::new(<span class="string">&quot;a&quot;</span>), Path::new(<span class="string">&quot;d/a&quot;</span>)),
37303728
(Path::new(<span class="string">&quot;a/b&quot;</span>), Path::new(<span class="string">&quot;d/a/b&quot;</span>)),

dev/src/uu_csplit/csplit.rs.html

+14-14
Original file line numberDiff line numberDiff line change
@@ -1392,7 +1392,7 @@
13921392
<span class="macro">assert_eq!</span>(input_splitter.add_line_to_buffer(<span class="number">0</span>, line), <span class="prelude-val">None</span>);
13931393
<span class="macro">assert_eq!</span>(input_splitter.buffer_len(), <span class="number">1</span>);
13941394
}
1395-
item =&gt; <span class="macro">panic!</span>(<span class="string">&quot;wrong item: {:?}&quot;</span>, item),
1395+
item =&gt; <span class="macro">panic!</span>(<span class="string">&quot;wrong item: {item:?}&quot;</span>),
13961396
};
13971397

13981398
<span class="kw">match </span>input_splitter.next() {
@@ -1401,7 +1401,7 @@
14011401
<span class="macro">assert_eq!</span>(input_splitter.add_line_to_buffer(<span class="number">1</span>, line), <span class="prelude-val">None</span>);
14021402
<span class="macro">assert_eq!</span>(input_splitter.buffer_len(), <span class="number">2</span>);
14031403
}
1404-
item =&gt; <span class="macro">panic!</span>(<span class="string">&quot;wrong item: {:?}&quot;</span>, item),
1404+
item =&gt; <span class="macro">panic!</span>(<span class="string">&quot;wrong item: {item:?}&quot;</span>),
14051405
};
14061406

14071407
<span class="kw">match </span>input_splitter.next() {
@@ -1413,7 +1413,7 @@
14131413
);
14141414
<span class="macro">assert_eq!</span>(input_splitter.buffer_len(), <span class="number">2</span>);
14151415
}
1416-
item =&gt; <span class="macro">panic!</span>(<span class="string">&quot;wrong item: {:?}&quot;</span>, item),
1416+
item =&gt; <span class="macro">panic!</span>(<span class="string">&quot;wrong item: {item:?}&quot;</span>),
14171417
};
14181418

14191419
input_splitter.rewind_buffer();
@@ -1423,23 +1423,23 @@
14231423
<span class="macro">assert_eq!</span>(line, String::from(<span class="string">&quot;bbb&quot;</span>));
14241424
<span class="macro">assert_eq!</span>(input_splitter.buffer_len(), <span class="number">1</span>);
14251425
}
1426-
item =&gt; <span class="macro">panic!</span>(<span class="string">&quot;wrong item: {:?}&quot;</span>, item),
1426+
item =&gt; <span class="macro">panic!</span>(<span class="string">&quot;wrong item: {item:?}&quot;</span>),
14271427
};
14281428

14291429
<span class="kw">match </span>input_splitter.next() {
14301430
<span class="prelude-val">Some</span>((<span class="number">2</span>, <span class="prelude-val">Ok</span>(line))) =&gt; {
14311431
<span class="macro">assert_eq!</span>(line, String::from(<span class="string">&quot;ccc&quot;</span>));
14321432
<span class="macro">assert_eq!</span>(input_splitter.buffer_len(), <span class="number">0</span>);
14331433
}
1434-
item =&gt; <span class="macro">panic!</span>(<span class="string">&quot;wrong item: {:?}&quot;</span>, item),
1434+
item =&gt; <span class="macro">panic!</span>(<span class="string">&quot;wrong item: {item:?}&quot;</span>),
14351435
};
14361436

14371437
<span class="kw">match </span>input_splitter.next() {
14381438
<span class="prelude-val">Some</span>((<span class="number">3</span>, <span class="prelude-val">Ok</span>(line))) =&gt; {
14391439
<span class="macro">assert_eq!</span>(line, String::from(<span class="string">&quot;ddd&quot;</span>));
14401440
<span class="macro">assert_eq!</span>(input_splitter.buffer_len(), <span class="number">0</span>);
14411441
}
1442-
item =&gt; <span class="macro">panic!</span>(<span class="string">&quot;wrong item: {:?}&quot;</span>, item),
1442+
item =&gt; <span class="macro">panic!</span>(<span class="string">&quot;wrong item: {item:?}&quot;</span>),
14431443
};
14441444

14451445
<span class="macro">assert!</span>(input_splitter.next().is_none());
@@ -1464,7 +1464,7 @@
14641464
<span class="macro">assert_eq!</span>(input_splitter.add_line_to_buffer(<span class="number">0</span>, line), <span class="prelude-val">None</span>);
14651465
<span class="macro">assert_eq!</span>(input_splitter.buffer_len(), <span class="number">1</span>);
14661466
}
1467-
item =&gt; <span class="macro">panic!</span>(<span class="string">&quot;wrong item: {:?}&quot;</span>, item),
1467+
item =&gt; <span class="macro">panic!</span>(<span class="string">&quot;wrong item: {item:?}&quot;</span>),
14681468
};
14691469

14701470
<span class="kw">match </span>input_splitter.next() {
@@ -1473,7 +1473,7 @@
14731473
<span class="macro">assert_eq!</span>(input_splitter.add_line_to_buffer(<span class="number">1</span>, line), <span class="prelude-val">None</span>);
14741474
<span class="macro">assert_eq!</span>(input_splitter.buffer_len(), <span class="number">2</span>);
14751475
}
1476-
item =&gt; <span class="macro">panic!</span>(<span class="string">&quot;wrong item: {:?}&quot;</span>, item),
1476+
item =&gt; <span class="macro">panic!</span>(<span class="string">&quot;wrong item: {item:?}&quot;</span>),
14771477
};
14781478

14791479
<span class="kw">match </span>input_splitter.next() {
@@ -1482,7 +1482,7 @@
14821482
<span class="macro">assert_eq!</span>(input_splitter.add_line_to_buffer(<span class="number">2</span>, line), <span class="prelude-val">None</span>);
14831483
<span class="macro">assert_eq!</span>(input_splitter.buffer_len(), <span class="number">3</span>);
14841484
}
1485-
item =&gt; <span class="macro">panic!</span>(<span class="string">&quot;wrong item: {:?}&quot;</span>, item),
1485+
item =&gt; <span class="macro">panic!</span>(<span class="string">&quot;wrong item: {item:?}&quot;</span>),
14861486
};
14871487

14881488
input_splitter.rewind_buffer();
@@ -1493,39 +1493,39 @@
14931493
<span class="macro">assert_eq!</span>(input_splitter.add_line_to_buffer(<span class="number">0</span>, line), <span class="prelude-val">None</span>);
14941494
<span class="macro">assert_eq!</span>(input_splitter.buffer_len(), <span class="number">3</span>);
14951495
}
1496-
item =&gt; <span class="macro">panic!</span>(<span class="string">&quot;wrong item: {:?}&quot;</span>, item),
1496+
item =&gt; <span class="macro">panic!</span>(<span class="string">&quot;wrong item: {item:?}&quot;</span>),
14971497
};
14981498

14991499
<span class="kw">match </span>input_splitter.next() {
15001500
<span class="prelude-val">Some</span>((<span class="number">0</span>, <span class="prelude-val">Ok</span>(line))) =&gt; {
15011501
<span class="macro">assert_eq!</span>(line, String::from(<span class="string">&quot;aaa&quot;</span>));
15021502
<span class="macro">assert_eq!</span>(input_splitter.buffer_len(), <span class="number">2</span>);
15031503
}
1504-
item =&gt; <span class="macro">panic!</span>(<span class="string">&quot;wrong item: {:?}&quot;</span>, item),
1504+
item =&gt; <span class="macro">panic!</span>(<span class="string">&quot;wrong item: {item:?}&quot;</span>),
15051505
};
15061506

15071507
<span class="kw">match </span>input_splitter.next() {
15081508
<span class="prelude-val">Some</span>((<span class="number">1</span>, <span class="prelude-val">Ok</span>(line))) =&gt; {
15091509
<span class="macro">assert_eq!</span>(line, String::from(<span class="string">&quot;bbb&quot;</span>));
15101510
<span class="macro">assert_eq!</span>(input_splitter.buffer_len(), <span class="number">1</span>);
15111511
}
1512-
item =&gt; <span class="macro">panic!</span>(<span class="string">&quot;wrong item: {:?}&quot;</span>, item),
1512+
item =&gt; <span class="macro">panic!</span>(<span class="string">&quot;wrong item: {item:?}&quot;</span>),
15131513
};
15141514

15151515
<span class="kw">match </span>input_splitter.next() {
15161516
<span class="prelude-val">Some</span>((<span class="number">2</span>, <span class="prelude-val">Ok</span>(line))) =&gt; {
15171517
<span class="macro">assert_eq!</span>(line, String::from(<span class="string">&quot;ccc&quot;</span>));
15181518
<span class="macro">assert_eq!</span>(input_splitter.buffer_len(), <span class="number">0</span>);
15191519
}
1520-
item =&gt; <span class="macro">panic!</span>(<span class="string">&quot;wrong item: {:?}&quot;</span>, item),
1520+
item =&gt; <span class="macro">panic!</span>(<span class="string">&quot;wrong item: {item:?}&quot;</span>),
15211521
};
15221522

15231523
<span class="kw">match </span>input_splitter.next() {
15241524
<span class="prelude-val">Some</span>((<span class="number">3</span>, <span class="prelude-val">Ok</span>(line))) =&gt; {
15251525
<span class="macro">assert_eq!</span>(line, String::from(<span class="string">&quot;ddd&quot;</span>));
15261526
<span class="macro">assert_eq!</span>(input_splitter.buffer_len(), <span class="number">0</span>);
15271527
}
1528-
item =&gt; <span class="macro">panic!</span>(<span class="string">&quot;wrong item: {:?}&quot;</span>, item),
1528+
item =&gt; <span class="macro">panic!</span>(<span class="string">&quot;wrong item: {item:?}&quot;</span>),
15291529
};
15301530

15311531
<span class="macro">assert!</span>(input_splitter.next().is_none());

0 commit comments

Comments
 (0)