diff options
Diffstat (limited to 'crates')
-rw-r--r-- | crates/rust-analyzer/tests/rust-analyzer/main.rs | 16 | ||||
-rw-r--r-- | crates/rust-analyzer/tests/rust-analyzer/support.rs | 10 |
2 files changed, 23 insertions, 3 deletions
diff --git a/crates/rust-analyzer/tests/rust-analyzer/main.rs b/crates/rust-analyzer/tests/rust-analyzer/main.rs index 391a0b60d..7545b4a34 100644 --- a/crates/rust-analyzer/tests/rust-analyzer/main.rs +++ b/crates/rust-analyzer/tests/rust-analyzer/main.rs | |||
@@ -54,6 +54,9 @@ version = "0.0.0" | |||
54 | use std::collections::Spam; | 54 | use std::collections::Spam; |
55 | "#, | 55 | "#, |
56 | ) | 56 | ) |
57 | .with_config(serde_json::json!({ | ||
58 | "cargo": { "noSysroot": false } | ||
59 | })) | ||
57 | .server() | 60 | .server() |
58 | .wait_until_workspace_is_loaded(); | 61 | .wait_until_workspace_is_loaded(); |
59 | 62 | ||
@@ -450,6 +453,9 @@ fn main() {{}} | |||
450 | "#, | 453 | "#, |
451 | librs, libs | 454 | librs, libs |
452 | )) | 455 | )) |
456 | .with_config(serde_json::json!({ | ||
457 | "cargo": { "noSysroot": false } | ||
458 | })) | ||
453 | .server() | 459 | .server() |
454 | .wait_until_workspace_is_loaded(); | 460 | .wait_until_workspace_is_loaded(); |
455 | 461 | ||
@@ -572,7 +578,10 @@ fn main() { | |||
572 | "###, | 578 | "###, |
573 | ) | 579 | ) |
574 | .with_config(serde_json::json!({ | 580 | .with_config(serde_json::json!({ |
575 | "cargo": { "loadOutDirsFromCheck": true } | 581 | "cargo": { |
582 | "loadOutDirsFromCheck": true, | ||
583 | "noSysroot": true, | ||
584 | } | ||
576 | })) | 585 | })) |
577 | .server() | 586 | .server() |
578 | .wait_until_workspace_is_loaded(); | 587 | .wait_until_workspace_is_loaded(); |
@@ -715,7 +724,10 @@ pub fn foo(_input: TokenStream) -> TokenStream { | |||
715 | "###, | 724 | "###, |
716 | ) | 725 | ) |
717 | .with_config(serde_json::json!({ | 726 | .with_config(serde_json::json!({ |
718 | "cargo": { "loadOutDirsFromCheck": true }, | 727 | "cargo": { |
728 | "loadOutDirsFromCheck": true, | ||
729 | "noSysroot": true, | ||
730 | }, | ||
719 | "procMacro": { | 731 | "procMacro": { |
720 | "enable": true, | 732 | "enable": true, |
721 | "server": PathBuf::from(env!("CARGO_BIN_EXE_rust-analyzer")), | 733 | "server": PathBuf::from(env!("CARGO_BIN_EXE_rust-analyzer")), |
diff --git a/crates/rust-analyzer/tests/rust-analyzer/support.rs b/crates/rust-analyzer/tests/rust-analyzer/support.rs index 726d555e4..6b774073d 100644 --- a/crates/rust-analyzer/tests/rust-analyzer/support.rs +++ b/crates/rust-analyzer/tests/rust-analyzer/support.rs | |||
@@ -27,7 +27,15 @@ pub(crate) struct Project<'a> { | |||
27 | 27 | ||
28 | impl<'a> Project<'a> { | 28 | impl<'a> Project<'a> { |
29 | pub(crate) fn with_fixture(fixture: &str) -> Project { | 29 | pub(crate) fn with_fixture(fixture: &str) -> Project { |
30 | Project { fixture, tmp_dir: None, roots: vec![], config: serde_json::Value::Null } | 30 | Project { |
31 | fixture, | ||
32 | tmp_dir: None, | ||
33 | roots: vec![], | ||
34 | config: serde_json::json!({ | ||
35 | // Loading standard library is costly, let's ignore it by default | ||
36 | "cargo": { "noSysroot": true } | ||
37 | }), | ||
38 | } | ||
31 | } | 39 | } |
32 | 40 | ||
33 | pub(crate) fn tmp_dir(mut self, tmp_dir: TestDir) -> Project<'a> { | 41 | pub(crate) fn tmp_dir(mut self, tmp_dir: TestDir) -> Project<'a> { |