Use IndexSets of RecordedItemId

Author: pierwill

chalk-solve/src/logging_db.rs

@@ -2,7 +2,6 @@
 //! `.chalk` files containing those definitions.
 use std::{
     borrow::Borrow,
-    collections::BTreeSet,
     fmt::{self, Debug, Display},
     io::Write,
     marker::PhantomData,
@@ -35,7 +34,7 @@ where
     I: Interner,
 {
     ws: WriterState<I, DB, P>,
-    def_ids: Mutex<BTreeSet<RecordedItemId<I>>>,
+    def_ids: Mutex<indexmap::IndexSet<RecordedItemId<I>>>,
     _phantom: PhantomData<DB>,
 }
 
@@ -534,7 +533,7 @@ where
     }
 }
 
-#[derive(Copy, Clone, PartialEq, Eq, Debug)]
+#[derive(Copy, Clone, PartialEq, Eq, Debug, Hash)]
 pub enum RecordedItemId<I: Interner> {
     Adt(AdtId<I>),
     Trait(TraitId<I>),
@@ -595,3 +594,10 @@ impl<I: Interner> RecordedItemId<I> {
         }
     }
 }
+
+/// Utility for implementing Ord for RecordedItemId.
+#[derive(PartialEq, Eq, PartialOrd, Ord)]
+enum OrderedItemId<'a, DefId, AdtId> {
+    DefId(&'a DefId),
+    AdtId(&'a AdtId),
+}

chalk-solve/src/logging_db/id_collector.rs

@@ -6,7 +6,6 @@ use chalk_ir::{
     visit::{SuperVisit, Visit},
     AliasTy, DebruijnIndex, TyKind, WhereClause,
 };
-use std::collections::BTreeSet;
 use std::ops::ControlFlow;
 
 /// Collects the identifiers needed to resolve all the names for a given
@@ -34,11 +33,11 @@ use std::ops::ControlFlow;
 /// resolution is successful.
 pub fn collect_unrecorded_ids<'i, I: Interner, DB: RustIrDatabase<I>>(
     db: &'i DB,
-    identifiers: &'_ BTreeSet<RecordedItemId<I>>,
-) -> BTreeSet<RecordedItemId<I>> {
+    identifiers: &'_ indexmap::IndexSet<RecordedItemId<I>>,
+) -> indexmap::IndexSet<RecordedItemId<I>> {
     let mut collector = IdCollector {
         db,
-        found_identifiers: BTreeSet::new(),
+        found_identifiers: indexmap::IndexSet::new(),
     };
     for id in identifiers {
         match *id {
@@ -96,7 +95,7 @@ pub fn collect_unrecorded_ids<'i, I: Interner, DB: RustIrDatabase<I>>(
 
 struct IdCollector<'i, I: Interner, DB: RustIrDatabase<I>> {
     db: &'i DB,
-    found_identifiers: BTreeSet<RecordedItemId<I>>,
+    found_identifiers: indexmap::IndexSet<RecordedItemId<I>>,
 }
 
 impl<'i, I: Interner, DB: RustIrDatabase<I>> IdCollector<'i, I, DB> {