Auto merge of #17016 - HKalbasi:test-explorer, r=HKalbasi

Apply cargo flags in test explorer
cc #16827

Author: bors

crates/flycheck/src/lib.rs

@@ -41,19 +41,50 @@ pub enum InvocationLocation {
 Workspace,
 }
 
+#[derive(Clone,Debug,PartialEq,Eq)]
+pubstructCargoOptions{
+pubtarget_triples:Vec<String>,
+puball_targets:bool,
+pubno_default_features:bool,
+puball_features:bool,
+pubfeatures:Vec<String>,
+pubextra_args:Vec<String>,
+pubextra_env:FxHashMap<String,String>,
+pubtarget_dir:Option<Utf8PathBuf>,
+}
+
+implCargoOptions{
+fnapply_on_command(&self,cmd:&mutCommand){
+for target in&self.target_triples{
+ cmd.args(["--target", target.as_str()]);
+}
+ifself.all_targets{
+ cmd.arg("--all-targets");
+}
+ifself.all_features{
+ cmd.arg("--all-features");
+}else{
+ifself.no_default_features{
+ cmd.arg("--no-default-features");
+}
+if !self.features.is_empty(){
+ cmd.arg("--features");
+ cmd.arg(self.features.join(" "));
+}
+}
+ifletSome(target_dir) = &self.target_dir{
+ cmd.arg("--target-dir").arg(target_dir);
+}
+ cmd.envs(&self.extra_env);
+}
+}
+
 #[derive(Clone,Debug,PartialEq,Eq)]
 pubenumFlycheckConfig{
 CargoCommand{
 command:String,
-target_triples:Vec<String>,
-all_targets:bool,
-no_default_features:bool,
-all_features:bool,
-features:Vec<String>,
-extra_args:Vec<String>,
-extra_env:FxHashMap<String,String>,
+options:CargoOptions,
 ansi_color_output:bool,
-target_dir:Option<Utf8PathBuf>,
 },
 CustomCommand{
 command:String,
@@ -332,18 +363,7 @@ impl FlycheckActor {
 saved_file:Option<&AbsPath>,
 ) -> Option<Command>{
 let(mut cmd, args) = match&self.config{
-FlycheckConfig::CargoCommand{
- command,
- target_triples,
- no_default_features,
- all_targets,
- all_features,
- extra_args,
- features,
- extra_env,
- ansi_color_output,
- target_dir,
-} => {
+FlycheckConfig::CargoCommand{ command, options, ansi_color_output } => {
 letmut cmd = Command::new(Tool::Cargo.path());
 ifletSome(sysroot_root) = &self.sysroot_root{
  cmd.env("RUSTUP_TOOLCHAIN",AsRef::<std::path::Path>::as_ref(sysroot_root));
@@ -365,28 +385,8 @@ impl FlycheckActor {
  cmd.arg("--manifest-path");
  cmd.arg(self.root.join("Cargo.toml"));
 
-for target in target_triples {
- cmd.args(["--target", target.as_str()]);
-}
-if*all_targets {
- cmd.arg("--all-targets");
-}
-if*all_features {
- cmd.arg("--all-features");
-}else{
-if*no_default_features {
- cmd.arg("--no-default-features");
-}
-if !features.is_empty(){
- cmd.arg("--features");
- cmd.arg(features.join(" "));
-}
-}
-ifletSome(target_dir) = target_dir {
- cmd.arg("--target-dir").arg(target_dir);
-}
- cmd.envs(extra_env);
-(cmd, extra_args.clone())
+ options.apply_on_command(&mut cmd);
+(cmd, options.extra_args.clone())
 }
 FlycheckConfig::CustomCommand{
  command,

crates/flycheck/src/test_runner.rs

@@ -7,7 +7,10 @@ use crossbeam_channel::Receiver;
 use serde::Deserialize;
 use toolchain::Tool;
 
-usecrate::command::{CommandHandle,ParseFromLine};
+usecrate::{
+ command::{CommandHandle,ParseFromLine},
+CargoOptions,
+};
 
 #[derive(Debug,Deserialize)]
 #[serde(tag = "event", rename_all = "camelCase")]
@@ -58,13 +61,14 @@ pub struct CargoTestHandle {
 // cargo test --workspace --no-fail-fast -- module::func -Z unstable-options --format=json
 
 implCargoTestHandle{
-pubfnnew(path:Option<&str>) -> std::io::Result<Self>{
+pubfnnew(path:Option<&str>,options:CargoOptions) -> std::io::Result<Self>{
 letmut cmd = Command::new(Tool::Cargo.path());
  cmd.env("RUSTC_BOOTSTRAP","1");
  cmd.arg("test");
  cmd.arg("--workspace");
 // --no-fail-fast is needed to ensure that all requested tests will run
  cmd.arg("--no-fail-fast");
+ options.apply_on_command(&mut cmd);
  cmd.arg("--");
 ifletSome(path) = path {
  cmd.arg(path);

crates/rust-analyzer/src/config.rs

@@ -10,7 +10,7 @@
 use std::{fmt, iter, ops::Not};
 
 use cfg::{CfgAtom,CfgDiff};
-use flycheck::FlycheckConfig;
+use flycheck::{CargoOptions,FlycheckConfig};
 use ide::{
 AssistConfig,CallableSnippets,CompletionConfig,DiagnosticsConfig,ExprFillDefaultMode,
 HighlightConfig,HighlightRelatedConfig,HoverConfig,HoverDocFormat,InlayFieldsToResolve,
@@ -1364,6 +1364,22 @@ impl Config {
 self.data.check_workspace
 }
 
+pubfncargo_test_options(&self) -> CargoOptions{
+CargoOptions{
+target_triples:self.data.cargo_target.clone().into_iter().collect(),
+all_targets:false,
+no_default_features:self.data.cargo_noDefaultFeatures,
+all_features:matches!(self.data.cargo_features,CargoFeaturesDef::All),
+features:matchself.data.cargo_features.clone(){
+CargoFeaturesDef::All => vec![],
+CargoFeaturesDef::Selected(it) => it,
+},
+extra_args:self.extra_args().clone(),
+extra_env:self.extra_env().clone(),
+target_dir:self.target_dir_from_config(),
+}
+}
+
 pubfnflycheck(&self) -> FlycheckConfig{
 match&self.data.check_overrideCommand{
 Some(args)if !args.is_empty() => {
@@ -1389,37 +1405,39 @@ impl Config {
 }
 Some(_) | None => FlycheckConfig::CargoCommand{
 command:self.data.check_command.clone(),
-target_triples:self
-.data
-.check_targets
-.clone()
-.and_then(|targets| match&targets.0[..]{
-[] => None,
- targets => Some(targets.into()),
-})
-.unwrap_or_else(|| self.data.cargo_target.clone().into_iter().collect()),
-all_targets:self.data.check_allTargets.unwrap_or(self.data.cargo_allTargets),
-no_default_features:self
-.data
-.check_noDefaultFeatures
-.unwrap_or(self.data.cargo_noDefaultFeatures),
-all_features:matches!(
-self.data.check_features.as_ref().unwrap_or(&self.data.cargo_features),
-CargoFeaturesDef::All
-),
-features:matchself
-.data
-.check_features
-.clone()
-.unwrap_or_else(|| self.data.cargo_features.clone())
-{
-CargoFeaturesDef::All => vec![],
-CargoFeaturesDef::Selected(it) => it,
+options:CargoOptions{
+target_triples:self
+.data
+.check_targets
+.clone()
+.and_then(|targets| match&targets.0[..]{
+[] => None,
+ targets => Some(targets.into()),
+})
+.unwrap_or_else(|| self.data.cargo_target.clone().into_iter().collect()),
+all_targets:self.data.check_allTargets.unwrap_or(self.data.cargo_allTargets),
+no_default_features:self
+.data
+.check_noDefaultFeatures
+.unwrap_or(self.data.cargo_noDefaultFeatures),
+all_features:matches!(
+self.data.check_features.as_ref().unwrap_or(&self.data.cargo_features),
+CargoFeaturesDef::All
+),
+features:matchself
+.data
+.check_features
+.clone()
+.unwrap_or_else(|| self.data.cargo_features.clone())
+{
+CargoFeaturesDef::All => vec![],
+CargoFeaturesDef::Selected(it) => it,
+},
+extra_args:self.check_extra_args(),
+extra_env:self.check_extra_env(),
+target_dir:self.target_dir_from_config(),
 },
-extra_args:self.check_extra_args(),
-extra_env:self.check_extra_env(),
 ansi_color_output:self.color_diagnostic_output(),
-target_dir:self.target_dir_from_config(),
 },
 }
 }
@@ -2772,7 +2790,7 @@ mod tests {
 .unwrap();
 assert_eq!(config.data.cargo_targetDir,None);
 assert!(
- matches!(config.flycheck(),FlycheckConfig::CargoCommand{target_dir, .. }if target_dir.is_none())
+ matches!(config.flycheck(),FlycheckConfig::CargoCommand{options, .. }ifoptions.target_dir.is_none())
 );
 }
 
@@ -2791,7 +2809,7 @@ mod tests {
 .unwrap();
 assert_eq!(config.data.cargo_targetDir,Some(TargetDirectory::UseSubdirectory(true)));
 assert!(
- matches!(config.flycheck(),FlycheckConfig::CargoCommand{target_dir, .. }if target_dir == Some(Utf8PathBuf::from("target/rust-analyzer")))
+ matches!(config.flycheck(),FlycheckConfig::CargoCommand{options, .. }ifoptions.target_dir == Some(Utf8PathBuf::from("target/rust-analyzer")))
 );
 }
 
@@ -2813,7 +2831,7 @@ mod tests {
 Some(TargetDirectory::Directory(Utf8PathBuf::from("other_folder")))
 );
 assert!(
- matches!(config.flycheck(),FlycheckConfig::CargoCommand{target_dir, .. }if target_dir == Some(Utf8PathBuf::from("other_folder")))
+ matches!(config.flycheck(),FlycheckConfig::CargoCommand{options, .. }ifoptions.target_dir == Some(Utf8PathBuf::from("other_folder")))
 );
 }
 }

crates/rust-analyzer/src/handlers/request.rs

@@ -220,11 +220,11 @@ pub(crate) fn handle_run_test(
 None => "".to_owned(),
 };
 let handle = if lca.is_empty(){
- flycheck::CargoTestHandle::new(None)
+ flycheck::CargoTestHandle::new(None, state.config.cargo_test_options())
 }elseifletSome((_, path)) = lca.split_once("::"){
- flycheck::CargoTestHandle::new(Some(path))
+ flycheck::CargoTestHandle::new(Some(path), state.config.cargo_test_options())
 }else{
- flycheck::CargoTestHandle::new(None)
+ flycheck::CargoTestHandle::new(None, state.config.cargo_test_options())
 };
  state.test_run_session = Some(handle?);
 Ok(())