mirror of
https://github.com/rust-lang/rust-analyzer
synced 2025-01-15 06:33:58 +00:00
Auto merge of #13128 - Veykril:invocation-strategy, r=Veykril
Implement invocation strategy config Fixes https://github.com/rust-lang/rust-analyzer/issues/10793 This allows to change how we run build scripts (and `checkOnSave`), exposing two configs: - `once`: run the specified command once in the project root (the working dir of the server) - `per_workspace`: run the specified command per workspace in the corresponding workspace This also applies to `checkOnSave` likewise, though `once_in_root` is useless there currently, due to https://github.com/rust-lang/cargo/issues/11007
This commit is contained in:
commit
a77ac93b2a
9 changed files with 471 additions and 207 deletions
|
@ -21,6 +21,13 @@ pub use cargo_metadata::diagnostic::{
|
||||||
DiagnosticSpanMacroExpansion,
|
DiagnosticSpanMacroExpansion,
|
||||||
};
|
};
|
||||||
|
|
||||||
|
#[derive(Copy, Clone, Debug, Default, PartialEq, Eq)]
|
||||||
|
pub enum InvocationStrategy {
|
||||||
|
Once,
|
||||||
|
#[default]
|
||||||
|
PerWorkspace,
|
||||||
|
}
|
||||||
|
|
||||||
#[derive(Clone, Debug, PartialEq, Eq)]
|
#[derive(Clone, Debug, PartialEq, Eq)]
|
||||||
pub enum FlycheckConfig {
|
pub enum FlycheckConfig {
|
||||||
CargoCommand {
|
CargoCommand {
|
||||||
|
@ -32,11 +39,13 @@ pub enum FlycheckConfig {
|
||||||
features: Vec<String>,
|
features: Vec<String>,
|
||||||
extra_args: Vec<String>,
|
extra_args: Vec<String>,
|
||||||
extra_env: FxHashMap<String, String>,
|
extra_env: FxHashMap<String, String>,
|
||||||
|
invocation_strategy: InvocationStrategy,
|
||||||
},
|
},
|
||||||
CustomCommand {
|
CustomCommand {
|
||||||
command: String,
|
command: String,
|
||||||
args: Vec<String>,
|
args: Vec<String>,
|
||||||
extra_env: FxHashMap<String, String>,
|
extra_env: FxHashMap<String, String>,
|
||||||
|
invocation_strategy: InvocationStrategy,
|
||||||
},
|
},
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -136,11 +145,15 @@ enum Restart {
|
||||||
No,
|
No,
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/// A [`FlycheckActor`] is a single check instance of a workspace.
|
||||||
struct FlycheckActor {
|
struct FlycheckActor {
|
||||||
|
/// The workspace id of this flycheck instance.
|
||||||
id: usize,
|
id: usize,
|
||||||
sender: Box<dyn Fn(Message) + Send>,
|
sender: Box<dyn Fn(Message) + Send>,
|
||||||
config: FlycheckConfig,
|
config: FlycheckConfig,
|
||||||
workspace_root: AbsPathBuf,
|
/// Either the workspace root of the workspace we are flychecking,
|
||||||
|
/// or the project root of the project.
|
||||||
|
root: AbsPathBuf,
|
||||||
/// CargoHandle exists to wrap around the communication needed to be able to
|
/// CargoHandle exists to wrap around the communication needed to be able to
|
||||||
/// run `cargo check` without blocking. Currently the Rust standard library
|
/// run `cargo check` without blocking. Currently the Rust standard library
|
||||||
/// doesn't provide a way to read sub-process output without blocking, so we
|
/// doesn't provide a way to read sub-process output without blocking, so we
|
||||||
|
@ -162,11 +175,13 @@ impl FlycheckActor {
|
||||||
workspace_root: AbsPathBuf,
|
workspace_root: AbsPathBuf,
|
||||||
) -> FlycheckActor {
|
) -> FlycheckActor {
|
||||||
tracing::info!(%id, ?workspace_root, "Spawning flycheck");
|
tracing::info!(%id, ?workspace_root, "Spawning flycheck");
|
||||||
FlycheckActor { id, sender, config, workspace_root, cargo_handle: None }
|
FlycheckActor { id, sender, config, root: workspace_root, cargo_handle: None }
|
||||||
}
|
}
|
||||||
fn progress(&self, progress: Progress) {
|
|
||||||
|
fn report_progress(&self, progress: Progress) {
|
||||||
self.send(Message::Progress { id: self.id, progress });
|
self.send(Message::Progress { id: self.id, progress });
|
||||||
}
|
}
|
||||||
|
|
||||||
fn next_event(&self, inbox: &Receiver<Restart>) -> Option<Event> {
|
fn next_event(&self, inbox: &Receiver<Restart>) -> Option<Event> {
|
||||||
let check_chan = self.cargo_handle.as_ref().map(|cargo| &cargo.receiver);
|
let check_chan = self.cargo_handle.as_ref().map(|cargo| &cargo.receiver);
|
||||||
if let Ok(msg) = inbox.try_recv() {
|
if let Ok(msg) = inbox.try_recv() {
|
||||||
|
@ -178,6 +193,7 @@ impl FlycheckActor {
|
||||||
recv(check_chan.unwrap_or(&never())) -> msg => Some(Event::CheckEvent(msg.ok())),
|
recv(check_chan.unwrap_or(&never())) -> msg => Some(Event::CheckEvent(msg.ok())),
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
fn run(mut self, inbox: Receiver<Restart>) {
|
fn run(mut self, inbox: Receiver<Restart>) {
|
||||||
'event: while let Some(event) = self.next_event(&inbox) {
|
'event: while let Some(event) = self.next_event(&inbox) {
|
||||||
match event {
|
match event {
|
||||||
|
@ -203,10 +219,10 @@ impl FlycheckActor {
|
||||||
"did restart flycheck"
|
"did restart flycheck"
|
||||||
);
|
);
|
||||||
self.cargo_handle = Some(cargo_handle);
|
self.cargo_handle = Some(cargo_handle);
|
||||||
self.progress(Progress::DidStart);
|
self.report_progress(Progress::DidStart);
|
||||||
}
|
}
|
||||||
Err(error) => {
|
Err(error) => {
|
||||||
self.progress(Progress::DidFailToRestart(format!(
|
self.report_progress(Progress::DidFailToRestart(format!(
|
||||||
"Failed to run the following command: {:?} error={}",
|
"Failed to run the following command: {:?} error={}",
|
||||||
self.check_command(),
|
self.check_command(),
|
||||||
error
|
error
|
||||||
|
@ -226,17 +242,17 @@ impl FlycheckActor {
|
||||||
self.check_command()
|
self.check_command()
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
self.progress(Progress::DidFinish(res));
|
self.report_progress(Progress::DidFinish(res));
|
||||||
}
|
}
|
||||||
Event::CheckEvent(Some(message)) => match message {
|
Event::CheckEvent(Some(message)) => match message {
|
||||||
CargoMessage::CompilerArtifact(msg) => {
|
CargoMessage::CompilerArtifact(msg) => {
|
||||||
self.progress(Progress::DidCheckCrate(msg.target.name));
|
self.report_progress(Progress::DidCheckCrate(msg.target.name));
|
||||||
}
|
}
|
||||||
|
|
||||||
CargoMessage::Diagnostic(msg) => {
|
CargoMessage::Diagnostic(msg) => {
|
||||||
self.send(Message::AddDiagnostic {
|
self.send(Message::AddDiagnostic {
|
||||||
id: self.id,
|
id: self.id,
|
||||||
workspace_root: self.workspace_root.clone(),
|
workspace_root: self.root.clone(),
|
||||||
diagnostic: msg,
|
diagnostic: msg,
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
@ -254,12 +270,12 @@ impl FlycheckActor {
|
||||||
"did cancel flycheck"
|
"did cancel flycheck"
|
||||||
);
|
);
|
||||||
cargo_handle.cancel();
|
cargo_handle.cancel();
|
||||||
self.progress(Progress::DidCancel);
|
self.report_progress(Progress::DidCancel);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
fn check_command(&self) -> Command {
|
fn check_command(&self) -> Command {
|
||||||
let mut cmd = match &self.config {
|
let (mut cmd, args, invocation_strategy) = match &self.config {
|
||||||
FlycheckConfig::CargoCommand {
|
FlycheckConfig::CargoCommand {
|
||||||
command,
|
command,
|
||||||
target_triple,
|
target_triple,
|
||||||
|
@ -269,12 +285,11 @@ impl FlycheckActor {
|
||||||
extra_args,
|
extra_args,
|
||||||
features,
|
features,
|
||||||
extra_env,
|
extra_env,
|
||||||
|
invocation_strategy,
|
||||||
} => {
|
} => {
|
||||||
let mut cmd = Command::new(toolchain::cargo());
|
let mut cmd = Command::new(toolchain::cargo());
|
||||||
cmd.arg(command);
|
cmd.arg(command);
|
||||||
cmd.current_dir(&self.workspace_root);
|
cmd.args(&["--workspace", "--message-format=json"]);
|
||||||
cmd.args(&["--workspace", "--message-format=json", "--manifest-path"])
|
|
||||||
.arg(self.workspace_root.join("Cargo.toml").as_os_str());
|
|
||||||
|
|
||||||
if let Some(target) = target_triple {
|
if let Some(target) = target_triple {
|
||||||
cmd.args(&["--target", target.as_str()]);
|
cmd.args(&["--target", target.as_str()]);
|
||||||
|
@ -293,18 +308,19 @@ impl FlycheckActor {
|
||||||
cmd.arg(features.join(" "));
|
cmd.arg(features.join(" "));
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
cmd.args(extra_args);
|
|
||||||
cmd.envs(extra_env);
|
cmd.envs(extra_env);
|
||||||
cmd
|
(cmd, extra_args, invocation_strategy)
|
||||||
}
|
}
|
||||||
FlycheckConfig::CustomCommand { command, args, extra_env } => {
|
FlycheckConfig::CustomCommand { command, args, extra_env, invocation_strategy } => {
|
||||||
let mut cmd = Command::new(command);
|
let mut cmd = Command::new(command);
|
||||||
cmd.args(args);
|
|
||||||
cmd.envs(extra_env);
|
cmd.envs(extra_env);
|
||||||
cmd
|
(cmd, args, invocation_strategy)
|
||||||
}
|
}
|
||||||
};
|
};
|
||||||
cmd.current_dir(&self.workspace_root);
|
match invocation_strategy {
|
||||||
|
InvocationStrategy::PerWorkspace => cmd.current_dir(&self.root),
|
||||||
|
InvocationStrategy::Once => cmd.args(args),
|
||||||
|
};
|
||||||
cmd
|
cmd
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -6,7 +6,12 @@
|
||||||
//! This module implements this second part. We use "build script" terminology
|
//! This module implements this second part. We use "build script" terminology
|
||||||
//! here, but it covers procedural macros as well.
|
//! here, but it covers procedural macros as well.
|
||||||
|
|
||||||
use std::{cell::RefCell, io, path::PathBuf, process::Command};
|
use std::{
|
||||||
|
cell::RefCell,
|
||||||
|
io, mem,
|
||||||
|
path::{self, PathBuf},
|
||||||
|
process::Command,
|
||||||
|
};
|
||||||
|
|
||||||
use cargo_metadata::{camino::Utf8Path, Message};
|
use cargo_metadata::{camino::Utf8Path, Message};
|
||||||
use la_arena::ArenaMap;
|
use la_arena::ArenaMap;
|
||||||
|
@ -15,11 +20,13 @@ use rustc_hash::FxHashMap;
|
||||||
use semver::Version;
|
use semver::Version;
|
||||||
use serde::Deserialize;
|
use serde::Deserialize;
|
||||||
|
|
||||||
use crate::{cfg_flag::CfgFlag, CargoConfig, CargoFeatures, CargoWorkspace, Package};
|
use crate::{
|
||||||
|
cfg_flag::CfgFlag, CargoConfig, CargoFeatures, CargoWorkspace, InvocationStrategy, Package,
|
||||||
|
};
|
||||||
|
|
||||||
#[derive(Debug, Default, Clone, PartialEq, Eq)]
|
#[derive(Debug, Default, Clone, PartialEq, Eq)]
|
||||||
pub struct WorkspaceBuildScripts {
|
pub struct WorkspaceBuildScripts {
|
||||||
outputs: ArenaMap<Package, Option<BuildScriptOutput>>,
|
outputs: ArenaMap<Package, BuildScriptOutput>,
|
||||||
error: Option<String>,
|
error: Option<String>,
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -38,17 +45,29 @@ pub(crate) struct BuildScriptOutput {
|
||||||
pub(crate) proc_macro_dylib_path: Option<AbsPathBuf>,
|
pub(crate) proc_macro_dylib_path: Option<AbsPathBuf>,
|
||||||
}
|
}
|
||||||
|
|
||||||
impl WorkspaceBuildScripts {
|
impl BuildScriptOutput {
|
||||||
fn build_command(config: &CargoConfig) -> Command {
|
fn is_unchanged(&self) -> bool {
|
||||||
if let Some([program, args @ ..]) = config.run_build_script_command.as_deref() {
|
self.cfgs.is_empty()
|
||||||
let mut cmd = Command::new(program);
|
&& self.envs.is_empty()
|
||||||
cmd.args(args);
|
&& self.out_dir.is_none()
|
||||||
cmd.envs(&config.extra_env);
|
&& self.proc_macro_dylib_path.is_none()
|
||||||
return cmd;
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
impl WorkspaceBuildScripts {
|
||||||
|
fn build_command(
|
||||||
|
config: &CargoConfig,
|
||||||
|
workspace_root: Option<&path::Path>,
|
||||||
|
) -> io::Result<Command> {
|
||||||
|
let mut cmd = match config.run_build_script_command.as_deref() {
|
||||||
|
Some([program, args @ ..]) => {
|
||||||
|
let mut cmd = Command::new(program);
|
||||||
|
cmd.args(args);
|
||||||
|
cmd
|
||||||
|
}
|
||||||
|
_ => {
|
||||||
let mut cmd = Command::new(toolchain::cargo());
|
let mut cmd = Command::new(toolchain::cargo());
|
||||||
cmd.envs(&config.extra_env);
|
|
||||||
cmd.args(&["check", "--quiet", "--workspace", "--message-format=json"]);
|
cmd.args(&["check", "--quiet", "--workspace", "--message-format=json"]);
|
||||||
|
|
||||||
// --all-targets includes tests, benches and examples in addition to the
|
// --all-targets includes tests, benches and examples in addition to the
|
||||||
|
@ -75,39 +94,15 @@ impl WorkspaceBuildScripts {
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
if let Some(workspace_root) = workspace_root {
|
||||||
|
cmd.current_dir(workspace_root);
|
||||||
|
}
|
||||||
|
|
||||||
cmd
|
cmd
|
||||||
}
|
}
|
||||||
|
};
|
||||||
|
|
||||||
pub(crate) fn run(
|
cmd.envs(&config.extra_env);
|
||||||
config: &CargoConfig,
|
|
||||||
workspace: &CargoWorkspace,
|
|
||||||
progress: &dyn Fn(String),
|
|
||||||
toolchain: &Option<Version>,
|
|
||||||
) -> io::Result<WorkspaceBuildScripts> {
|
|
||||||
const RUST_1_62: Version = Version::new(1, 62, 0);
|
|
||||||
|
|
||||||
match Self::run_(Self::build_command(config), config, workspace, progress) {
|
|
||||||
Ok(WorkspaceBuildScripts { error: Some(error), .. })
|
|
||||||
if toolchain.as_ref().map_or(false, |it| *it >= RUST_1_62) =>
|
|
||||||
{
|
|
||||||
// building build scripts failed, attempt to build with --keep-going so
|
|
||||||
// that we potentially get more build data
|
|
||||||
let mut cmd = Self::build_command(config);
|
|
||||||
cmd.args(&["-Z", "unstable-options", "--keep-going"]).env("RUSTC_BOOTSTRAP", "1");
|
|
||||||
let mut res = Self::run_(cmd, config, workspace, progress)?;
|
|
||||||
res.error = Some(error);
|
|
||||||
Ok(res)
|
|
||||||
}
|
|
||||||
res => res,
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
fn run_(
|
|
||||||
mut cmd: Command,
|
|
||||||
config: &CargoConfig,
|
|
||||||
workspace: &CargoWorkspace,
|
|
||||||
progress: &dyn Fn(String),
|
|
||||||
) -> io::Result<WorkspaceBuildScripts> {
|
|
||||||
if config.wrap_rustc_in_build_scripts {
|
if config.wrap_rustc_in_build_scripts {
|
||||||
// Setup RUSTC_WRAPPER to point to `rust-analyzer` binary itself. We use
|
// Setup RUSTC_WRAPPER to point to `rust-analyzer` binary itself. We use
|
||||||
// that to compile only proc macros and build scripts during the initial
|
// that to compile only proc macros and build scripts during the initial
|
||||||
|
@ -117,8 +112,100 @@ impl WorkspaceBuildScripts {
|
||||||
cmd.env("RA_RUSTC_WRAPPER", "1");
|
cmd.env("RA_RUSTC_WRAPPER", "1");
|
||||||
}
|
}
|
||||||
|
|
||||||
cmd.current_dir(workspace.workspace_root());
|
Ok(cmd)
|
||||||
|
}
|
||||||
|
|
||||||
|
/// Runs the build scripts for the given workspace
|
||||||
|
pub(crate) fn run_for_workspace(
|
||||||
|
config: &CargoConfig,
|
||||||
|
workspace: &CargoWorkspace,
|
||||||
|
progress: &dyn Fn(String),
|
||||||
|
toolchain: &Option<Version>,
|
||||||
|
) -> io::Result<WorkspaceBuildScripts> {
|
||||||
|
const RUST_1_62: Version = Version::new(1, 62, 0);
|
||||||
|
|
||||||
|
let workspace_root: &path::Path = &workspace.workspace_root().as_ref();
|
||||||
|
|
||||||
|
match Self::run_per_ws(
|
||||||
|
Self::build_command(config, Some(workspace_root))?,
|
||||||
|
workspace,
|
||||||
|
progress,
|
||||||
|
) {
|
||||||
|
Ok(WorkspaceBuildScripts { error: Some(error), .. })
|
||||||
|
if toolchain.as_ref().map_or(false, |it| *it >= RUST_1_62) =>
|
||||||
|
{
|
||||||
|
// building build scripts failed, attempt to build with --keep-going so
|
||||||
|
// that we potentially get more build data
|
||||||
|
let mut cmd = Self::build_command(config, Some(workspace_root))?;
|
||||||
|
cmd.args(&["-Z", "unstable-options", "--keep-going"]).env("RUSTC_BOOTSTRAP", "1");
|
||||||
|
let mut res = Self::run_per_ws(cmd, workspace, progress)?;
|
||||||
|
res.error = Some(error);
|
||||||
|
Ok(res)
|
||||||
|
}
|
||||||
|
res => res,
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
/// Runs the build scripts by invoking the configured command *once*.
|
||||||
|
/// This populates the outputs for all passed in workspaces.
|
||||||
|
pub(crate) fn run_once(
|
||||||
|
config: &CargoConfig,
|
||||||
|
workspaces: &[&CargoWorkspace],
|
||||||
|
progress: &dyn Fn(String),
|
||||||
|
) -> io::Result<Vec<WorkspaceBuildScripts>> {
|
||||||
|
assert_eq!(config.invocation_strategy, InvocationStrategy::Once);
|
||||||
|
let cmd = Self::build_command(config, None)?;
|
||||||
|
// NB: Cargo.toml could have been modified between `cargo metadata` and
|
||||||
|
// `cargo check`. We shouldn't assume that package ids we see here are
|
||||||
|
// exactly those from `config`.
|
||||||
|
let mut by_id = FxHashMap::default();
|
||||||
|
let mut res: Vec<_> = workspaces
|
||||||
|
.iter()
|
||||||
|
.enumerate()
|
||||||
|
.map(|(idx, workspace)| {
|
||||||
|
let mut res = WorkspaceBuildScripts::default();
|
||||||
|
for package in workspace.packages() {
|
||||||
|
res.outputs.insert(package, BuildScriptOutput::default());
|
||||||
|
by_id.insert(workspace[package].id.clone(), (package, idx));
|
||||||
|
}
|
||||||
|
res
|
||||||
|
})
|
||||||
|
.collect();
|
||||||
|
|
||||||
|
let errors = Self::run_command(
|
||||||
|
cmd,
|
||||||
|
|package, cb| {
|
||||||
|
if let Some(&(package, workspace)) = by_id.get(package) {
|
||||||
|
cb(&workspaces[workspace][package].name, &mut res[workspace].outputs[package]);
|
||||||
|
}
|
||||||
|
},
|
||||||
|
progress,
|
||||||
|
)?;
|
||||||
|
res.iter_mut().for_each(|it| it.error = errors.clone());
|
||||||
|
|
||||||
|
if tracing::enabled!(tracing::Level::INFO) {
|
||||||
|
for (idx, workspace) in workspaces.iter().enumerate() {
|
||||||
|
for package in workspace.packages() {
|
||||||
|
let package_build_data = &mut res[idx].outputs[package];
|
||||||
|
if !package_build_data.is_unchanged() {
|
||||||
|
tracing::info!(
|
||||||
|
"{}: {:?}",
|
||||||
|
workspace[package].manifest.parent().display(),
|
||||||
|
package_build_data,
|
||||||
|
);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
Ok(res)
|
||||||
|
}
|
||||||
|
|
||||||
|
fn run_per_ws(
|
||||||
|
cmd: Command,
|
||||||
|
workspace: &CargoWorkspace,
|
||||||
|
progress: &dyn Fn(String),
|
||||||
|
) -> io::Result<WorkspaceBuildScripts> {
|
||||||
let mut res = WorkspaceBuildScripts::default();
|
let mut res = WorkspaceBuildScripts::default();
|
||||||
let outputs = &mut res.outputs;
|
let outputs = &mut res.outputs;
|
||||||
// NB: Cargo.toml could have been modified between `cargo metadata` and
|
// NB: Cargo.toml could have been modified between `cargo metadata` and
|
||||||
|
@ -126,10 +213,44 @@ impl WorkspaceBuildScripts {
|
||||||
// exactly those from `config`.
|
// exactly those from `config`.
|
||||||
let mut by_id: FxHashMap<String, Package> = FxHashMap::default();
|
let mut by_id: FxHashMap<String, Package> = FxHashMap::default();
|
||||||
for package in workspace.packages() {
|
for package in workspace.packages() {
|
||||||
outputs.insert(package, None);
|
outputs.insert(package, BuildScriptOutput::default());
|
||||||
by_id.insert(workspace[package].id.clone(), package);
|
by_id.insert(workspace[package].id.clone(), package);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
res.error = Self::run_command(
|
||||||
|
cmd,
|
||||||
|
|package, cb| {
|
||||||
|
if let Some(&package) = by_id.get(package) {
|
||||||
|
cb(&workspace[package].name, &mut outputs[package]);
|
||||||
|
}
|
||||||
|
},
|
||||||
|
progress,
|
||||||
|
)?;
|
||||||
|
|
||||||
|
if tracing::enabled!(tracing::Level::INFO) {
|
||||||
|
for package in workspace.packages() {
|
||||||
|
let package_build_data = &mut outputs[package];
|
||||||
|
if !package_build_data.is_unchanged() {
|
||||||
|
tracing::info!(
|
||||||
|
"{}: {:?}",
|
||||||
|
workspace[package].manifest.parent().display(),
|
||||||
|
package_build_data,
|
||||||
|
);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
Ok(res)
|
||||||
|
}
|
||||||
|
|
||||||
|
fn run_command(
|
||||||
|
cmd: Command,
|
||||||
|
// ideally this would be something like:
|
||||||
|
// with_output_for: impl FnMut(&str, dyn FnOnce(&mut BuildScriptOutput)),
|
||||||
|
// but owned trait objects aren't a thing
|
||||||
|
mut with_output_for: impl FnMut(&str, &mut dyn FnMut(&str, &mut BuildScriptOutput)),
|
||||||
|
progress: &dyn Fn(String),
|
||||||
|
) -> io::Result<Option<String>> {
|
||||||
let errors = RefCell::new(String::new());
|
let errors = RefCell::new(String::new());
|
||||||
let push_err = |err: &str| {
|
let push_err = |err: &str| {
|
||||||
let mut e = errors.borrow_mut();
|
let mut e = errors.borrow_mut();
|
||||||
|
@ -149,16 +270,12 @@ impl WorkspaceBuildScripts {
|
||||||
.unwrap_or_else(|_| Message::TextLine(line.to_string()));
|
.unwrap_or_else(|_| Message::TextLine(line.to_string()));
|
||||||
|
|
||||||
match message {
|
match message {
|
||||||
Message::BuildScriptExecuted(message) => {
|
Message::BuildScriptExecuted(mut message) => {
|
||||||
let package = match by_id.get(&message.package_id.repr) {
|
with_output_for(&message.package_id.repr, &mut |name, data| {
|
||||||
Some(&it) => it,
|
progress(format!("running build-script: {}", name));
|
||||||
None => return,
|
|
||||||
};
|
|
||||||
progress(format!("running build-script: {}", workspace[package].name));
|
|
||||||
|
|
||||||
let cfgs = {
|
let cfgs = {
|
||||||
let mut acc = Vec::new();
|
let mut acc = Vec::new();
|
||||||
for cfg in message.cfgs {
|
for cfg in &message.cfgs {
|
||||||
match cfg.parse::<CfgFlag>() {
|
match cfg.parse::<CfgFlag>() {
|
||||||
Ok(it) => acc.push(it),
|
Ok(it) => acc.push(it),
|
||||||
Err(err) => {
|
Err(err) => {
|
||||||
|
@ -172,38 +289,39 @@ impl WorkspaceBuildScripts {
|
||||||
}
|
}
|
||||||
acc
|
acc
|
||||||
};
|
};
|
||||||
|
if !message.env.is_empty() {
|
||||||
|
data.envs = mem::take(&mut message.env);
|
||||||
|
}
|
||||||
// cargo_metadata crate returns default (empty) path for
|
// cargo_metadata crate returns default (empty) path for
|
||||||
// older cargos, which is not absolute, so work around that.
|
// older cargos, which is not absolute, so work around that.
|
||||||
let out_dir = message.out_dir.into_os_string();
|
let out_dir = mem::take(&mut message.out_dir).into_os_string();
|
||||||
if !out_dir.is_empty() {
|
if !out_dir.is_empty() {
|
||||||
let data = outputs[package].get_or_insert_with(Default::default);
|
let out_dir = AbsPathBuf::assert(PathBuf::from(out_dir));
|
||||||
data.out_dir = Some(AbsPathBuf::assert(PathBuf::from(out_dir)));
|
// inject_cargo_env(package, package_build_data);
|
||||||
|
// NOTE: cargo and rustc seem to hide non-UTF-8 strings from env! and option_env!()
|
||||||
|
if let Some(out_dir) =
|
||||||
|
out_dir.as_os_str().to_str().map(|s| s.to_owned())
|
||||||
|
{
|
||||||
|
data.envs.push(("OUT_DIR".to_string(), out_dir));
|
||||||
|
}
|
||||||
|
data.out_dir = Some(out_dir);
|
||||||
data.cfgs = cfgs;
|
data.cfgs = cfgs;
|
||||||
}
|
}
|
||||||
if !message.env.is_empty() {
|
});
|
||||||
outputs[package].get_or_insert_with(Default::default).envs =
|
|
||||||
message.env;
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
Message::CompilerArtifact(message) => {
|
Message::CompilerArtifact(message) => {
|
||||||
let package = match by_id.get(&message.package_id.repr) {
|
with_output_for(&message.package_id.repr, &mut |name, data| {
|
||||||
Some(it) => *it,
|
progress(format!("building proc-macros: {}", name));
|
||||||
None => return,
|
|
||||||
};
|
|
||||||
|
|
||||||
progress(format!("building proc-macros: {}", message.target.name));
|
|
||||||
|
|
||||||
if message.target.kind.iter().any(|k| k == "proc-macro") {
|
if message.target.kind.iter().any(|k| k == "proc-macro") {
|
||||||
// Skip rmeta file
|
// Skip rmeta file
|
||||||
if let Some(filename) =
|
if let Some(filename) =
|
||||||
message.filenames.iter().find(|name| is_dylib(name))
|
message.filenames.iter().find(|name| is_dylib(name))
|
||||||
{
|
{
|
||||||
let filename = AbsPathBuf::assert(PathBuf::from(&filename));
|
let filename = AbsPathBuf::assert(PathBuf::from(&filename));
|
||||||
outputs[package]
|
data.proc_macro_dylib_path = Some(filename);
|
||||||
.get_or_insert_with(Default::default)
|
|
||||||
.proc_macro_dylib_path = Some(filename);
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
});
|
||||||
}
|
}
|
||||||
Message::CompilerMessage(message) => {
|
Message::CompilerMessage(message) => {
|
||||||
progress(message.target.name);
|
progress(message.target.name);
|
||||||
|
@ -222,32 +340,13 @@ impl WorkspaceBuildScripts {
|
||||||
},
|
},
|
||||||
)?;
|
)?;
|
||||||
|
|
||||||
for package in workspace.packages() {
|
let errors = if !output.status.success() {
|
||||||
if let Some(package_build_data) = &mut outputs[package] {
|
let errors = errors.into_inner();
|
||||||
tracing::info!(
|
Some(if errors.is_empty() { "cargo check failed".to_string() } else { errors })
|
||||||
"{}: {:?}",
|
} else {
|
||||||
workspace[package].manifest.parent().display(),
|
None
|
||||||
package_build_data,
|
};
|
||||||
);
|
Ok(errors)
|
||||||
// inject_cargo_env(package, package_build_data);
|
|
||||||
if let Some(out_dir) = &package_build_data.out_dir {
|
|
||||||
// NOTE: cargo and rustc seem to hide non-UTF-8 strings from env! and option_env!()
|
|
||||||
if let Some(out_dir) = out_dir.as_os_str().to_str().map(|s| s.to_owned()) {
|
|
||||||
package_build_data.envs.push(("OUT_DIR".to_string(), out_dir));
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
let mut errors = errors.into_inner();
|
|
||||||
if !output.status.success() {
|
|
||||||
if errors.is_empty() {
|
|
||||||
errors = "cargo check failed".to_string();
|
|
||||||
}
|
|
||||||
res.error = Some(errors);
|
|
||||||
}
|
|
||||||
|
|
||||||
Ok(res)
|
|
||||||
}
|
}
|
||||||
|
|
||||||
pub fn error(&self) -> Option<&str> {
|
pub fn error(&self) -> Option<&str> {
|
||||||
|
@ -255,11 +354,11 @@ impl WorkspaceBuildScripts {
|
||||||
}
|
}
|
||||||
|
|
||||||
pub(crate) fn get_output(&self, idx: Package) -> Option<&BuildScriptOutput> {
|
pub(crate) fn get_output(&self, idx: Package) -> Option<&BuildScriptOutput> {
|
||||||
self.outputs.get(idx)?.as_ref()
|
self.outputs.get(idx)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
// FIXME: File a better way to know if it is a dylib.
|
// FIXME: Find a better way to know if it is a dylib.
|
||||||
fn is_dylib(path: &Utf8Path) -> bool {
|
fn is_dylib(path: &Utf8Path) -> bool {
|
||||||
match path.extension().map(|e| e.to_string().to_lowercase()) {
|
match path.extension().map(|e| e.to_string().to_lowercase()) {
|
||||||
None => false,
|
None => false,
|
||||||
|
|
|
@ -14,8 +14,8 @@ use rustc_hash::FxHashMap;
|
||||||
use serde::Deserialize;
|
use serde::Deserialize;
|
||||||
use serde_json::from_value;
|
use serde_json::from_value;
|
||||||
|
|
||||||
use crate::CfgOverrides;
|
|
||||||
use crate::{utf8_stdout, ManifestPath};
|
use crate::{utf8_stdout, ManifestPath};
|
||||||
|
use crate::{CfgOverrides, InvocationStrategy};
|
||||||
|
|
||||||
/// [`CargoWorkspace`] represents the logical structure of, well, a Cargo
|
/// [`CargoWorkspace`] represents the logical structure of, well, a Cargo
|
||||||
/// workspace. It pretty closely mirrors `cargo metadata` output.
|
/// workspace. It pretty closely mirrors `cargo metadata` output.
|
||||||
|
@ -106,6 +106,7 @@ pub struct CargoConfig {
|
||||||
pub run_build_script_command: Option<Vec<String>>,
|
pub run_build_script_command: Option<Vec<String>>,
|
||||||
/// Extra env vars to set when invoking the cargo command
|
/// Extra env vars to set when invoking the cargo command
|
||||||
pub extra_env: FxHashMap<String, String>,
|
pub extra_env: FxHashMap<String, String>,
|
||||||
|
pub invocation_strategy: InvocationStrategy,
|
||||||
}
|
}
|
||||||
|
|
||||||
impl CargoConfig {
|
impl CargoConfig {
|
||||||
|
|
|
@ -157,3 +157,10 @@ fn utf8_stdout(mut cmd: Command) -> Result<String> {
|
||||||
let stdout = String::from_utf8(output.stdout)?;
|
let stdout = String::from_utf8(output.stdout)?;
|
||||||
Ok(stdout.trim().to_string())
|
Ok(stdout.trim().to_string())
|
||||||
}
|
}
|
||||||
|
|
||||||
|
#[derive(Copy, Clone, Debug, Default, PartialEq, Eq)]
|
||||||
|
pub enum InvocationStrategy {
|
||||||
|
Once,
|
||||||
|
#[default]
|
||||||
|
PerWorkspace,
|
||||||
|
}
|
||||||
|
|
|
@ -2,7 +2,7 @@
|
||||||
//! metadata` or `rust-project.json`) into representation stored in the salsa
|
//! metadata` or `rust-project.json`) into representation stored in the salsa
|
||||||
//! database -- `CrateGraph`.
|
//! database -- `CrateGraph`.
|
||||||
|
|
||||||
use std::{collections::VecDeque, fmt, fs, process::Command};
|
use std::{collections::VecDeque, fmt, fs, process::Command, sync::Arc};
|
||||||
|
|
||||||
use anyhow::{format_err, Context, Result};
|
use anyhow::{format_err, Context, Result};
|
||||||
use base_db::{
|
use base_db::{
|
||||||
|
@ -21,8 +21,8 @@ use crate::{
|
||||||
cfg_flag::CfgFlag,
|
cfg_flag::CfgFlag,
|
||||||
rustc_cfg,
|
rustc_cfg,
|
||||||
sysroot::SysrootCrate,
|
sysroot::SysrootCrate,
|
||||||
utf8_stdout, CargoConfig, CargoWorkspace, ManifestPath, Package, ProjectJson, ProjectManifest,
|
utf8_stdout, CargoConfig, CargoWorkspace, InvocationStrategy, ManifestPath, Package,
|
||||||
Sysroot, TargetKind, WorkspaceBuildScripts,
|
ProjectJson, ProjectManifest, Sysroot, TargetKind, WorkspaceBuildScripts,
|
||||||
};
|
};
|
||||||
|
|
||||||
/// A set of cfg-overrides per crate.
|
/// A set of cfg-overrides per crate.
|
||||||
|
@ -303,6 +303,7 @@ impl ProjectWorkspace {
|
||||||
Ok(ProjectWorkspace::DetachedFiles { files: detached_files, sysroot, rustc_cfg })
|
Ok(ProjectWorkspace::DetachedFiles { files: detached_files, sysroot, rustc_cfg })
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/// Runs the build scripts for this [`ProjectWorkspace`].
|
||||||
pub fn run_build_scripts(
|
pub fn run_build_scripts(
|
||||||
&self,
|
&self,
|
||||||
config: &CargoConfig,
|
config: &CargoConfig,
|
||||||
|
@ -310,8 +311,12 @@ impl ProjectWorkspace {
|
||||||
) -> Result<WorkspaceBuildScripts> {
|
) -> Result<WorkspaceBuildScripts> {
|
||||||
match self {
|
match self {
|
||||||
ProjectWorkspace::Cargo { cargo, toolchain, .. } => {
|
ProjectWorkspace::Cargo { cargo, toolchain, .. } => {
|
||||||
WorkspaceBuildScripts::run(config, cargo, progress, toolchain).with_context(|| {
|
WorkspaceBuildScripts::run_for_workspace(config, cargo, progress, toolchain)
|
||||||
format!("Failed to run build scripts for {}", &cargo.workspace_root().display())
|
.with_context(|| {
|
||||||
|
format!(
|
||||||
|
"Failed to run build scripts for {}",
|
||||||
|
&cargo.workspace_root().display()
|
||||||
|
)
|
||||||
})
|
})
|
||||||
}
|
}
|
||||||
ProjectWorkspace::Json { .. } | ProjectWorkspace::DetachedFiles { .. } => {
|
ProjectWorkspace::Json { .. } | ProjectWorkspace::DetachedFiles { .. } => {
|
||||||
|
@ -320,6 +325,47 @@ impl ProjectWorkspace {
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/// Runs the build scripts for the given [`ProjectWorkspace`]s. Depending on the invocation
|
||||||
|
/// strategy this may run a single build process for all project workspaces.
|
||||||
|
pub fn run_all_build_scripts(
|
||||||
|
workspaces: &[ProjectWorkspace],
|
||||||
|
config: &CargoConfig,
|
||||||
|
progress: &dyn Fn(String),
|
||||||
|
) -> Vec<Result<WorkspaceBuildScripts>> {
|
||||||
|
if let InvocationStrategy::PerWorkspace = config.invocation_strategy {
|
||||||
|
return workspaces.iter().map(|it| it.run_build_scripts(config, progress)).collect();
|
||||||
|
}
|
||||||
|
|
||||||
|
let cargo_ws: Vec<_> = workspaces
|
||||||
|
.iter()
|
||||||
|
.filter_map(|it| match it {
|
||||||
|
ProjectWorkspace::Cargo { cargo, .. } => Some(cargo),
|
||||||
|
_ => None,
|
||||||
|
})
|
||||||
|
.collect();
|
||||||
|
let ref mut outputs = match WorkspaceBuildScripts::run_once(config, &cargo_ws, progress) {
|
||||||
|
Ok(it) => Ok(it.into_iter()),
|
||||||
|
// io::Error is not Clone?
|
||||||
|
Err(e) => Err(Arc::new(e)),
|
||||||
|
};
|
||||||
|
|
||||||
|
workspaces
|
||||||
|
.iter()
|
||||||
|
.map(|it| match it {
|
||||||
|
ProjectWorkspace::Cargo { cargo, .. } => match outputs {
|
||||||
|
Ok(outputs) => Ok(outputs.next().unwrap()),
|
||||||
|
Err(e) => Err(e.clone()).with_context(|| {
|
||||||
|
format!(
|
||||||
|
"Failed to run build scripts for {}",
|
||||||
|
&cargo.workspace_root().display()
|
||||||
|
)
|
||||||
|
}),
|
||||||
|
},
|
||||||
|
_ => Ok(WorkspaceBuildScripts::default()),
|
||||||
|
})
|
||||||
|
.collect()
|
||||||
|
}
|
||||||
|
|
||||||
pub fn set_build_scripts(&mut self, bs: WorkspaceBuildScripts) {
|
pub fn set_build_scripts(&mut self, bs: WorkspaceBuildScripts) {
|
||||||
match self {
|
match self {
|
||||||
ProjectWorkspace::Cargo { build_scripts, .. } => *build_scripts = bs,
|
ProjectWorkspace::Cargo { build_scripts, .. } => *build_scripts = bs,
|
||||||
|
|
|
@ -69,6 +69,13 @@ config_data! {
|
||||||
cargo_autoreload: bool = "true",
|
cargo_autoreload: bool = "true",
|
||||||
/// Run build scripts (`build.rs`) for more precise code analysis.
|
/// Run build scripts (`build.rs`) for more precise code analysis.
|
||||||
cargo_buildScripts_enable: bool = "true",
|
cargo_buildScripts_enable: bool = "true",
|
||||||
|
/// Specifies the invocation strategy to use when running the build scripts command.
|
||||||
|
/// If `per_workspace` is set, the command will be executed for each workspace from the
|
||||||
|
/// corresponding workspace root.
|
||||||
|
/// If `once` is set, the command will be executed once in the project root.
|
||||||
|
/// This config only has an effect when `#rust-analyzer.cargo.buildScripts.overrideCommand#`
|
||||||
|
/// is set.
|
||||||
|
cargo_buildScripts_invocationStrategy: InvocationStrategy = "\"per_workspace\"",
|
||||||
/// Override the command rust-analyzer uses to run build scripts and
|
/// Override the command rust-analyzer uses to run build scripts and
|
||||||
/// build procedural macros. The command is required to output json
|
/// build procedural macros. The command is required to output json
|
||||||
/// and should therefore include `--message-format=json` or a similar
|
/// and should therefore include `--message-format=json` or a similar
|
||||||
|
@ -122,6 +129,13 @@ config_data! {
|
||||||
///
|
///
|
||||||
/// Set to `"all"` to pass `--all-features` to Cargo.
|
/// Set to `"all"` to pass `--all-features` to Cargo.
|
||||||
checkOnSave_features: Option<CargoFeaturesDef> = "null",
|
checkOnSave_features: Option<CargoFeaturesDef> = "null",
|
||||||
|
/// Specifies the invocation strategy to use when running the checkOnSave command.
|
||||||
|
/// If `per_workspace` is set, the command will be executed for each workspace from the
|
||||||
|
/// corresponding workspace root.
|
||||||
|
/// If `once` is set, the command will be executed once in the project root.
|
||||||
|
/// This config only has an effect when `#rust-analyzer.cargo.buildScripts.overrideCommand#`
|
||||||
|
/// is set.
|
||||||
|
checkOnSave_invocationStrategy: InvocationStrategy = "\"per_workspace\"",
|
||||||
/// Whether to pass `--no-default-features` to Cargo. Defaults to
|
/// Whether to pass `--no-default-features` to Cargo. Defaults to
|
||||||
/// `#rust-analyzer.cargo.noDefaultFeatures#`.
|
/// `#rust-analyzer.cargo.noDefaultFeatures#`.
|
||||||
checkOnSave_noDefaultFeatures: Option<bool> = "null",
|
checkOnSave_noDefaultFeatures: Option<bool> = "null",
|
||||||
|
@ -1056,6 +1070,10 @@ impl Config {
|
||||||
rustc_source,
|
rustc_source,
|
||||||
unset_test_crates: UnsetTestCrates::Only(self.data.cargo_unsetTest.clone()),
|
unset_test_crates: UnsetTestCrates::Only(self.data.cargo_unsetTest.clone()),
|
||||||
wrap_rustc_in_build_scripts: self.data.cargo_buildScripts_useRustcWrapper,
|
wrap_rustc_in_build_scripts: self.data.cargo_buildScripts_useRustcWrapper,
|
||||||
|
invocation_strategy: match self.data.cargo_buildScripts_invocationStrategy {
|
||||||
|
InvocationStrategy::Once => project_model::InvocationStrategy::Once,
|
||||||
|
InvocationStrategy::PerWorkspace => project_model::InvocationStrategy::PerWorkspace,
|
||||||
|
},
|
||||||
run_build_script_command: self.data.cargo_buildScripts_overrideCommand.clone(),
|
run_build_script_command: self.data.cargo_buildScripts_overrideCommand.clone(),
|
||||||
extra_env: self.data.cargo_extraEnv.clone(),
|
extra_env: self.data.cargo_extraEnv.clone(),
|
||||||
}
|
}
|
||||||
|
@ -1079,6 +1097,10 @@ impl Config {
|
||||||
if !self.data.checkOnSave_enable {
|
if !self.data.checkOnSave_enable {
|
||||||
return None;
|
return None;
|
||||||
}
|
}
|
||||||
|
let invocation_strategy = match self.data.checkOnSave_invocationStrategy {
|
||||||
|
InvocationStrategy::Once => flycheck::InvocationStrategy::Once,
|
||||||
|
InvocationStrategy::PerWorkspace => flycheck::InvocationStrategy::PerWorkspace,
|
||||||
|
};
|
||||||
let flycheck_config = match &self.data.checkOnSave_overrideCommand {
|
let flycheck_config = match &self.data.checkOnSave_overrideCommand {
|
||||||
Some(args) if !args.is_empty() => {
|
Some(args) if !args.is_empty() => {
|
||||||
let mut args = args.clone();
|
let mut args = args.clone();
|
||||||
|
@ -1087,6 +1109,7 @@ impl Config {
|
||||||
command,
|
command,
|
||||||
args,
|
args,
|
||||||
extra_env: self.check_on_save_extra_env(),
|
extra_env: self.check_on_save_extra_env(),
|
||||||
|
invocation_strategy,
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
Some(_) | None => FlycheckConfig::CargoCommand {
|
Some(_) | None => FlycheckConfig::CargoCommand {
|
||||||
|
@ -1116,6 +1139,7 @@ impl Config {
|
||||||
},
|
},
|
||||||
extra_args: self.data.checkOnSave_extraArgs.clone(),
|
extra_args: self.data.checkOnSave_extraArgs.clone(),
|
||||||
extra_env: self.check_on_save_extra_env(),
|
extra_env: self.check_on_save_extra_env(),
|
||||||
|
invocation_strategy,
|
||||||
},
|
},
|
||||||
};
|
};
|
||||||
Some(flycheck_config)
|
Some(flycheck_config)
|
||||||
|
@ -1587,6 +1611,13 @@ enum CargoFeaturesDef {
|
||||||
Selected(Vec<String>),
|
Selected(Vec<String>),
|
||||||
}
|
}
|
||||||
|
|
||||||
|
#[derive(Deserialize, Debug, Clone)]
|
||||||
|
#[serde(rename_all = "snake_case")]
|
||||||
|
enum InvocationStrategy {
|
||||||
|
Once,
|
||||||
|
PerWorkspace,
|
||||||
|
}
|
||||||
|
|
||||||
#[derive(Deserialize, Debug, Clone)]
|
#[derive(Deserialize, Debug, Clone)]
|
||||||
#[serde(untagged)]
|
#[serde(untagged)]
|
||||||
enum LifetimeElisionDef {
|
enum LifetimeElisionDef {
|
||||||
|
@ -2001,6 +2032,14 @@ fn field_props(field: &str, ty: &str, doc: &[&str], default: &str) -> serde_json
|
||||||
"Render annotations above the whole item, including documentation comments and attributes."
|
"Render annotations above the whole item, including documentation comments and attributes."
|
||||||
],
|
],
|
||||||
},
|
},
|
||||||
|
"InvocationStrategy" => set! {
|
||||||
|
"type": "string",
|
||||||
|
"enum": ["per_workspace", "once"],
|
||||||
|
"enumDescriptions": [
|
||||||
|
"The command will be executed for each workspace from the corresponding workspace root.",
|
||||||
|
"The command will be executed once in the project root."
|
||||||
|
],
|
||||||
|
},
|
||||||
_ => panic!("missing entry for {}: {}", ty, default),
|
_ => panic!("missing entry for {}: {}", ty, default),
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -175,10 +175,8 @@ impl GlobalState {
|
||||||
sender.send(Task::FetchBuildData(BuildDataProgress::Report(msg))).unwrap()
|
sender.send(Task::FetchBuildData(BuildDataProgress::Report(msg))).unwrap()
|
||||||
}
|
}
|
||||||
};
|
};
|
||||||
let mut res = Vec::new();
|
let res = ProjectWorkspace::run_all_build_scripts(&workspaces, &config, &progress);
|
||||||
for ws in workspaces.iter() {
|
|
||||||
res.push(ws.run_build_scripts(&config, &progress));
|
|
||||||
}
|
|
||||||
sender.send(Task::FetchBuildData(BuildDataProgress::End((workspaces, res)))).unwrap();
|
sender.send(Task::FetchBuildData(BuildDataProgress::End((workspaces, res)))).unwrap();
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
@ -475,8 +473,18 @@ impl GlobalState {
|
||||||
};
|
};
|
||||||
|
|
||||||
let sender = self.flycheck_sender.clone();
|
let sender = self.flycheck_sender.clone();
|
||||||
self.flycheck = self
|
let (FlycheckConfig::CargoCommand { invocation_strategy, .. }
|
||||||
.workspaces
|
| FlycheckConfig::CustomCommand { invocation_strategy, .. }) = config;
|
||||||
|
|
||||||
|
self.flycheck = match invocation_strategy {
|
||||||
|
flycheck::InvocationStrategy::Once => vec![FlycheckHandle::spawn(
|
||||||
|
0,
|
||||||
|
Box::new(move |msg| sender.send(msg).unwrap()),
|
||||||
|
config.clone(),
|
||||||
|
self.config.root_path().clone(),
|
||||||
|
)],
|
||||||
|
flycheck::InvocationStrategy::PerWorkspace => {
|
||||||
|
self.workspaces
|
||||||
.iter()
|
.iter()
|
||||||
.enumerate()
|
.enumerate()
|
||||||
.filter_map(|(id, w)| match w {
|
.filter_map(|(id, w)| match w {
|
||||||
|
@ -500,7 +508,9 @@ impl GlobalState {
|
||||||
root.to_path_buf(),
|
root.to_path_buf(),
|
||||||
)
|
)
|
||||||
})
|
})
|
||||||
.collect();
|
.collect()
|
||||||
|
}
|
||||||
|
};
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -24,6 +24,16 @@ Automatically refresh project info via `cargo metadata` on
|
||||||
--
|
--
|
||||||
Run build scripts (`build.rs`) for more precise code analysis.
|
Run build scripts (`build.rs`) for more precise code analysis.
|
||||||
--
|
--
|
||||||
|
[[rust-analyzer.cargo.buildScripts.invocationStrategy]]rust-analyzer.cargo.buildScripts.invocationStrategy (default: `"per_workspace"`)::
|
||||||
|
+
|
||||||
|
--
|
||||||
|
Specifies the invocation strategy to use when running the build scripts command.
|
||||||
|
If `per_workspace` is set, the command will be executed for each workspace from the
|
||||||
|
corresponding workspace root.
|
||||||
|
If `once` is set, the command will be executed once in the project root.
|
||||||
|
This config only has an effect when `#rust-analyzer.cargo.buildScripts.overrideCommand#`
|
||||||
|
is set.
|
||||||
|
--
|
||||||
[[rust-analyzer.cargo.buildScripts.overrideCommand]]rust-analyzer.cargo.buildScripts.overrideCommand (default: `null`)::
|
[[rust-analyzer.cargo.buildScripts.overrideCommand]]rust-analyzer.cargo.buildScripts.overrideCommand (default: `null`)::
|
||||||
+
|
+
|
||||||
--
|
--
|
||||||
|
@ -118,6 +128,16 @@ List of features to activate. Defaults to
|
||||||
|
|
||||||
Set to `"all"` to pass `--all-features` to Cargo.
|
Set to `"all"` to pass `--all-features` to Cargo.
|
||||||
--
|
--
|
||||||
|
[[rust-analyzer.checkOnSave.invocationStrategy]]rust-analyzer.checkOnSave.invocationStrategy (default: `"per_workspace"`)::
|
||||||
|
+
|
||||||
|
--
|
||||||
|
Specifies the invocation strategy to use when running the checkOnSave command.
|
||||||
|
If `per_workspace` is set, the command will be executed for each workspace from the
|
||||||
|
corresponding workspace root.
|
||||||
|
If `once` is set, the command will be executed once in the project root.
|
||||||
|
This config only has an effect when `#rust-analyzer.cargo.buildScripts.overrideCommand#`
|
||||||
|
is set.
|
||||||
|
--
|
||||||
[[rust-analyzer.checkOnSave.noDefaultFeatures]]rust-analyzer.checkOnSave.noDefaultFeatures (default: `null`)::
|
[[rust-analyzer.checkOnSave.noDefaultFeatures]]rust-analyzer.checkOnSave.noDefaultFeatures (default: `null`)::
|
||||||
+
|
+
|
||||||
--
|
--
|
||||||
|
|
|
@ -432,6 +432,19 @@
|
||||||
"default": true,
|
"default": true,
|
||||||
"type": "boolean"
|
"type": "boolean"
|
||||||
},
|
},
|
||||||
|
"rust-analyzer.cargo.buildScripts.invocationStrategy": {
|
||||||
|
"markdownDescription": "Specifies the invocation strategy to use when running the build scripts command.\nIf `per_workspace` is set, the command will be executed for each workspace from the\ncorresponding workspace root.\nIf `once` is set, the command will be executed once in the project root.\nThis config only has an effect when `#rust-analyzer.cargo.buildScripts.overrideCommand#`\nis set.",
|
||||||
|
"default": "per_workspace",
|
||||||
|
"type": "string",
|
||||||
|
"enum": [
|
||||||
|
"per_workspace",
|
||||||
|
"once"
|
||||||
|
],
|
||||||
|
"enumDescriptions": [
|
||||||
|
"The command will be executed for each workspace from the corresponding workspace root.",
|
||||||
|
"The command will be executed once in the project root."
|
||||||
|
]
|
||||||
|
},
|
||||||
"rust-analyzer.cargo.buildScripts.overrideCommand": {
|
"rust-analyzer.cargo.buildScripts.overrideCommand": {
|
||||||
"markdownDescription": "Override the command rust-analyzer uses to run build scripts and\nbuild procedural macros. The command is required to output json\nand should therefore include `--message-format=json` or a similar\noption.\n\nBy default, a cargo invocation will be constructed for the configured\ntargets and features, with the following base command line:\n\n```bash\ncargo check --quiet --workspace --message-format=json --all-targets\n```\n.",
|
"markdownDescription": "Override the command rust-analyzer uses to run build scripts and\nbuild procedural macros. The command is required to output json\nand should therefore include `--message-format=json` or a similar\noption.\n\nBy default, a cargo invocation will be constructed for the configured\ntargets and features, with the following base command line:\n\n```bash\ncargo check --quiet --workspace --message-format=json --all-targets\n```\n.",
|
||||||
"default": null,
|
"default": null,
|
||||||
|
@ -557,6 +570,19 @@
|
||||||
}
|
}
|
||||||
]
|
]
|
||||||
},
|
},
|
||||||
|
"rust-analyzer.checkOnSave.invocationStrategy": {
|
||||||
|
"markdownDescription": "Specifies the invocation strategy to use when running the checkOnSave command.\nIf `per_workspace` is set, the command will be executed for each workspace from the\ncorresponding workspace root.\nIf `once` is set, the command will be executed once in the project root.\nThis config only has an effect when `#rust-analyzer.cargo.buildScripts.overrideCommand#`\nis set.",
|
||||||
|
"default": "per_workspace",
|
||||||
|
"type": "string",
|
||||||
|
"enum": [
|
||||||
|
"per_workspace",
|
||||||
|
"once"
|
||||||
|
],
|
||||||
|
"enumDescriptions": [
|
||||||
|
"The command will be executed for each workspace from the corresponding workspace root.",
|
||||||
|
"The command will be executed once in the project root."
|
||||||
|
]
|
||||||
|
},
|
||||||
"rust-analyzer.checkOnSave.noDefaultFeatures": {
|
"rust-analyzer.checkOnSave.noDefaultFeatures": {
|
||||||
"markdownDescription": "Whether to pass `--no-default-features` to Cargo. Defaults to\n`#rust-analyzer.cargo.noDefaultFeatures#`.",
|
"markdownDescription": "Whether to pass `--no-default-features` to Cargo. Defaults to\n`#rust-analyzer.cargo.noDefaultFeatures#`.",
|
||||||
"default": null,
|
"default": null,
|
||||||
|
|
Loading…
Reference in a new issue