use BTreeMap for ty_project::files::Indexed

Author: mtshiba

crates/ruff_benchmark/benches/ty.rs

@@ -2,6 +2,7 @@
 use ruff_benchmark::criterion;
 use ruff_benchmark::real_world_projects::{InstalledProject, RealWorldProject};
 
+use std::collections::BTreeSet;
 use std::fmt::Write;
 use std::ops::Range;
 
@@ -17,7 +18,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, FxHashSet, ProjectDatabase, ProjectMetadata};
+use ty_project::{CheckMode, Db, ProjectDatabase, ProjectMetadata};
 
 struct Case {
     db: ProjectDatabase,
@@ -88,7 +89,7 @@ fn setup_tomllib_case() -> Case {
     });
 
     let mut db = ProjectDatabase::new(metadata, system).unwrap();
-    let mut tomllib_files = FxHashSet::default();
+    let mut tomllib_files = BTreeSet::default();
     let mut re: Option<File> = None;
 
     for test_file in &TOMLLIB_FILES {
@@ -239,7 +240,7 @@ fn setup_micro_case(code: &str) -> Case {
 
     db.set_check_mode(CheckMode::OpenFiles);
     db.project()
-        .set_open_files(&mut db, FxHashSet::from_iter([file]));
+        .set_open_files(&mut db, BTreeSet::from_iter([file]));
 
     let file_path = file.path(&db).as_system_path().unwrap().to_owned();
 

crates/ty_project/src/db/changes.rs

@@ -52,7 +52,7 @@ impl ProjectDatabase {
             custom_stdlib_changed: false,
         };
         // Paths that were added
-        let mut added_paths = FxHashSet::default();
+        let mut added_paths = BTreeSet::default();
 
         // Deduplicate the `sync` calls. Many file watchers emit multiple events for the same path.
         let mut synced_files = FxHashSet::default();
@@ -317,20 +317,19 @@ impl ProjectDatabase {
             }
         }
 
-        let diagnostics = if let Some(walker) =
-            ProjectFilesWalker::incremental(self, added_paths.unstable_iter())
-        {
-            // Use directory walking to discover newly added files.
-            let (files, diagnostics) = walker.collect_vec(self);
+        let diagnostics =
+            if let Some(walker) = ProjectFilesWalker::incremental(self, added_paths.into_iter()) {
+                // Use directory walking to discover newly added files.
+                let (files, diagnostics) = walker.collect_vec(self);
 
-            for file in files {
-                project.add_file(self, file);
-            }
+                for file in files {
+                    project.add_file(self, file);
+                }
 
-            diagnostics
-        } else {
-            Vec::new()
-        };
+                diagnostics
+            } else {
+                Vec::new()
+            };
 
         // Note: We simply replace all IO related diagnostics here. This isn't ideal, because
         // it removes IO errors that may still be relevant. However, tracking IO errors correctly

crates/ty_project/src/files.rs

@@ -1,9 +1,9 @@
+use std::collections::BTreeSet;
 use std::marker::PhantomData;
 use std::ops::Deref;
 use std::sync::Arc;
 
 use salsa::Setter;
-use ty_python_semantic::FxIndexSet;
 
 use ruff_db::files::File;
 
@@ -127,7 +127,7 @@ impl<'db> LazyFiles<'db> {
     /// Sets the indexed files of a package to `files`.
     pub(super) fn set(
         mut self,
-        files: FxIndexSet<File>,
+        files: BTreeSet<File>,
         diagnostics: Vec<IOErrorDiagnostic>,
     ) -> Indexed<'db> {
         let files = Indexed {
@@ -152,7 +152,7 @@ pub struct Indexed<'db> {
 
 #[derive(Debug, get_size2::GetSize)]
 struct IndexedInner {
-    files: FxIndexSet<File>,
+    files: BTreeSet<File>,
     diagnostics: Vec<IOErrorDiagnostic>,
 }
 
@@ -167,14 +167,14 @@ impl Indexed<'_> {
 }
 
 impl Deref for Indexed<'_> {
-    type Target = FxIndexSet<File>;
+    type Target = BTreeSet<File>;
 
     fn deref(&self) -> &Self::Target {
         &self.inner.files
     }
 }
 
-pub(super) type IndexedIter<'a> = std::iter::Copied<indexmap::set::Iter<'a, File>>;
+pub(super) type IndexedIter<'a> = std::iter::Copied<std::collections::btree_set::Iter<'a, File>>;
 
 impl<'a> IntoIterator for &'a Indexed<'_> {
     type Item = File;
@@ -207,7 +207,7 @@ impl IndexedMut<'_> {
     }
 
     pub(super) fn remove(&mut self, file: File) -> bool {
-        if self.inner_mut().files.swap_remove(&file) {
+        if self.inner_mut().files.remove(&file) {
             self.did_change = true;
             true
         } else {
@@ -251,7 +251,7 @@ impl Drop for IndexedMut<'_> {
 
 #[cfg(test)]
 mod tests {
-    use ty_python_semantic::FxIndexSet;
+    use std::collections::BTreeSet;
 
     use crate::ProjectMetadata;
     use crate::db::Db;
@@ -273,7 +273,7 @@ mod tests {
         let file = system_path_to_file(&db, "test.py").unwrap();
 
         let files = match project.file_set(&db).get() {
-            Index::Lazy(lazy) => lazy.set(FxIndexSet::from_iter([file]), Vec::new()),
+            Index::Lazy(lazy) => lazy.set(BTreeSet::from_iter([file]), Vec::new()),
             Index::Indexed(files) => files,
         };
 

crates/ty_project/src/lib.rs

@@ -21,6 +21,7 @@ use ruff_db::system::{SystemPath, SystemPathBuf};
 use salsa::Durability;
 use salsa::Setter;
 use std::backtrace::BacktraceStatus;
+use std::collections::BTreeSet;
 use std::iter::FusedIterator;
 use std::panic::{AssertUnwindSafe, UnwindSafe};
 use std::sync::Arc;
@@ -55,7 +56,7 @@ pub struct Project {
     /// The files that are open in the project, [`None`] if there are no open files.
     #[returns(ref)]
     #[default]
-    open_fileset: FxHashSet<File>,
+    open_fileset: BTreeSet<File>,
 
     /// The first-party files of this project.
     #[default]
@@ -398,25 +399,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) -> &FxHashSet<File> {
+    pub fn open_files(self, db: &dyn Db) -> &BTreeSet<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: FxHashSet<File>) {
+    pub fn set_open_files(self, db: &mut dyn Db, open_files: BTreeSet<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) -> FxHashSet<File> {
+    fn take_open_files(self, db: &mut dyn Db) -> BTreeSet<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(FxHashSet::default())
+        self.set_open_fileset(db).to(BTreeSet::default())
     }
 
     /// Returns `true` if the file should be checked.
@@ -586,7 +587,7 @@ pub(crate) fn check_file_impl(db: &dyn Db, file: File) -> Result<Box<[Diagnostic
 
 #[derive(Debug)]
 enum ProjectFiles<'a> {
-    OpenFiles(&'a FxHashSet<File>),
+    OpenFiles(&'a BTreeSet<File>),
     Indexed(files::Indexed<'a>),
 }
 
@@ -619,14 +620,14 @@ impl<'a> IntoIterator for &'a ProjectFiles<'a> {
 
     fn into_iter(self) -> Self::IntoIter {
         match self {
-            ProjectFiles::OpenFiles(files) => ProjectFilesIter::OpenFiles(files.unstable_iter()),
+            ProjectFiles::OpenFiles(files) => ProjectFilesIter::OpenFiles(files.iter()),
             ProjectFiles::Indexed(files) => ProjectFilesIter::Indexed(files.into_iter()),
         }
     }
 }
 
 enum ProjectFilesIter<'db> {
-    OpenFiles(std::collections::hash_set::Iter<'db, File>),
+    OpenFiles(std::collections::btree_set::Iter<'db, File>),
     Indexed(files::IndexedIter<'db>),
 }
 

crates/ty_project/src/walk.rs

@@ -4,9 +4,9 @@ use ruff_db::files::{File, system_path_to_file};
 use ruff_db::system::walk_directory::{ErrorKind, WalkDirectoryBuilder, WalkState};
 use ruff_db::system::{SystemPath, SystemPathBuf};
 use ruff_python_ast::PySourceType;
+use std::collections::BTreeSet;
 use std::path::PathBuf;
 use thiserror::Error;
-use ty_python_semantic::FxIndexSet;
 
 /// Filter that decides which files are included in the project.
 ///
@@ -285,7 +285,7 @@ impl<'a> ProjectFilesWalker<'a> {
         )
     }
 
-    pub(crate) fn collect_set(self, db: &dyn Db) -> (FxIndexSet<File>, Vec<IOErrorDiagnostic>) {
+    pub(crate) fn collect_set(self, db: &dyn Db) -> (BTreeSet<File>, Vec<IOErrorDiagnostic>) {
         let (files, diagnostics) = self.collect_vec(db);
         (files.into_iter().collect(), diagnostics)
     }