Use built-in indexing for Bound pairs

Author: cuviper

src/map/slice.rs

@@ -1,5 +1,5 @@
 use super::{Bucket, Entries, IndexMap, Iter, IterMut, Keys, Values, ValuesMut};
-use crate::util::{simplify_range, try_simplify_range};
+use crate::util::try_simplify_range;
 
 use core::cmp::Ordering;
 use core::fmt;
@@ -308,47 +308,10 @@ impl_index!(
     ops::RangeFull,
     ops::RangeInclusive<usize>,
     ops::RangeTo<usize>,
-    ops::RangeToInclusive<usize>
+    ops::RangeToInclusive<usize>,
+    (Bound<usize>, Bound<usize>)
 );
 
-// NB: with MSRV 1.53, we can forward `Bound` pairs to direct slice indexing like other ranges
-
-impl<K, V, S> Index<(Bound<usize>, Bound<usize>)> for IndexMap<K, V, S> {
-    type Output = Slice<K, V>;
-
-    fn index(&self, range: (Bound<usize>, Bound<usize>)) -> &Self::Output {
-        let entries = self.as_entries();
-        let range = simplify_range(range, entries.len());
-        Slice::from_slice(&entries[range])
-    }
-}
-
-impl<K, V, S> IndexMut<(Bound<usize>, Bound<usize>)> for IndexMap<K, V, S> {
-    fn index_mut(&mut self, range: (Bound<usize>, Bound<usize>)) -> &mut Self::Output {
-        let entries = self.as_entries_mut();
-        let range = simplify_range(range, entries.len());
-        Slice::from_mut_slice(&mut entries[range])
-    }
-}
-
-impl<K, V> Index<(Bound<usize>, Bound<usize>)> for Slice<K, V> {
-    type Output = Slice<K, V>;
-
-    fn index(&self, range: (Bound<usize>, Bound<usize>)) -> &Self {
-        let entries = &self.entries;
-        let range = simplify_range(range, entries.len());
-        Slice::from_slice(&entries[range])
-    }
-}
-
-impl<K, V> IndexMut<(Bound<usize>, Bound<usize>)> for Slice<K, V> {
-    fn index_mut(&mut self, range: (Bound<usize>, Bound<usize>)) -> &mut Self {
-        let entries = &mut self.entries;
-        let range = simplify_range(range, entries.len());
-        Slice::from_mut_slice(&mut entries[range])
-    }
-}
-
 #[cfg(test)]
 mod tests {
     use super::*;

src/set/slice.rs

@@ -1,5 +1,5 @@
 use super::{Bucket, Entries, IndexSet, Iter};
-use crate::util::{simplify_range, try_simplify_range};
+use crate::util::try_simplify_range;
 
 use core::cmp::Ordering;
 use core::fmt;
@@ -184,31 +184,10 @@ impl_index!(
     ops::RangeFull,
     ops::RangeInclusive<usize>,
     ops::RangeTo<usize>,
-    ops::RangeToInclusive<usize>
+    ops::RangeToInclusive<usize>,
+    (Bound<usize>, Bound<usize>)
 );
 
-// NB: with MSRV 1.53, we can forward `Bound` pairs to direct slice indexing like other ranges
-
-impl<T, S> Index<(Bound<usize>, Bound<usize>)> for IndexSet<T, S> {
-    type Output = Slice<T>;
-
-    fn index(&self, range: (Bound<usize>, Bound<usize>)) -> &Self::Output {
-        let entries = self.as_entries();
-        let range = simplify_range(range, entries.len());
-        Slice::from_slice(&entries[range])
-    }
-}
-
-impl<T> Index<(Bound<usize>, Bound<usize>)> for Slice<T> {
-    type Output = Self;
-
-    fn index(&self, range: (Bound<usize>, Bound<usize>)) -> &Self::Output {
-        let entries = &self.entries;
-        let range = simplify_range(range, entries.len());
-        Slice::from_slice(&entries[range])
-    }
-}
-
 #[cfg(test)]
 mod tests {
     use super::*;