bjoernager/rust
bjoernager/rust
1
Fork 0
Code Activity

Nit: use Range::contains

Browse source
This commit is contained in:
Niko Matsakis 2016-04-26 22:59:15 -04:00
parent ba12ed06ed
commit 8a9ad72c1d
2 changed files with 3 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

9
src/libsyntax/errors/snippet/mod.rs
View file

@ -14,7 +14,6 @@ use codemap::{CharPos, CodeMap, FileMap, LineInfo, Span};
use std::cmp;
use std::rc::Rc;
use std::mem;
use std::ops::Range;
mod test;
@ -744,10 +743,6 @@ fn overlaps(a1: &Annotation,
a2: &Annotation)
-> bool
{
between(a1.start_col, a2.start_col .. a2.end_col) ||
between(a2.start_col, a1.start_col .. a1.end_col)
}
fn between(v: usize, range: Range<usize>) -> bool {
v >= range.start && v < range.end
(a2.start_col .. a2.end_col).contains(a1.start_col) ||
(a1.start_col .. a1.end_col).contains(a2.start_col)
}