From a0ca545e790219015ef0e02069f6ba4258510b54 Mon Sep 17 00:00:00 2001 From: Teddy Wing Date: Sat, 25 Jul 2020 19:23:01 +0200 Subject: Suggestion: Make `original_start_line` an `Option` This field can be null in the API response. --- src/lib.rs | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) (limited to 'src/lib.rs') diff --git a/src/lib.rs b/src/lib.rs index 2febe7d..396c2ee 100644 --- a/src/lib.rs +++ b/src/lib.rs @@ -75,8 +75,9 @@ pub struct Suggestion { path: String, - // TODO: start_line can be null - original_start_line: usize, + original_start_line: Option, + + #[serde(rename = "original_line")] original_end_line: usize, } @@ -144,7 +145,8 @@ impl Suggestion { for (i, line) in reader.lines().enumerate() { match line { Ok(l) => { - if i < self.original_start_line + if self.original_start_line.is_none() + || i < self.original_start_line.unwrap() || i > self.original_end_line { writeln!(writer, "{}", l).unwrap(); } else if i == self.original_end_line { @@ -199,7 +201,7 @@ mod tests { "os" ```"#.to_owned(), path: "".to_owned(), - original_start_line: 8, + original_start_line: Some(8), original_end_line: 8, }; @@ -327,7 +329,7 @@ mod tests { Long time the manxome foe he sought— ```"#.to_owned(), path: temp.path().to_string_lossy().to_string(), - original_start_line: 6, + original_start_line: Some(6), original_end_line: 7, }; -- cgit v1.2.3