Nit: use Range::contains

diff --git a/src/libsyntax/errors/snippet/mod.rs b/src/libsyntax/errors/snippet/mod.rs
index 643b5c3c5f23690be71a5fdd91a41038ab3bf747..feaf48352db8601bae2f33b0828c54e666d7d04a 100644 (file)
--- a/src/libsyntax/errors/snippet/mod.rs
+++ b/src/libsyntax/errors/snippet/mod.rs
@@ -14,7 +14,6 @@
 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)
 }

diff --git a/src/libsyntax/lib.rs b/src/libsyntax/lib.rs
index 6cfa1e9847b88cbe3670d3821839148ff0770de0..420a41e03b9142c06b2382f0c3e1707026b817b4 100644 (file)
--- a/src/libsyntax/lib.rs
+++ b/src/libsyntax/lib.rs
@@ -33,6 +33,7 @@
 #![feature(str_escape)]
 #![feature(unicode)]
 #![feature(question_mark)]
+#![feature(range_contains)]
 
 extern crate serialize;
 extern crate term;