Unnest another conditional
This commit is contained in:
parent
aa67245743
commit
40159362c0
|
@ -198,24 +198,15 @@ fn parse_include_path(path: &str) -> LinkType<'static> {
|
||||||
let end = parts.next();
|
let end = parts.next();
|
||||||
let has_end = end.is_some();
|
let has_end = end.is_some();
|
||||||
let end = end.and_then(|s| s.parse::<usize>().ok());
|
let end = end.and_then(|s| s.parse::<usize>().ok());
|
||||||
match start {
|
|
||||||
Some(start) => match end {
|
match (start, end, has_end) {
|
||||||
Some(end) => LinkType::IncludeRange(path, LineRange::from(start..end)),
|
(Some(start), Some(end), _) => LinkType::IncludeRange(path, LineRange::from(start..end)),
|
||||||
None => {
|
(Some(start), None, true) => LinkType::IncludeRange(path, LineRange::from(start..)),
|
||||||
if has_end {
|
(Some(start), None, false) => {
|
||||||
LinkType::IncludeRange(path, LineRange::from(start..))
|
LinkType::IncludeRange(path, LineRange::from(start..start + 1))
|
||||||
} else {
|
|
||||||
LinkType::IncludeRange(
|
|
||||||
path,
|
|
||||||
LineRange::from(start..start + 1),
|
|
||||||
)
|
|
||||||
}
|
}
|
||||||
}
|
(None, Some(end), _) => LinkType::IncludeRange(path, LineRange::from(..end)),
|
||||||
},
|
(None, None, _) => LinkType::IncludeRange(path, LineRange::from(RangeFull)),
|
||||||
None => match end {
|
|
||||||
Some(end) => LinkType::IncludeRange(path, LineRange::from(..end)),
|
|
||||||
None => LinkType::IncludeRange(path, LineRange::from(RangeFull)),
|
|
||||||
},
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue