about summary refs log tree commit diff
diff options
context:
space:
mode:
authorFlorian Diebold <flodiebold@gmail.com>2025-03-14 14:52:03 +0100
committerFlorian Diebold <flodiebold@gmail.com>2025-03-14 19:02:06 +0100
commit2c2bc99a634689840e1c2c465ca7382c2bf0e1b9 (patch)
tree91f748b63d8cf90f96f6753a105d2a1c949bffb7
parent35209f462bbb1506d03ae8b232c2d9f2b865f890 (diff)
downloadrust-2c2bc99a634689840e1c2c465ca7382c2bf0e1b9.tar.gz
rust-2c2bc99a634689840e1c2c465ca7382c2bf0e1b9.zip
Avoid recursively debug printing crates
-rw-r--r--src/tools/rust-analyzer/crates/base-db/src/input.rs3
-rw-r--r--src/tools/rust-analyzer/crates/ide-db/src/test_data/test_doc_alias.txt6
-rw-r--r--src/tools/rust-analyzer/crates/ide-db/src/test_data/test_symbol_index_collection.txt30
3 files changed, 20 insertions, 19 deletions
diff --git a/src/tools/rust-analyzer/crates/base-db/src/input.rs b/src/tools/rust-analyzer/crates/base-db/src/input.rs
index c4e64b372f3..913dfe6efb7 100644
--- a/src/tools/rust-analyzer/crates/base-db/src/input.rs
+++ b/src/tools/rust-analyzer/crates/base-db/src/input.rs
@@ -393,7 +393,8 @@ impl BuiltDependency {
 
 pub type CratesIdMap = FxHashMap<CrateBuilderId, Crate>;
 
-#[salsa::input]
+#[salsa::input(no_debug)]
+#[derive(Debug)]
 pub struct Crate {
     #[return_ref]
     pub data: BuiltCrateData,
diff --git a/src/tools/rust-analyzer/crates/ide-db/src/test_data/test_doc_alias.txt b/src/tools/rust-analyzer/crates/ide-db/src/test_data/test_doc_alias.txt
index 1e2d4f1ab94..a527ce19d20 100644
--- a/src/tools/rust-analyzer/crates/ide-db/src/test_data/test_doc_alias.txt
+++ b/src/tools/rust-analyzer/crates/ide-db/src/test_data/test_doc_alias.txt
@@ -2,9 +2,9 @@
     (
         Module {
             id: ModuleId {
-                krate: Crate {
-                    [salsa id]: Id(2c00),
-                },
+                krate: Crate(
+                    Id(2c00),
+                ),
                 block: None,
                 local_id: Idx::<ModuleData>(0),
             },
diff --git a/src/tools/rust-analyzer/crates/ide-db/src/test_data/test_symbol_index_collection.txt b/src/tools/rust-analyzer/crates/ide-db/src/test_data/test_symbol_index_collection.txt
index 1a77052b18d..82440d7c1ee 100644
--- a/src/tools/rust-analyzer/crates/ide-db/src/test_data/test_symbol_index_collection.txt
+++ b/src/tools/rust-analyzer/crates/ide-db/src/test_data/test_symbol_index_collection.txt
@@ -2,9 +2,9 @@
     (
         Module {
             id: ModuleId {
-                krate: Crate {
-                    [salsa id]: Id(2c00),
-                },
+                krate: Crate(
+                    Id(2c00),
+                ),
                 block: None,
                 local_id: Idx::<ModuleData>(0),
             },
@@ -534,9 +534,9 @@
                 def: Module(
                     Module {
                         id: ModuleId {
-                            krate: Crate {
-                                [salsa id]: Id(2c00),
-                            },
+                            krate: Crate(
+                                Id(2c00),
+                            ),
                             block: None,
                             local_id: Idx::<ModuleData>(1),
                         },
@@ -569,9 +569,9 @@
                 def: Module(
                     Module {
                         id: ModuleId {
-                            krate: Crate {
-                                [salsa id]: Id(2c00),
-                            },
+                            krate: Crate(
+                                Id(2c00),
+                            ),
                             block: None,
                             local_id: Idx::<ModuleData>(2),
                         },
@@ -833,9 +833,9 @@
     (
         Module {
             id: ModuleId {
-                krate: Crate {
-                    [salsa id]: Id(2c00),
-                },
+                krate: Crate(
+                    Id(2c00),
+                ),
                 block: None,
                 local_id: Idx::<ModuleData>(1),
             },
@@ -879,9 +879,9 @@
     (
         Module {
             id: ModuleId {
-                krate: Crate {
-                    [salsa id]: Id(2c00),
-                },
+                krate: Crate(
+                    Id(2c00),
+                ),
                 block: None,
                 local_id: Idx::<ModuleData>(2),
             },