Skip to content

Commit d863fe4

Browse files
cakebakercakebaker
authored
Merge pull request #48 from uutils/clip
Run clippy pedantic fixes
2 parents 44ef772 + 281098d commit d863fe4

File tree

7 files changed

+21
-22
lines changed

7 files changed

+21
-22
lines changed

‎src/context_diff.rs‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -450,7 +450,7 @@ mod tests {
450450
.stdin(File::open(&format!("{target}/ab.diff")).unwrap())
451451
.output()
452452
.unwrap();
453-
assert!(output.status.success(), "{:?}", output);
453+
assert!(output.status.success(), "{output:?}");
454454
//println!("{}", String::from_utf8_lossy(&output.stdout));
455455
//println!("{}", String::from_utf8_lossy(&output.stderr));
456456
let alef = fs::read(&format!("{target}/alef")).unwrap();
@@ -531,7 +531,7 @@ mod tests {
531531
.stdin(File::open(&format!("{target}/ab_.diff")).unwrap())
532532
.output()
533533
.unwrap();
534-
assert!(output.status.success(), "{:?}", output);
534+
assert!(output.status.success(), "{output:?}");
535535
//println!("{}", String::from_utf8_lossy(&output.stdout));
536536
//println!("{}", String::from_utf8_lossy(&output.stderr));
537537
let alef = fs::read(&format!("{target}/alef_")).unwrap();
@@ -615,7 +615,7 @@ mod tests {
615615
.stdin(File::open(&format!("{target}/abx.diff")).unwrap())
616616
.output()
617617
.unwrap();
618-
assert!(output.status.success(), "{:?}", output);
618+
assert!(output.status.success(), "{output:?}");
619619
//println!("{}", String::from_utf8_lossy(&output.stdout));
620620
//println!("{}", String::from_utf8_lossy(&output.stderr));
621621
let alef = fs::read(&format!("{target}/alefx")).unwrap();
@@ -702,7 +702,7 @@ mod tests {
702702
.stdin(File::open(&format!("{target}/abr.diff")).unwrap())
703703
.output()
704704
.unwrap();
705-
assert!(output.status.success(), "{:?}", output);
705+
assert!(output.status.success(), "{output:?}");
706706
//println!("{}", String::from_utf8_lossy(&output.stdout));
707707
//println!("{}", String::from_utf8_lossy(&output.stderr));
708708
let alef = fs::read(&format!("{target}/alefr")).unwrap();

‎src/ed_diff.rs‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -133,7 +133,7 @@ pub fn diff(expected: &[u8], actual: &[u8], params: &Params) -> Result<Vec<u8>,
133133
expected_count + line_number_expected - 1
134134
)
135135
.unwrap(),
136-
(1, _) => writeln!(&mut output, "{}c", line_number_expected).unwrap(),
136+
(1, _) => writeln!(&mut output, "{line_number_expected}c").unwrap(),
137137
_ => writeln!(
138138
&mut output,
139139
"{},{}c",
@@ -241,7 +241,7 @@ mod tests {
241241
.stdin(File::open("target/ab.ed").unwrap())
242242
.output()
243243
.unwrap();
244-
assert!(output.status.success(), "{:?}", output);
244+
assert!(output.status.success(), "{output:?}");
245245
//println!("{}", String::from_utf8_lossy(&output.stdout));
246246
//println!("{}", String::from_utf8_lossy(&output.stderr));
247247
let alef = fs::read(&format!("{target}/alef")).unwrap();
@@ -312,7 +312,7 @@ mod tests {
312312
.stdin(File::open("target/ab_.ed").unwrap())
313313
.output()
314314
.unwrap();
315-
assert!(output.status.success(), "{:?}", output);
315+
assert!(output.status.success(), "{output:?}");
316316
//println!("{}", String::from_utf8_lossy(&output.stdout));
317317
//println!("{}", String::from_utf8_lossy(&output.stderr));
318318
let alef = fs::read("target/alef_").unwrap();
@@ -389,7 +389,7 @@ mod tests {
389389
.stdin(File::open("target/abr.ed").unwrap())
390390
.output()
391391
.unwrap();
392-
assert!(output.status.success(), "{:?}", output);
392+
assert!(output.status.success(), "{output:?}");
393393
//println!("{}", String::from_utf8_lossy(&output.stdout));
394394
//println!("{}", String::from_utf8_lossy(&output.stderr));
395395
let alef = fs::read(&format!("{target}/alefr")).unwrap();

‎src/main.rs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ fn main() -> ExitCode {
3535
"Files {} and {} are identical",
3636
params.from.to_string_lossy(),
3737
params.to.to_string_lossy(),
38-
)
38+
);
3939
}
4040
};
4141
if same_file::is_same_file(&params.from, &params.to).unwrap_or(false) {

‎src/normal_diff.rs‎

Lines changed: 5 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -155,9 +155,7 @@ pub fn diff(expected: &[u8], actual: &[u8], params: &Params) -> Vec<u8> {
155155
// 'c' stands for "Change lines"
156156
// exactly one line replaced by one line
157157
&mut output,
158-
"{}c{}",
159-
line_number_expected,
160-
line_number_actual
158+
"{line_number_expected}c{line_number_actual}"
161159
)
162160
.unwrap(),
163161
(1, _) => writeln!(
@@ -293,7 +291,7 @@ mod tests {
293291
.stdin(File::open(&format!("{target}/ab.diff")).unwrap())
294292
.output()
295293
.unwrap();
296-
assert!(output.status.success(), "{:?}", output);
294+
assert!(output.status.success(), "{output:?}");
297295
//println!("{}", String::from_utf8_lossy(&output.stdout));
298296
//println!("{}", String::from_utf8_lossy(&output.stderr));
299297
let alef = fs::read(&format!("{target}/alef")).unwrap();
@@ -386,7 +384,7 @@ mod tests {
386384
.stdin(File::open(&format!("{target}/abn.diff")).unwrap())
387385
.output()
388386
.unwrap();
389-
assert!(output.status.success(), "{:?}", output);
387+
assert!(output.status.success(), "{output:?}");
390388
//println!("{}", String::from_utf8_lossy(&output.stdout));
391389
//println!("{}", String::from_utf8_lossy(&output.stderr));
392390
let alef = fs::read(&format!("{target}/alefn")).unwrap();
@@ -459,7 +457,7 @@ mod tests {
459457
.stdin(File::open(&format!("{target}/ab_.diff")).unwrap())
460458
.output()
461459
.unwrap();
462-
assert!(output.status.success(), "{:?}", output);
460+
assert!(output.status.success(), "{output:?}");
463461
//println!("{}", String::from_utf8_lossy(&output.stdout));
464462
//println!("{}", String::from_utf8_lossy(&output.stderr));
465463
let alef = fs::read(&format!("{target}/alef_")).unwrap();
@@ -537,7 +535,7 @@ mod tests {
537535
.stdin(File::open(&format!("{target}/abr.diff")).unwrap())
538536
.output()
539537
.unwrap();
540-
assert!(output.status.success(), "{:?}", output);
538+
assert!(output.status.success(), "{output:?}");
541539
//println!("{}", String::from_utf8_lossy(&output.stdout));
542540
//println!("{}", String::from_utf8_lossy(&output.stderr));
543541
let alef = fs::read(&format!("{target}/alefr")).unwrap();

‎src/params.rs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -99,7 +99,7 @@ pub fn parse_params<I: IntoIterator<Item = OsString>>(opts: I) -> Result<Params,
9999
.as_str();
100100
params.tabsize = match tabsize_str.parse::<usize>() {
101101
Ok(num) => num,
102-
Err(_) => return Err(format!("invalid tabsize «{}»", tabsize_str)),
102+
Err(_) => return Err(format!("invalid tabsize «{tabsize_str}»")),
103103
};
104104
continue;
105105
}

‎src/unified_diff.rs‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -494,7 +494,7 @@ mod tests {
494494
.unwrap();
495495
println!("{}", String::from_utf8_lossy(&output.stdout));
496496
println!("{}", String::from_utf8_lossy(&output.stderr));
497-
assert!(output.status.success(), "{:?}", output);
497+
assert!(output.status.success(), "{output:?}");
498498
let alef = fs::read(&format!("{target}/alef")).unwrap();
499499
assert_eq!(alef, bet);
500500
}
@@ -592,7 +592,7 @@ mod tests {
592592
.stdin(File::open(&format!("{target}/abn.diff")).unwrap())
593593
.output()
594594
.unwrap();
595-
assert!(output.status.success(), "{:?}", output);
595+
assert!(output.status.success(), "{output:?}");
596596
//println!("{}", String::from_utf8_lossy(&output.stdout));
597597
//println!("{}", String::from_utf8_lossy(&output.stderr));
598598
let alef = fs::read(&format!("{target}/alefn")).unwrap();
@@ -688,7 +688,7 @@ mod tests {
688688
.stdin(File::open(&format!("{target}/ab_.diff")).unwrap())
689689
.output()
690690
.unwrap();
691-
assert!(output.status.success(), "{:?}", output);
691+
assert!(output.status.success(), "{output:?}");
692692
//println!("{}", String::from_utf8_lossy(&output.stdout));
693693
//println!("{}", String::from_utf8_lossy(&output.stderr));
694694
let alef = fs::read(&format!("{target}/alef_")).unwrap();
@@ -769,7 +769,7 @@ mod tests {
769769
.stdin(File::open(&format!("{target}/abx.diff")).unwrap())
770770
.output()
771771
.unwrap();
772-
assert!(output.status.success(), "{:?}", output);
772+
assert!(output.status.success(), "{output:?}");
773773
//println!("{}", String::from_utf8_lossy(&output.stdout));
774774
//println!("{}", String::from_utf8_lossy(&output.stderr));
775775
let alef = fs::read(&format!("{target}/alefx")).unwrap();
@@ -855,7 +855,7 @@ mod tests {
855855
.stdin(File::open(&format!("{target}/abr.diff")).unwrap())
856856
.output()
857857
.unwrap();
858-
assert!(output.status.success(), "{:?}", output);
858+
assert!(output.status.success(), "{output:?}");
859859
//println!("{}", String::from_utf8_lossy(&output.stdout));
860860
//println!("{}", String::from_utf8_lossy(&output.stderr));
861861
let alef = fs::read(&format!("{target}/alefr")).unwrap();

‎src/utils.rs‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@ use unicode_width::UnicodeWidthStr;
1010
/// Replace tabs by spaces in the input line.
1111
/// Correctly handle multi-bytes characters.
1212
/// This assumes that line does not contain any line breaks (if it does, the result is undefined).
13+
#[must_use]
1314
pub fn do_expand_tabs(line: &[u8], tabsize: usize) -> Vec<u8> {
1415
let tab = b'\t';
1516
let ntabs = line.iter().filter(|c| **c == tab).count();

0 commit comments

Comments
 (0)