add impl for RangeToInclusive

frewsxcv · Feb 18, 2017 · 4338290 · 4338290
1 parent 65c876f
commit 4338290
Show file tree

Hide file tree

Showing 3 changed files with 18 additions and 1 deletion.
diff --git a/src/libcollections/range.rs b/src/libcollections/range.rs
@@ -14,7 +14,7 @@
 
 //! Range syntax.
 
-use core::ops::{RangeFull, Range, RangeTo, RangeFrom, RangeInclusive};
+use core::ops::{RangeFull, Range, RangeTo, RangeFrom, RangeInclusive, RangeToInclusive};
 use Bound::{self, Excluded, Included, Unbounded};
 
 /// **RangeArgument** is implemented by Rust's built-in range types, produced
@@ -121,6 +121,16 @@ impl<T> RangeArgument<T> for RangeInclusive<T> {
     }
 }
 
+#[unstable(feature = "inclusive_range", reason = "recently added, follows RFC", issue = "28237")]
+impl<T> RangeArgument<T> for RangeToInclusive<T> {
+    fn start(&self) -> Bound<&T> {
+        Unbounded
+    }
+    fn end(&self) -> Bound<&T> {
+        Included(&self.end)
+    }
+}
+
 impl<T> RangeArgument<T> for (Bound<T>, Bound<T>) {
     fn start(&self) -> Bound<&T> {
         match *self {

diff --git a/src/libcollectionstest/btree/map.rs b/src/libcollectionstest/btree/map.rs
@@ -200,6 +200,8 @@ fn test_range_inclusive() {
     check(map.range(0...size - 1), map.range(..size));
     check(map.range(-1...-1), vec![]);
     check(map.range(-1...size), map.range(..));
+    check(map.range(...size), map.range(..));
+    check(map.range(...200), map.range(..201));
     check(map.range(5...8), vec![(&5, &5), (&6, &6), (&7, &7), (&8, &8)]);
     check(map.range(-1...0), vec![(&0, &0)]);
     check(map.range(-1...2), vec![(&0, &0), (&1, &1), (&2, &2)]);

diff --git a/src/libcollectionstest/vec.rs b/src/libcollectionstest/vec.rs
@@ -528,6 +528,11 @@ fn test_drain_inclusive_range() {
     for _ in v.drain(0...3) {
     }
     assert_eq!(v, &["4".to_string(), "5".to_string()]);
+
+    let mut v: Vec<_> = (0...1).map(|x| x.to_string()).collect();
+    for _ in v.drain(...0) {
+    }
+    assert_eq!(v, &["1".to_string()]);
 }
 
 #[test]