diff options
author | Daniel McNab <[email protected]> | 2021-03-08 16:37:52 +0000 |
---|---|---|
committer | Daniel McNab <[email protected]> | 2021-03-08 16:37:52 +0000 |
commit | bbecea03fda57cced0b4ba95f4bbd45f8d88102c (patch) | |
tree | 3061c3ecbb5cdfb3c302efb7cd536de356e8cff8 /crates/rust-analyzer/src/cli/ssr.rs | |
parent | ddce6bb282764692d53b719bff4c37e3512d4556 (diff) |
Revert "Support disabling rustc build scripts"
This reverts commit ddce6bb282764692d53b719bff4c37e3512d4556.
Diffstat (limited to 'crates/rust-analyzer/src/cli/ssr.rs')
-rw-r--r-- | crates/rust-analyzer/src/cli/ssr.rs | 18 |
1 files changed, 4 insertions, 14 deletions
diff --git a/crates/rust-analyzer/src/cli/ssr.rs b/crates/rust-analyzer/src/cli/ssr.rs index 8cc4eefc2..79f426fff 100644 --- a/crates/rust-analyzer/src/cli/ssr.rs +++ b/crates/rust-analyzer/src/cli/ssr.rs | |||
@@ -9,13 +9,8 @@ use ide_ssr::{MatchFinder, SsrPattern, SsrRule}; | |||
9 | pub fn apply_ssr_rules(rules: Vec<SsrRule>) -> Result<()> { | 9 | pub fn apply_ssr_rules(rules: Vec<SsrRule>) -> Result<()> { |
10 | use ide_db::base_db::SourceDatabaseExt; | 10 | use ide_db::base_db::SourceDatabaseExt; |
11 | let cargo_config = Default::default(); | 11 | let cargo_config = Default::default(); |
12 | let load_cargo_config = LoadCargoConfig { | 12 | let load_cargo_config = |
13 | load_out_dirs_from_check: true, | 13 | LoadCargoConfig { load_out_dirs_from_check: true, with_proc_macro: true }; |
14 | with_proc_macro: true, | ||
15 | // This will currently never have rustcSource set, however if in | ||
16 | // future it does this will handle that case | ||
17 | run_rustc_build_scripts: true, | ||
18 | }; | ||
19 | let (host, vfs, _proc_macro) = | 14 | let (host, vfs, _proc_macro) = |
20 | load_workspace_at(&std::env::current_dir()?, &cargo_config, &load_cargo_config, &|_| {})?; | 15 | load_workspace_at(&std::env::current_dir()?, &cargo_config, &load_cargo_config, &|_| {})?; |
21 | let db = host.raw_database(); | 16 | let db = host.raw_database(); |
@@ -41,13 +36,8 @@ pub fn search_for_patterns(patterns: Vec<SsrPattern>, debug_snippet: Option<Stri | |||
41 | use ide_db::base_db::SourceDatabaseExt; | 36 | use ide_db::base_db::SourceDatabaseExt; |
42 | use ide_db::symbol_index::SymbolsDatabase; | 37 | use ide_db::symbol_index::SymbolsDatabase; |
43 | let cargo_config = Default::default(); | 38 | let cargo_config = Default::default(); |
44 | let load_cargo_config = LoadCargoConfig { | 39 | let load_cargo_config = |
45 | load_out_dirs_from_check: true, | 40 | LoadCargoConfig { load_out_dirs_from_check: true, with_proc_macro: true }; |
46 | with_proc_macro: true, | ||
47 | // This will currently never have rustcSource set, however if in | ||
48 | // future it does this will handle that case | ||
49 | run_rustc_build_scripts: true, | ||
50 | }; | ||
51 | let (host, _vfs, _proc_macro) = | 41 | let (host, _vfs, _proc_macro) = |
52 | load_workspace_at(&std::env::current_dir()?, &cargo_config, &load_cargo_config, &|_| {})?; | 42 | load_workspace_at(&std::env::current_dir()?, &cargo_config, &load_cargo_config, &|_| {})?; |
53 | let db = host.raw_database(); | 43 | let db = host.raw_database(); |