revert: ty_project::Project: FxIndexSet -> FxHashSet

Author: mtshiba

crates/ruff_benchmark/benches/ty.rs

@@ -17,7 +17,7 @@ use ruff_python_ast::PythonVersion;
 use ty_project::metadata::options::{EnvironmentOptions, Options};
 use ty_project::metadata::value::{RangedValue, RelativePathBuf};
 use ty_project::watch::{ChangeEvent, ChangedKind};
-use ty_project::{CheckMode, Db, FxIndexSet, ProjectDatabase, ProjectMetadata};
+use ty_project::{CheckMode, Db, FxHashSet, ProjectDatabase, ProjectMetadata};
 
 struct Case {
     db: ProjectDatabase,
@@ -88,7 +88,7 @@ fn setup_tomllib_case() -> Case {
     });
 
     let mut db = ProjectDatabase::new(metadata, system).unwrap();
-    let mut tomllib_files = FxIndexSet::default();
+    let mut tomllib_files = FxHashSet::default();
     let mut re: Option<File> = None;
 
     for test_file in &TOMLLIB_FILES {
@@ -239,7 +239,7 @@ fn setup_micro_case(code: &str) -> Case {
 
     db.set_check_mode(CheckMode::OpenFiles);
     db.project()
-        .set_open_files(&mut db, FxIndexSet::from_iter([file]));
+        .set_open_files(&mut db, FxHashSet::from_iter([file]));
 
     let file_path = file.path(&db).as_system_path().unwrap().to_owned();
 

crates/ty_project/src/lib.rs

@@ -29,7 +29,7 @@ use tracing::error;
 use ty_python_semantic::add_inferred_python_version_hint_to_diagnostic;
 use ty_python_semantic::lint::RuleSelection;
 use ty_python_semantic::types::check_types;
-pub use ty_python_semantic::{FxIndexMap, FxIndexSet};
+pub use ty_python_semantic::{FxHashMap, FxHashSet};
 
 mod db;
 mod files;
@@ -55,7 +55,7 @@ pub struct Project {
     /// The files that are open in the project, [`None`] if there are no open files.
     #[returns(ref)]
     #[default]
-    open_fileset: FxIndexSet<File>,
+    open_fileset: FxHashSet<File>,
 
     /// The first-party files of this project.
     #[default]
@@ -354,7 +354,7 @@ impl Project {
         tracing::debug!("Closing file `{}`", file.path(db));
 
         let mut open_files = self.take_open_files(db);
-        let removed = open_files.swap_remove(&file);
+        let removed = open_files.remove(&file);
 
         if removed {
             self.set_open_files(db, open_files);
@@ -398,25 +398,25 @@ impl Project {
     }
 
     /// Returns the open files in the project or `None` if there are no open files.
-    pub fn open_files(self, db: &dyn Db) -> &FxIndexSet<File> {
+    pub fn open_files(self, db: &dyn Db) -> &FxHashSet<File> {
         self.open_fileset(db)
     }
 
     /// Sets the open files in the project.
     #[tracing::instrument(level = "debug", skip(self, db))]
-    pub fn set_open_files(self, db: &mut dyn Db, open_files: FxIndexSet<File>) {
+    pub fn set_open_files(self, db: &mut dyn Db, open_files: FxHashSet<File>) {
         tracing::debug!("Set open project files (count: {})", open_files.len());
 
         self.set_open_fileset(db).to(open_files);
     }
 
     /// This takes the open files from the project and returns them.
-    fn take_open_files(self, db: &mut dyn Db) -> FxIndexSet<File> {
+    fn take_open_files(self, db: &mut dyn Db) -> FxHashSet<File> {
         tracing::debug!("Take open project files");
 
         // Salsa will cancel any pending queries and remove its own reference to `open_files`
         // so that the reference counter to `open_files` now drops to 1.
-        self.set_open_fileset(db).to(FxIndexSet::default())
+        self.set_open_fileset(db).to(FxHashSet::default())
     }
 
     /// Returns `true` if the file should be checked.
@@ -586,7 +586,7 @@ pub(crate) fn check_file_impl(db: &dyn Db, file: File) -> Result<Box<[Diagnostic
 
 #[derive(Debug)]
 enum ProjectFiles<'a> {
-    OpenFiles(&'a FxIndexSet<File>),
+    OpenFiles(&'a FxHashSet<File>),
     Indexed(files::Indexed<'a>),
 }
 
@@ -619,14 +619,14 @@ impl<'a> IntoIterator for &'a ProjectFiles<'a> {
 
     fn into_iter(self) -> Self::IntoIter {
         match self {
-            ProjectFiles::OpenFiles(files) => ProjectFilesIter::OpenFiles(files.iter()),
+            ProjectFiles::OpenFiles(files) => ProjectFilesIter::OpenFiles(files.unstable_iter()),
             ProjectFiles::Indexed(files) => ProjectFilesIter::Indexed(files.into_iter()),
         }
     }
 }
 
 enum ProjectFilesIter<'db> {
-    OpenFiles(indexmap::set::Iter<'db, File>),
+    OpenFiles(std::collections::hash_set::Iter<'db, File>),
     Indexed(files::IndexedIter<'db>),
 }