From 2c2bc99a634689840e1c2c465ca7382c2bf0e1b9 Mon Sep 17 00:00:00 2001 From: Florian Diebold Date: Fri, 14 Mar 2025 14:52:03 +0100 Subject: [PATCH] Avoid recursively debug printing crates --- .../rust-analyzer/crates/base-db/src/input.rs | 3 +- .../ide-db/src/test_data/test_doc_alias.txt | 6 ++-- .../test_symbol_index_collection.txt | 30 +++++++++---------- 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 c4e64b372f36..913dfe6efb77 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; -#[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 1e2d4f1ab94f..a527ce19d205 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::(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 1a77052b18d4..82440d7c1ee0 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::(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::(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::(2), }, @@ -833,9 +833,9 @@ ( Module { id: ModuleId { - krate: Crate { - [salsa id]: Id(2c00), - }, + krate: Crate( + Id(2c00), + ), block: None, local_id: Idx::(1), }, @@ -879,9 +879,9 @@ ( Module { id: ModuleId { - krate: Crate { - [salsa id]: Id(2c00), - }, + krate: Crate( + Id(2c00), + ), block: None, local_id: Idx::(2), },