From 4f127e53eab2f1b80d956f47d12c946447be35b1 Mon Sep 17 00:00:00 2001
From: Konrad Borowski <konrad@borowski.pw>
Date: Sat, 5 Oct 2019 00:21:03 +0200
Subject: [PATCH] Use SliceIndex trait for SmallVec's Index trait

Requires Rust 1.28.0.
---
 .travis.yml |  2 +-
 lib.rs      | 30 ++++++++++--------------------
 2 files changed, 11 insertions(+), 21 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index ee744e1..2dc4702 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,6 +1,6 @@
 language: rust
 rust:
-  - 1.20.0
+  - 1.36.0
   - nightly
   - beta
   - stable
diff --git a/lib.rs b/lib.rs
index cedf2bd..4036547 100644
--- a/lib.rs
+++ b/lib.rs
@@ -60,6 +60,7 @@ use std::mem::ManuallyDrop;
 use std::ops;
 use std::ptr;
 use std::slice;
+use std::slice::SliceIndex;
 #[cfg(feature = "std")]
 use std::io;
 #[cfg(feature = "serde")]
@@ -1291,30 +1292,19 @@ impl<A: Array> From<A> for SmallVec<A> {
     }
 }
 
-macro_rules! impl_index {
-    ($index_type: ty, $output_type: ty) => {
-        impl<A: Array> ops::Index<$index_type> for SmallVec<A> {
-            type Output = $output_type;
-            #[inline]
-            fn index(&self, index: $index_type) -> &$output_type {
-                &(&**self)[index]
-            }
-        }
+impl<A: Array, I: SliceIndex<[A::Item]>> ops::Index<I> for SmallVec<A> {
+    type Output = I::Output;
 
-        impl<A: Array> ops::IndexMut<$index_type> for SmallVec<A> {
-            #[inline]
-            fn index_mut(&mut self, index: $index_type) -> &mut $output_type {
-                &mut (&mut **self)[index]
-            }
-        }
+    fn index(&self, index: I) -> &I::Output {
+        &(**self)[index]
     }
 }
 
-impl_index!(usize, A::Item);
-impl_index!(ops::Range<usize>, [A::Item]);
-impl_index!(ops::RangeFrom<usize>, [A::Item]);
-impl_index!(ops::RangeTo<usize>, [A::Item]);
-impl_index!(ops::RangeFull, [A::Item]);
+impl<A: Array, I: SliceIndex<[A::Item]>> ops::IndexMut<I> for SmallVec<A> {
+    fn index_mut(&mut self, index: I) -> &mut I::Output {
+        &mut (&mut **self)[index]
+    }
+}
 
 impl<A: Array> ExtendFromSlice<A::Item> for SmallVec<A> where A::Item: Copy {
     fn extend_from_slice(&mut self, other: &[A::Item]) {