Auto merge of rust-lang#14475 - Veykril:crate-origins, r=Veykril

Handle dev-dependency cycles

cc rust-lang/rust-analyzer#14167

This should fix cycles errors mostly (it fixes the one on rome/tools at least, but not on rustc. Though  there it might just be because of rustc workspace being rustc workspace). Unfortunately this will effectively duplicate all crates currently, since if we want to be completely correct we'd need to set the test cfg for all dev dependencies and the transitive dependencies of those, something I worry we should try to avoid.

Author: bors

Cargo.lock

@@ -14,6 +14,7 @@ doctest = false
 [dependencies]
 salsa = "0.17.0-pre.2"
 rustc-hash = "1.1.0"
+indexmap = "1.6.0"
 
 la-arena = { version = "0.3.0", path = "../../lib/la-arena" }
 

crates/base-db/Cargo.toml

@@ -417,6 +417,11 @@ impl CrateGraph {
         Ok(())
     }
 
+    pub fn duplicate(&mut self, id: CrateId) -> CrateId {
+        let data = self[id].clone();
+        self.arena.alloc(data)
+    }
+
     pub fn add_dep(
         &mut self,
         from: CrateId,
@@ -612,6 +617,12 @@ impl ops::Index<CrateId> for CrateGraph {
     }
 }
 
+impl ops::IndexMut<CrateId> for CrateGraph {
+    fn index_mut(&mut self, crate_id: CrateId) -> &mut CrateData {
+        &mut self.arena[crate_id]
+    }
+}
+
 impl CrateData {
     fn add_dep(&mut self, dep: Dependency) {
         self.dependencies.push(dep)

crates/base-db/src/input.rs

@@ -6,9 +6,10 @@ mod input;
 mod change;
 pub mod fixture;
 
-use std::{panic, sync::Arc};
+use std::{hash::BuildHasherDefault, panic, sync::Arc};
 
-use rustc_hash::FxHashSet;
+use indexmap::IndexSet;
+use rustc_hash::FxHasher;
 use syntax::{ast, Parse, SourceFile, TextRange, TextSize};
 
 pub use crate::{
@@ -59,7 +60,10 @@ pub trait FileLoader {
     /// Text of the file.
     fn file_text(&self, file_id: FileId) -> Arc<str>;
     fn resolve_path(&self, path: AnchoredPath<'_>) -> Option<FileId>;
-    fn relevant_crates(&self, file_id: FileId) -> Arc<FxHashSet<CrateId>>;
+    fn relevant_crates(
+        &self,
+        file_id: FileId,
+    ) -> Arc<IndexSet<CrateId, BuildHasherDefault<FxHasher>>>;
 }
 
 /// Database which stores all significant input facts: source code and project
@@ -99,10 +103,16 @@ pub trait SourceDatabaseExt: SourceDatabase {
     #[salsa::input]
     fn source_root(&self, id: SourceRootId) -> Arc<SourceRoot>;
 
-    fn source_root_crates(&self, id: SourceRootId) -> Arc<FxHashSet<CrateId>>;
+    fn source_root_crates(
+        &self,
+        id: SourceRootId,
+    ) -> Arc<IndexSet<CrateId, BuildHasherDefault<FxHasher>>>;
 }
 
-fn source_root_crates(db: &dyn SourceDatabaseExt, id: SourceRootId) -> Arc<FxHashSet<CrateId>> {
+fn source_root_crates(
+    db: &dyn SourceDatabaseExt,
+    id: SourceRootId,
+) -> Arc<IndexSet<CrateId, BuildHasherDefault<FxHasher>>> {
     let graph = db.crate_graph();
     let res = graph
         .iter()
@@ -128,7 +138,10 @@ impl<T: SourceDatabaseExt> FileLoader for FileLoaderDelegate<&'_ T> {
         source_root.resolve_path(path)
     }
 
-    fn relevant_crates(&self, file_id: FileId) -> Arc<FxHashSet<CrateId>> {
+    fn relevant_crates(
+        &self,
+        file_id: FileId,
+    ) -> Arc<IndexSet<CrateId, BuildHasherDefault<FxHasher>>> {
         let _p = profile::span("relevant_crates");
         let source_root = self.0.file_source_root(file_id);
         self.0.source_root_crates(source_root)

crates/base-db/src/lib.rs

@@ -1,7 +1,9 @@
 //! Database used for testing `hir_def`.
 
 use std::{
-    fmt, panic,
+    fmt,
+    hash::BuildHasherDefault,
+    panic,
     sync::{Arc, Mutex},
 };
 
@@ -11,7 +13,8 @@ use base_db::{
     Upcast,
 };
 use hir_expand::{db::ExpandDatabase, InFile};
-use rustc_hash::FxHashSet;
+use indexmap::IndexSet;
+use rustc_hash::FxHasher;
 use syntax::{algo, ast, AstNode};
 
 use crate::{
@@ -77,7 +80,10 @@ impl FileLoader for TestDB {
     fn resolve_path(&self, path: AnchoredPath<'_>) -> Option<FileId> {
         FileLoaderDelegate(self).resolve_path(path)
     }
-    fn relevant_crates(&self, file_id: FileId) -> Arc<FxHashSet<CrateId>> {
+    fn relevant_crates(
+        &self,
+        file_id: FileId,
+    ) -> Arc<IndexSet<CrateId, BuildHasherDefault<FxHasher>>> {
         FileLoaderDelegate(self).relevant_crates(file_id)
     }
 }

crates/hir-def/src/test_db.rs

@@ -30,6 +30,7 @@ la-arena = { version = "0.3.0", path = "../../lib/la-arena" }
 once_cell = "1.17.0"
 typed-arena = "2.0.1"
 rustc_index = { version = "0.0.20221221", package = "hkalbasi-rustc-ap-rustc_index", default-features = false }
+indexmap = "1.6.0"
 
 # local deps
 stdx.workspace = true

crates/hir-ty/Cargo.toml

@@ -1,7 +1,9 @@
 //! Database used for testing `hir`.
 
 use std::{
-    fmt, panic,
+    fmt,
+    hash::BuildHasherDefault,
+    panic,
     sync::{Arc, Mutex},
 };
 
@@ -11,7 +13,8 @@ use base_db::{
 };
 use hir_def::{db::DefDatabase, ModuleId};
 use hir_expand::db::ExpandDatabase;
-use rustc_hash::FxHashSet;
+use indexmap::IndexSet;
+use rustc_hash::FxHasher;
 use stdx::hash::NoHashHashMap;
 use syntax::TextRange;
 use test_utils::extract_annotations;
@@ -82,7 +85,10 @@ impl FileLoader for TestDB {
     fn resolve_path(&self, path: AnchoredPath<'_>) -> Option<FileId> {
         FileLoaderDelegate(self).resolve_path(path)
     }
-    fn relevant_crates(&self, file_id: FileId) -> Arc<FxHashSet<CrateId>> {
+    fn relevant_crates(
+        &self,
+        file_id: FileId,
+    ) -> Arc<IndexSet<CrateId, BuildHasherDefault<FxHasher>>> {
         FileLoaderDelegate(self).relevant_crates(file_id)
     }
 }

crates/hir-ty/src/test_db.rs

@@ -119,7 +119,9 @@ impl SourceToDefCtx<'_, '_> {
     pub(super) fn file_to_def(&self, file: FileId) -> SmallVec<[ModuleId; 1]> {
         let _p = profile::span("SourceBinder::to_module_def");
         let mut mods = SmallVec::new();
-        for &crate_id in self.db.relevant_crates(file).iter() {
+        // HACK: We iterate in reverse so that dev-dependency duplicated crates appear first in this
+        // Most code only deals with one module and we want to prefer the test enabled code where possible
+        for &crate_id in self.db.relevant_crates(file).iter().rev() {
             // FIXME: inner items
             let crate_def_map = self.db.crate_def_map(crate_id);
             mods.extend(

crates/hir/src/semantics/source_to_def.rs

@@ -43,7 +43,7 @@ pub mod syntax_helpers {
     pub use parser::LexedStr;
 }
 
-use std::{fmt, mem::ManuallyDrop, sync::Arc};
+use std::{fmt, hash::BuildHasherDefault, mem::ManuallyDrop, sync::Arc};
 
 use base_db::{
     salsa::{self, Durability},
@@ -53,6 +53,7 @@ use hir::{
     db::{DefDatabase, ExpandDatabase, HirDatabase},
     symbols::FileSymbolKind,
 };
+use indexmap::IndexSet;
 
 use crate::{line_index::LineIndex, symbol_index::SymbolsDatabase};
 pub use rustc_hash::{FxHashMap, FxHashSet, FxHasher};
@@ -119,7 +120,10 @@ impl FileLoader for RootDatabase {
     fn resolve_path(&self, path: AnchoredPath<'_>) -> Option<FileId> {
         FileLoaderDelegate(self).resolve_path(path)
     }
-    fn relevant_crates(&self, file_id: FileId) -> Arc<FxHashSet<CrateId>> {
+    fn relevant_crates(
+        &self,
+        file_id: FileId,
+    ) -> Arc<IndexSet<CrateId, BuildHasherDefault<FxHasher>>> {
         FileLoaderDelegate(self).relevant_crates(file_id)
     }
 }

crates/ide-db/src/lib.rs

@@ -5,7 +5,7 @@ use std::{
 
 use base_db::{CrateGraph, FileId, ProcMacroPaths};
 use cfg::{CfgAtom, CfgDiff};
-use expect_test::{expect, Expect};
+use expect_test::{expect, expect_file, Expect, ExpectFile};
 use paths::{AbsPath, AbsPathBuf};
 use serde::de::DeserializeOwned;
 
@@ -114,6 +114,11 @@ fn check_crate_graph(crate_graph: CrateGraph, expect: Expect) {
     replace_root(&mut crate_graph, false);
     expect.assert_eq(&crate_graph);
 }
+fn check_crate_graph_f(crate_graph: CrateGraph, expect: ExpectFile) {
+    let mut crate_graph = format!("{crate_graph:#?}");
+    replace_root(&mut crate_graph, false);
+    expect.assert_eq(&crate_graph);
+}
 
 #[test]
 fn cargo_hello_world_project_model_with_wildcard_overrides() {
@@ -1666,3 +1671,12 @@ fn rust_project_is_proc_macro_has_proc_macro_dep() {
     // on the proc_macro sysroot crate.
     crate_data.dependencies.iter().find(|&dep| dep.name.deref() == "proc_macro").unwrap();
 }
+
+#[test]
+fn cargo_dev_dependencies() {
+    let (crate_graph, _proc_macros) = load_cargo("complex-with-dev-deps.json");
+    check_crate_graph_f(
+        crate_graph,
+        expect_file!["../test_data/cargo_dev_dependencies-crate-graph.txt"],
+    )
+}