Implement additional suggestions from review

(cherry picked from commit 5be552d)

Author: cuviper

src/lib.rs

@@ -268,12 +268,12 @@ impl core::fmt::Display for TryReserveError {
 impl std::error::Error for TryReserveError {}
 
 // NOTE: This is copied from the slice module in the std lib.
-/// The error type returned by [`get_disjoint_indices_mut`][`IndexMap::get_disjoint_indices_mut`].
+/// The error type returned by [`get_disjoint_indices_mut`][`RingMap::get_disjoint_indices_mut`].
 ///
 /// It indicates one of two possible errors:
 /// - An index is out-of-bounds.
-/// - The same index appeared multiple times in the array
-///   (or different but overlapping indices when ranges are provided).
+/// - The same index appeared multiple times in the array.
+//    (or different but overlapping indices when ranges are provided)
 #[derive(Debug, Clone, PartialEq, Eq)]
 pub enum GetDisjointMutError {
     /// An index provided was out-of-bounds for the slice.

src/map.rs

@@ -833,10 +833,9 @@ where
     /// let mut map = ringmap::RingMap::from([(1, 'a'), (3, 'b'), (2, 'c')]);
     /// assert_eq!(map.get_disjoint_mut([&2, &1]), [Some(&mut 'c'), Some(&mut 'a')]);
     /// ```
-    #[allow(unsafe_code)]
     pub fn get_disjoint_mut<Q, const N: usize>(&mut self, keys: [&Q; N]) -> [Option<&mut V>; N]
     where
-        Q: Hash + Equivalent<K> + ?Sized,
+        Q: ?Sized + Hash + Equivalent<K>,
     {
         let indices = keys.map(|key| self.get_index_of(key));
         match self.as_mut_slice().get_disjoint_opt_mut(indices) {

src/map/slice.rs

@@ -291,7 +291,7 @@ impl<K, V> Slice<K, V> {
             };
             if idx >= len {
                 return Err(GetDisjointMutError::IndexOutOfBounds);
-            } else if indices[i + 1..N].contains(&Some(idx)) {
+            } else if indices[..i].contains(&Some(idx)) {
                 return Err(GetDisjointMutError::OverlappingIndices);
             }
         }

src/map/tests.rs

@@ -1097,7 +1097,7 @@ fn disjoint_indices_mut_fail_duplicate() {
     map.insert(1, 10);
     map.insert(321, 20);
     assert_eq!(
-        map.get_disjoint_indices_mut([1, 2, 1]),
+        map.get_disjoint_indices_mut([1, 0, 1]),
         Err(crate::GetDisjointMutError::OverlappingIndices)
     );
 }