about summary refs log tree commit diff
path: root/src/libsyntax/errors
diff options
context:
space:
mode:
authorNiko Matsakis <niko@alum.mit.edu>2016-04-26 22:59:15 -0400
committerNiko Matsakis <niko@alum.mit.edu>2016-05-02 11:49:25 -0400
commit8a9ad72c1d67261049aac1d067529da48adcc644 (patch)
tree55087801943c866e0a5f401200d6b2516b20cab7 /src/libsyntax/errors
parentba12ed06edf119c1d543158b8d0ac7d7ec503d82 (diff)
downloadrust-8a9ad72c1d67261049aac1d067529da48adcc644.tar.gz
rust-8a9ad72c1d67261049aac1d067529da48adcc644.zip
Nit: use Range::contains
Diffstat (limited to 'src/libsyntax/errors')
-rw-r--r--src/libsyntax/errors/snippet/mod.rs9
1 files changed, 2 insertions, 7 deletions
diff --git a/src/libsyntax/errors/snippet/mod.rs b/src/libsyntax/errors/snippet/mod.rs
index 643b5c3c5f2..feaf48352db 100644
--- a/src/libsyntax/errors/snippet/mod.rs
+++ b/src/libsyntax/errors/snippet/mod.rs
@@ -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)
 }