.collect::<Vec<_>>();
if !detached_files.is_empty() {
- workspaces
- .push(project_model::ProjectWorkspace::load_detached_files(detached_files));
+ workspaces.push(project_model::ProjectWorkspace::load_detached_files(
+ detached_files,
+ &cargo_config,
+ ));
}
tracing::info!("did fetch workspaces {:?}", workspaces);
build_scripts: _,
toolchain: _,
+ target_layout: _,
} => Some((cargo, sysroot, rustc, rustc_cfg, cfg_overrides)),
_ => None,
};
fn reload_flycheck(&mut self) {
let _p = profile::span("GlobalState::reload_flycheck");
- let config = match self.config.flycheck() {
- Some(it) => it,
- None => {
- self.flycheck = Arc::new([]);
- self.diagnostics.clear_check_all();
- return;
- }
- };
-
+ let config = self.config.flycheck();
let sender = self.flycheck_sender.clone();
let invocation_strategy = match config {
FlycheckConfig::CargoCommand { .. } => flycheck::InvocationStrategy::PerWorkspace,
flycheck::InvocationStrategy::Once => vec![FlycheckHandle::spawn(
0,
Box::new(move |msg| sender.send(msg).unwrap()),
- config.clone(),
+ config,
self.config.root_path().clone(),
)],
flycheck::InvocationStrategy::PerWorkspace => {