Add Eq and PartialEq to Idx

Author: pierwill

compiler/rustc_data_structures/src/graph/scc/mod.rs

@@ -419,7 +419,7 @@ where
 
         // Move the stack to a local variable. We want to utilize the existing allocation and
         // mutably borrow it without borrowing self at the same time.
-        let mut successors_stack = core::mem::take(&mut self.successors_stack);
+        let mut successors_stack: Vec<S> = core::mem::take(&mut self.successors_stack);
         debug_assert_eq!(successors_stack.len(), 0);
 
         let mut stack: Vec<VisitingNodeFrame<G, _>> = vec![VisitingNodeFrame {
@@ -524,7 +524,7 @@ where
 
             // Completed walk, remove `node` from the stack.
             let r = self.node_stack.pop();
-            debug_assert_eq!(r, Some(node));
+            debug_assert_eq!(r.unwrap().index(), node.index());
 
             // Remove the frame, it's done.
             let frame = stack.pop().unwrap();

compiler/rustc_data_structures/src/sorted_map/index_map.rs

@@ -97,7 +97,7 @@ impl<I: Idx, K: Eq, V: Eq> Eq for SortedIndexMultiMap<I, K, V> {}
 impl<I: Idx, K: PartialEq, V: PartialEq> PartialEq for SortedIndexMultiMap<I, K, V> {
     fn eq(&self, other: &Self) -> bool {
         // No need to compare the sorted index. If the items are the same, the index will be too.
-        self.items == other.items
+        self == other
     }
 }
 

compiler/rustc_index/src/vec.rs

@@ -12,7 +12,7 @@ use std::vec;
 /// Represents some newtyped `usize` wrapper.
 ///
 /// Purpose: avoid mixing indexes for different bitvector domains.
-pub trait Idx: Copy + 'static + Debug + Hash {
+pub trait Idx: Copy + 'static + Eq + PartialEq + Debug + Hash {
     fn new(idx: usize) -> Self;
 
     fn index(self) -> usize;