Overload get{,_mut}{,_unchecked}

rust-lang · Nov 26, 2016 · 5377b5e · 5377b5e
1 parent a31ad75
commit 5377b5e
Show file tree

Hide file tree

Showing 7 changed files with 404 additions and 185 deletions.
diff --git a/src/libcollections/lib.rs b/src/libcollections/lib.rs
@@ -54,6 +54,7 @@
 #![feature(trusted_len)]
 #![feature(unicode)]
 #![feature(unique)]
+#![feature(slice_get_slice)]
 #![cfg_attr(test, feature(rand, test))]
 
 #![no_std]

diff --git a/src/libcollections/slice.rs b/src/libcollections/slice.rs
@@ -118,6 +118,8 @@ pub use core::slice::{SplitMut, ChunksMut, Split};
 pub use core::slice::{SplitN, RSplitN, SplitNMut, RSplitNMut};
 #[stable(feature = "rust1", since = "1.0.0")]
 pub use core::slice::{from_raw_parts, from_raw_parts_mut};
+#[unstable(feature = "slice_get_slice", issue = "35729")]
+pub use core::slice::SliceIndex;
 
 ////////////////////////////////////////////////////////////////////////////////
 // Basic slice extension methods
@@ -353,7 +355,9 @@ impl<T> [T] {
     /// ```
     #[stable(feature = "rust1", since = "1.0.0")]
     #[inline]
-    pub fn get(&self, index: usize) -> Option<&T> {
+    pub fn get<I>(&self, index: I) -> Option<&I::Output>
+        where I: SliceIndex<T>
+    {
         core_slice::SliceExt::get(self, index)
     }
 
@@ -372,7 +376,9 @@ impl<T> [T] {
     /// or `None` if the index is out of bounds
     #[stable(feature = "rust1", since = "1.0.0")]
     #[inline]
-    pub fn get_mut(&mut self, index: usize) -> Option<&mut T> {
+    pub fn get_mut<I>(&mut self, index: I) -> Option<&mut I::Output>
+        where I: SliceIndex<T>
+    {
         core_slice::SliceExt::get_mut(self, index)
     }
 
@@ -390,7 +396,9 @@ impl<T> [T] {
     /// ```
     #[stable(feature = "rust1", since = "1.0.0")]
     #[inline]
-    pub unsafe fn get_unchecked(&self, index: usize) -> &T {
+    pub unsafe fn get_unchecked<I>(&self, index: I) -> &I::Output
+        where I: SliceIndex<T>
+    {
         core_slice::SliceExt::get_unchecked(self, index)
     }
 
@@ -410,7 +418,9 @@ impl<T> [T] {
     /// ```
     #[stable(feature = "rust1", since = "1.0.0")]
     #[inline]
-    pub unsafe fn get_unchecked_mut(&mut self, index: usize) -> &mut T {
+    pub unsafe fn get_unchecked_mut<I>(&mut self, index: I) -> &mut I::Output
+        where I: SliceIndex<T>
+    {
         core_slice::SliceExt::get_unchecked_mut(self, index)
     }