From 4855a47105c4cb8c8049cf751dace2aab3e4f2b3 Mon Sep 17 00:00:00 2001
From: sharkdp <davidpeter@web.de>
Date: Sat, 21 Mar 2020 16:51:38 +0100
Subject: [PATCH] Rename enum field

---
 src/controller.rs |  2 +-
 src/line_range.rs | 16 ++++++++--------
 2 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/src/controller.rs b/src/controller.rs
index ca2b9cfb..0c2e244b 100644
--- a/src/controller.rs
+++ b/src/controller.rs
@@ -106,7 +106,7 @@ impl<'b> Controller<'b> {
 
         while reader.read_line(&mut line_buffer)? {
             match line_ranges.check(line_number) {
-                RangeCheckResult::OutsideRange => {
+                RangeCheckResult::BeforeOrBetweenRanges => {
                     // Call the printer in case we need to call the syntax highlighter
                     // for this line. However, set `out_of_range` to `true`.
                     printer.print_line(true, writer, line_number, &line_buffer)?;
diff --git a/src/line_range.rs b/src/line_range.rs
index a6b68d31..15766006 100644
--- a/src/line_range.rs
+++ b/src/line_range.rs
@@ -99,7 +99,7 @@ pub enum RangeCheckResult {
     InRange,
 
     // Before the first range or within two ranges
-    OutsideRange,
+    BeforeOrBetweenRanges,
 
     // Line number is outside of all ranges and larger than the last range.
     AfterLastRange,
@@ -131,10 +131,10 @@ impl LineRanges {
     }
 
     pub fn check(&self, line: usize) -> RangeCheckResult {
-        if self.ranges.is_empty() | self.ranges.iter().any(|r| r.is_inside(line)) {
+        if self.ranges.is_empty() || self.ranges.iter().any(|r| r.is_inside(line)) {
             RangeCheckResult::InRange
         } else if line < self.largest_upper_bound {
-            RangeCheckResult::OutsideRange
+            RangeCheckResult::BeforeOrBetweenRanges
         } else {
             RangeCheckResult::AfterLastRange
         }
@@ -150,7 +150,7 @@ fn ranges(rs: &[&str]) -> LineRanges {
 fn test_ranges_simple() {
     let ranges = ranges(&["3:8"]);
 
-    assert_eq!(RangeCheckResult::OutsideRange, ranges.check(2));
+    assert_eq!(RangeCheckResult::BeforeOrBetweenRanges, ranges.check(2));
     assert_eq!(RangeCheckResult::InRange, ranges.check(5));
     assert_eq!(RangeCheckResult::AfterLastRange, ranges.check(9));
 }
@@ -159,11 +159,11 @@ fn test_ranges_simple() {
 fn test_ranges_advanced() {
     let ranges = ranges(&["3:8", "11:20", "25:30"]);
 
-    assert_eq!(RangeCheckResult::OutsideRange, ranges.check(2));
+    assert_eq!(RangeCheckResult::BeforeOrBetweenRanges, ranges.check(2));
     assert_eq!(RangeCheckResult::InRange, ranges.check(5));
-    assert_eq!(RangeCheckResult::OutsideRange, ranges.check(9));
+    assert_eq!(RangeCheckResult::BeforeOrBetweenRanges, ranges.check(9));
     assert_eq!(RangeCheckResult::InRange, ranges.check(11));
-    assert_eq!(RangeCheckResult::OutsideRange, ranges.check(22));
+    assert_eq!(RangeCheckResult::BeforeOrBetweenRanges, ranges.check(22));
     assert_eq!(RangeCheckResult::InRange, ranges.check(28));
     assert_eq!(RangeCheckResult::AfterLastRange, ranges.check(31));
 }
@@ -182,7 +182,7 @@ fn test_ranges_open_low() {
 fn test_ranges_open_high() {
     let ranges = ranges(&["3:", "2:5"]);
 
-    assert_eq!(RangeCheckResult::OutsideRange, ranges.check(1));
+    assert_eq!(RangeCheckResult::BeforeOrBetweenRanges, ranges.check(1));
     assert_eq!(RangeCheckResult::InRange, ranges.check(3));
     assert_eq!(RangeCheckResult::InRange, ranges.check(5));
     assert_eq!(RangeCheckResult::InRange, ranges.check(9));