about summary refs log tree commit diff
path: root/crates/rust-analyzer
diff options
context:
space:
mode:
authorLukas Wirth <lukastw97@gmail.com>2023-12-12 15:44:27 +0100
committerLukas Wirth <lukastw97@gmail.com>2023-12-12 15:45:42 +0100
commitca995d765d37cdcd18705ecdbbe712307f0f6bc4 (patch)
tree007c9ed4503eb3cd86a685f10080481f357b0741 /crates/rust-analyzer
parent3aa630672893fff37a3ab83d391267ead3507c97 (diff)
downloadrust-ca995d765d37cdcd18705ecdbbe712307f0f6bc4.tar.gz
rust-ca995d765d37cdcd18705ecdbbe712307f0f6bc4.zip
fix: Fix `import_map::search_dependencies` getting confused by assoc and non assoc items with the same name
Diffstat (limited to 'crates/rust-analyzer')
-rw-r--r--crates/rust-analyzer/src/integrated_benchmarks.rs10
1 files changed, 8 insertions, 2 deletions
diff --git a/crates/rust-analyzer/src/integrated_benchmarks.rs b/crates/rust-analyzer/src/integrated_benchmarks.rs
index ed2cf07551b..3d0ebf9bde6 100644
--- a/crates/rust-analyzer/src/integrated_benchmarks.rs
+++ b/crates/rust-analyzer/src/integrated_benchmarks.rs
@@ -32,7 +32,10 @@ fn integrated_highlighting_benchmark() {
     let workspace_to_load = project_root();
     let file = "./crates/rust-analyzer/src/config.rs";
 
-    let cargo_config = CargoConfig::default();
+    let cargo_config = CargoConfig {
+        sysroot: Some(project_model::RustLibSource::Discover),
+        ..CargoConfig::default()
+    };
     let load_cargo_config = LoadCargoConfig {
         load_out_dirs_from_check: true,
         with_proc_macro_server: ProcMacroServerChoice::None,
@@ -85,7 +88,10 @@ fn integrated_completion_benchmark() {
     let workspace_to_load = project_root();
     let file = "./crates/hir/src/lib.rs";
 
-    let cargo_config = CargoConfig::default();
+    let cargo_config = CargoConfig {
+        sysroot: Some(project_model::RustLibSource::Discover),
+        ..CargoConfig::default()
+    };
     let load_cargo_config = LoadCargoConfig {
         load_out_dirs_from_check: true,
         with_proc_macro_server: ProcMacroServerChoice::None,