Skip to content
This repository was archived by the owner on Dec 29, 2022. It is now read-only.

Commit 37cbfc9

Browse files
committed
Use workspace mode by default
1 parent 69311ba commit 37cbfc9

File tree

2 files changed

+7
-5
lines changed

2 files changed

+7
-5
lines changed

src/config.rs

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -144,7 +144,7 @@ impl Default for Config {
144144
wait_to_build: DEFAULT_WAIT_TO_BUILD,
145145
show_warnings: true,
146146
goto_def_racer_fallback: false,
147-
workspace_mode: false,
147+
workspace_mode: true,
148148
analyze_package: None,
149149
clear_env_rust_log: true,
150150
build_on_save: false,
@@ -183,10 +183,9 @@ impl Config {
183183
}
184184

185185
if !self.unstable_features {
186-
if self.workspace_mode {
187-
eprintln!("`workspace_mode` setting is unstable; ignored");
186+
if self.analyze_package.is_some() {
187+
eprintln!("`analyze_package` setting is unstable; ignored");
188188
}
189-
self.workspace_mode = false;
190189
self.analyze_package = None;
191190
}
192191
}

src/test/mod.rs

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -672,7 +672,10 @@ fn test_multiple_binaries() {
672672
ExpectedMessage::new(Some(0)).expect_contains("capabilities"),
673673
ExpectedMessage::new(None).expect_contains("beginBuild"),
674674
ExpectedMessage::new(None).expect_contains("diagnosticsBegin"),
675-
ExpectedMessage::new(None).expect_contains("unused variable: `bin_name2`"),
675+
// These messages should be about bin_name1 and bin_name2, but the order is
676+
// not deterministic FIXME(#606)
677+
ExpectedMessage::new(None).expect_contains("unused variable: `bin_name"),
678+
ExpectedMessage::new(None).expect_contains("unused variable: `bin_name"),
676679
ExpectedMessage::new(None).expect_contains("diagnosticsEnd"),
677680
],
678681
);

0 commit comments

Comments
 (0)