summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDan Davison <dandavison7@gmail.com>2020-12-03 23:02:38 -0500
committerDan Davison <dandavison7@gmail.com>2020-12-04 19:33:56 +0000
commitff4182c2fbff194604acfc9b7abece194d92c103 (patch)
tree048c6f1b3c55b5ef475a1cbbfbcd7fbde717d3ea
parentfd6727734635486fb2f86e7008bb5fb4f6f8352b (diff)
Use .lines() instead of .split("\n")
-rw-r--r--src/tests/test_example_diffs.rs12
-rw-r--r--src/tests/test_utils.rs2
2 files changed, 7 insertions, 7 deletions
diff --git a/src/tests/test_example_diffs.rs b/src/tests/test_example_diffs.rs
index 9be4b5f3..4fd2184f 100644
--- a/src/tests/test_example_diffs.rs
+++ b/src/tests/test_example_diffs.rs
@@ -113,7 +113,7 @@ mod tests {
let config = integration_test_utils::make_config_from_args(&[]);
let output = integration_test_utils::run_delta(DIFF_UNIFIED_TWO_FILES, &config);
let output = strip_ansi_codes(&output);
- let mut lines = output.split('\n');
+ let mut lines = output.lines();
// Header
assert_eq!(lines.nth(1).unwrap(), "comparing: one.rs ⟶ src/two.rs");
@@ -132,7 +132,7 @@ mod tests {
let config = integration_test_utils::make_config_from_args(&["--width", "80"]);
let output = integration_test_utils::run_delta(DIFF_UNIFIED_TWO_DIRECTORIES, &config);
let output = strip_ansi_codes(&output);
- let mut lines = output.split('\n');
+ let mut lines = output.lines();
// Header
assert_eq!(
@@ -196,7 +196,7 @@ mod tests {
let output = integration_test_utils::run_delta(DIFF_WITH_MERGE_CONFLICT, &config);
// TODO: The + in the first column is being removed.
assert!(strip_ansi_codes(&output).contains("+>>>>>>> Stashed changes"));
- assert_eq!(output.split('\n').count(), 47);
+ assert_eq!(output.lines().count(), 46);
}
#[test]
@@ -949,8 +949,8 @@ src/align.rs
let output = integration_test_utils::run_delta(GIT_DIFF_SINGLE_HUNK, &config);
let output = strip_ansi_codes(&output);
- let input_lines: Vec<&str> = GIT_DIFF_SINGLE_HUNK.split('\n').collect();
- let output_lines: Vec<&str> = output.split('\n').collect();
+ let input_lines: Vec<&str> = GIT_DIFF_SINGLE_HUNK.lines().collect();
+ let output_lines: Vec<&str> = output.lines().collect();
assert_eq!(input_lines.len(), output_lines.len());
// Although git patch options only checks the line counts of input and output,
@@ -962,7 +962,7 @@ src/align.rs
let input_line = input_lines[n];
// If config.line_numbers is enabled,
// we should remove line_numbers decoration while checking.
- let output_line = if config.line_numbers && n > 11 && n < input_lines.len() - 1 {
+ let output_line = if config.line_numbers && n > 11 && n < input_lines.len() {
&output_lines[n][14..]
} else {
output_lines[n]
diff --git a/src/tests/test_utils.rs b/src/tests/test_utils.rs
index fa51aa1d..9f66adfa 100644
--- a/src/tests/test_utils.rs
+++ b/src/tests/test_utils.rs
@@ -10,7 +10,7 @@ pub mod test_utils {
#[allow(dead_code)]
pub fn print_with_line_numbers(s: &str) {
- for (i, t) in s.split("\n").enumerate() {
+ for (i, t) in s.lines().enumerate() {
println!("{:>2}│ {}", i + 1, t);
}
}