4855a47 · bat · git.iko.soy

git.iko.soy/bat

Rename enum field

commit4855a47105c4cb8c8049cf751dace2aab3e4f2b3 authorsharkdp <davidpeter@web.de> dateSat 21 Mar 2020, 16:51 (7 years ago) parent06b7be7

2 files changed+9−9

compare with master

unifiedsplit

src/controller.rs+1−1 src/line_range.rs+8−8

src/controller.rs+1−1

@@ -106,7 +106,7 @@ impl<'b> Controller<'b> {

106106

107107 while reader.read_line(&mut line_buffer)? {

108108 match line_ranges.check(line_number) {

109− RangeCheckResult::OutsideRange => {

109+ RangeCheckResult::BeforeOrBetweenRanges => {

110110 // Call the printer in case we need to call the syntax highlighter

111111 // for this line. However, set `out_of_range` to `true`.

112112 printer.print_line(true, writer, line_number, &line_buffer)?;

src/line_range.rs+8−8

@@ -99,7 +99,7 @@ pub enum RangeCheckResult {

9999 InRange,

100100

101101 // Before the first range or within two ranges

102− OutsideRange,

102+ BeforeOrBetweenRanges,

103103

104104 // Line number is outside of all ranges and larger than the last range.

105105 AfterLastRange,

@@ -131,10 +131,10 @@ impl LineRanges {

131131 }

132132

133133 pub fn check(&self, line: usize) -> RangeCheckResult {

134− if self.ranges.is_empty() | self.ranges.iter().any(|r| r.is_inside(line)) {

134+ if self.ranges.is_empty() || self.ranges.iter().any(|r| r.is_inside(line)) {

135135 RangeCheckResult::InRange

136136 } else if line < self.largest_upper_bound {

137− RangeCheckResult::OutsideRange

137+ RangeCheckResult::BeforeOrBetweenRanges

138138 } else {

139139 RangeCheckResult::AfterLastRange

140140 }

@@ -150,7 +150,7 @@ fn ranges(rs: &[&str]) -> LineRanges {

150150fn test_ranges_simple() {

151151 let ranges = ranges(&["3:8"]);

152152

153− assert_eq!(RangeCheckResult::OutsideRange, ranges.check(2));

153+ assert_eq!(RangeCheckResult::BeforeOrBetweenRanges, ranges.check(2));

154154 assert_eq!(RangeCheckResult::InRange, ranges.check(5));

155155 assert_eq!(RangeCheckResult::AfterLastRange, ranges.check(9));

156156}

@@ -159,11 +159,11 @@ fn test_ranges_simple() {

159159fn test_ranges_advanced() {

160160 let ranges = ranges(&["3:8", "11:20", "25:30"]);

161161

162− assert_eq!(RangeCheckResult::OutsideRange, ranges.check(2));

162+ assert_eq!(RangeCheckResult::BeforeOrBetweenRanges, ranges.check(2));

163163 assert_eq!(RangeCheckResult::InRange, ranges.check(5));

164− assert_eq!(RangeCheckResult::OutsideRange, ranges.check(9));

164+ assert_eq!(RangeCheckResult::BeforeOrBetweenRanges, ranges.check(9));

165165 assert_eq!(RangeCheckResult::InRange, ranges.check(11));

166− assert_eq!(RangeCheckResult::OutsideRange, ranges.check(22));

166+ assert_eq!(RangeCheckResult::BeforeOrBetweenRanges, ranges.check(22));

167167 assert_eq!(RangeCheckResult::InRange, ranges.check(28));

168168 assert_eq!(RangeCheckResult::AfterLastRange, ranges.check(31));

169169}

@@ -182,7 +182,7 @@ fn test_ranges_open_low() {

182182fn test_ranges_open_high() {

183183 let ranges = ranges(&["3:", "2:5"]);

184184

185− assert_eq!(RangeCheckResult::OutsideRange, ranges.check(1));

185+ assert_eq!(RangeCheckResult::BeforeOrBetweenRanges, ranges.check(1));

186186 assert_eq!(RangeCheckResult::InRange, ranges.check(3));

187187 assert_eq!(RangeCheckResult::InRange, ranges.check(5));

188188 assert_eq!(RangeCheckResult::InRange, ranges.check(9));