MirroredRepos/bat
1
0
Fork 0
mirror of https://github.com/sharkdp/bat.git synced 2025-03-15 15:18:45 +00:00
Code Issues Releases Wiki Activity

use map()

Browse Source
This commit is contained in:
Taylor Skinner 2018-06-04 17:19:34 -06:00 committed by David Peter
parent 26dbdf4fa0
commit 3b1dcca5d0
1 changed files with 10 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
src/app.rs
View File

@ -282,7 +282,7 @@ impl App {
term_width: Term::stdout().size().1 as usize, term_width: Term::stdout().size().1 as usize,
files, files,
theme: self.matches.value_of("theme"), theme: self.matches.value_of("theme"),
line_range: LineRange::from(self.matches.value_of("line-range")), line_range: self.matches.value_of("line-range").map(LineRange::from),
}) })
} }
@ -351,20 +351,19 @@ pub struct LineRange {
} }
impl LineRange { impl LineRange {
pub fn from(value: Option<&str>) -> Option<LineRange> { pub fn from(range_raw: &str) -> LineRange {
match value { LineRange::parse_range(range_raw).unwrap_or(LineRange::new())
None => None, }
Some(range_raw) => {
return LineRange::parse_range(range_raw).ok(); pub fn new() -> LineRange {
} LineRange{
lower: usize::min_value(),
upper: usize::max_value(),
} }
} }
pub fn parse_range(range_raw: &str) -> Result<LineRange> { pub fn parse_range(range_raw: &str) -> Result<LineRange> {
let mut new_range = LineRange{ let mut new_range = LineRange::new();
lower: usize::min_value(),
upper: usize::max_value(),
};
if range_raw.bytes().nth(0).ok_or("No first byte")? == b':' { if range_raw.bytes().nth(0).ok_or("No first byte")? == b':' {
new_range.upper = range_raw[1..].parse()?; new_range.upper = range_raw[1..].parse()?;