---

yaml
---
r: 277551
b: refs/heads/try
c: 8a9ad72
h: refs/heads/master
i:
  277549: 0134223
  277547: fb821b4
  277543: 942eecc
  277535: 20ba911

Author: nikomatsakis

[refs]

@@ -1,7 +1,7 @@
 ---
 refs/heads/master: 6dbb0e86aec11050480beb76eade6fb805010ba7
 refs/heads/snap-stage3: 235d77457d80b549dad3ac36d94f235208a1eafb
-refs/heads/try: ba12ed06edf119c1d543158b8d0ac7d7ec503d82
+refs/heads/try: 8a9ad72c1d67261049aac1d067529da48adcc644
 refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
 refs/tags/release-0.2: c870d2dffb391e14efb05aa27898f1f6333a9596
 refs/tags/release-0.3: b5f0d0f648d9a6153664837026ba1be43d3e2503

branches/try/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)
 }

branches/try/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;