Skip to content

Commit cf8cdad

Browse files
author
Gunter Schmidt
committed
fix: cargo fmt --all -- --check
1 parent 1fe9cf2 commit cf8cdad

4 files changed

Lines changed: 88 additions & 96 deletions

File tree

‎Cargo.lock‎

Lines changed: 14 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎src/uu/diff/src/params.rs‎

Lines changed: 72 additions & 92 deletions
Original file line numberDiff line numberDiff line change
@@ -782,65 +782,53 @@ mod tests {
782782
.peekable()
783783
)
784784
);
785-
assert!(
786-
parse_params(
787-
[os("diff"), os("--tabsize"), os("foo"), os("bar")]
788-
.iter()
789-
.cloned()
790-
.peekable()
791-
)
792-
.is_err()
793-
);
794-
assert!(
795-
parse_params(
796-
[os("diff"), os("--tabsize="), os("foo"), os("bar")]
797-
.iter()
798-
.cloned()
799-
.peekable()
800-
)
801-
.is_err()
802-
);
803-
assert!(
804-
parse_params(
805-
[os("diff"), os("--tabsize=r2"), os("foo"), os("bar")]
806-
.iter()
807-
.cloned()
808-
.peekable()
809-
)
810-
.is_err()
811-
);
812-
assert!(
813-
parse_params(
814-
[os("diff"), os("--tabsize=-1"), os("foo"), os("bar")]
815-
.iter()
816-
.cloned()
817-
.peekable()
818-
)
819-
.is_err()
820-
);
821-
assert!(
822-
parse_params(
823-
[os("diff"), os("--tabsize=r2"), os("foo"), os("bar")]
824-
.iter()
825-
.cloned()
826-
.peekable()
827-
)
828-
.is_err()
829-
);
830-
assert!(
831-
parse_params(
832-
[
833-
os("diff"),
834-
os("--tabsize=92233720368547758088"),
835-
os("foo"),
836-
os("bar")
837-
]
785+
assert!(parse_params(
786+
[os("diff"), os("--tabsize"), os("foo"), os("bar")]
838787
.iter()
839788
.cloned()
840789
.peekable()
841-
)
842-
.is_err()
843-
);
790+
)
791+
.is_err());
792+
assert!(parse_params(
793+
[os("diff"), os("--tabsize="), os("foo"), os("bar")]
794+
.iter()
795+
.cloned()
796+
.peekable()
797+
)
798+
.is_err());
799+
assert!(parse_params(
800+
[os("diff"), os("--tabsize=r2"), os("foo"), os("bar")]
801+
.iter()
802+
.cloned()
803+
.peekable()
804+
)
805+
.is_err());
806+
assert!(parse_params(
807+
[os("diff"), os("--tabsize=-1"), os("foo"), os("bar")]
808+
.iter()
809+
.cloned()
810+
.peekable()
811+
)
812+
.is_err());
813+
assert!(parse_params(
814+
[os("diff"), os("--tabsize=r2"), os("foo"), os("bar")]
815+
.iter()
816+
.cloned()
817+
.peekable()
818+
)
819+
.is_err());
820+
assert!(parse_params(
821+
[
822+
os("diff"),
823+
os("--tabsize=92233720368547758088"),
824+
os("foo"),
825+
os("bar")
826+
]
827+
.iter()
828+
.cloned()
829+
.peekable()
830+
)
831+
.is_err());
844832
}
845833
#[test]
846834
fn double_dash() {
@@ -888,24 +876,20 @@ mod tests {
888876
}),
889877
parse_params([os("diff"), os("-"), os("-")].iter().cloned().peekable())
890878
);
891-
assert!(
892-
parse_params(
893-
[os("diff"), os("foo"), os("bar"), os("-")]
894-
.iter()
895-
.cloned()
896-
.peekable()
897-
)
898-
.is_err()
899-
);
900-
assert!(
901-
parse_params(
902-
[os("diff"), os("-"), os("-"), os("-")]
903-
.iter()
904-
.cloned()
905-
.peekable()
906-
)
907-
.is_err()
908-
);
879+
assert!(parse_params(
880+
[os("diff"), os("foo"), os("bar"), os("-")]
881+
.iter()
882+
.cloned()
883+
.peekable()
884+
)
885+
.is_err());
886+
assert!(parse_params(
887+
[os("diff"), os("-"), os("-"), os("-")]
888+
.iter()
889+
.cloned()
890+
.peekable()
891+
)
892+
.is_err());
909893
}
910894
#[test]
911895
fn missing_arguments() {
@@ -914,15 +898,13 @@ mod tests {
914898
}
915899
#[test]
916900
fn unknown_argument() {
917-
assert!(
918-
parse_params(
919-
[os("diff"), os("-g"), os("foo"), os("bar")]
920-
.iter()
921-
.cloned()
922-
.peekable()
923-
)
924-
.is_err()
925-
);
901+
assert!(parse_params(
902+
[os("diff"), os("-g"), os("foo"), os("bar")]
903+
.iter()
904+
.cloned()
905+
.peekable()
906+
)
907+
.is_err());
926908
assert!(
927909
parse_params([os("diff"), os("-g"), os("bar")].iter().cloned().peekable()).is_err()
928910
);
@@ -943,15 +925,13 @@ mod tests {
943925
("--normal", "-e"),
944926
("--context", "--normal"),
945927
] {
946-
assert!(
947-
parse_params(
948-
[os("diff"), os(arg1), os(arg2), os("foo"), os("bar")]
949-
.iter()
950-
.cloned()
951-
.peekable()
952-
)
953-
.is_err()
954-
);
928+
assert!(parse_params(
929+
[os("diff"), os(arg1), os(arg2), os("foo"), os("bar")]
930+
.iter()
931+
.cloned()
932+
.peekable()
933+
)
934+
.is_err());
955935
}
956936
}
957937
}

‎src/uu/diff/src/side_diff.rs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -574,8 +574,8 @@ mod tests {
574574
let config = create_test_config(false, DEF_TAB_SIZE);
575575
let mut buf = vec![];
576576

577+
// ↓ é char, start multi byte
577578
let gb18030 = b"\x63\x61\x66\xA8\x80"; // some random chinese encoding
578-
// ^ é char, start multi byte
579579
process_half_line(gb18030, 4, false, false, &config, &mut buf).unwrap();
580580
assert_eq!(buf, b"\x63\x61\x66\xA8 "); // break the encoding of 'é' letter
581581
}

‎tests/integration.rs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ use std::fs::File;
99
#[cfg(not(windows))]
1010
use std::fs::OpenOptions;
1111
use std::io::Write;
12-
use tempfile::{NamedTempFile, tempdir};
12+
use tempfile::{tempdir, NamedTempFile};
1313

1414
// Integration tests for the diffutils command
1515
mod common {

0 commit comments

Comments
 (0)