//! See `CargoTargetSpec`
-use ra_cfg::CfgExpr;
-use ra_db::AbsPathBuf;
-use ra_ide::{FileId, RunnableKind, TestId};
-use ra_project_model::{self, TargetKind};
+use cfg::{CfgAtom, CfgExpr};
+use ide::{FileId, RunnableKind, TestId};
+use project_model::{self, ManifestPath, TargetKind};
+use vfs::AbsPathBuf;
use crate::{global_state::GlobalStateSnapshot, Result};
#[derive(Clone)]
pub(crate) struct CargoTargetSpec {
pub(crate) workspace_root: AbsPathBuf,
+ pub(crate) cargo_toml: ManifestPath,
pub(crate) package: String,
pub(crate) target: String,
pub(crate) target_kind: TargetKind,
impl CargoTargetSpec {
pub(crate) fn runnable_args(
+ snap: &GlobalStateSnapshot,
spec: Option<CargoTargetSpec>,
kind: &RunnableKind,
- cfgs: &[CfgExpr],
+ cfg: &Option<CfgExpr>,
) -> Result<(Vec<String>, Vec<String>)> {
let mut args = Vec::new();
let mut extra_args = Vec::new();
extra_args.push("--nocapture".to_string());
}
RunnableKind::Bin => {
- args.push("run".to_string());
+ let subcommand = match spec {
+ Some(CargoTargetSpec { target_kind: TargetKind::Test, .. }) => "test",
+ _ => "run",
+ };
+ args.push(subcommand.to_string());
if let Some(spec) = spec {
spec.push_to(&mut args, kind);
}
}
}
- let mut features = Vec::new();
- for cfg in cfgs {
- required_features(cfg, &mut features);
- }
- for feature in features {
- args.push("--features".to_string());
- args.push(feature);
+ let cargo_config = snap.config.cargo();
+ if cargo_config.all_features {
+ args.push("--all-features".to_string());
+ } else {
+ let mut features = Vec::new();
+ if let Some(cfg) = cfg.as_ref() {
+ required_features(cfg, &mut features);
+ }
+ for feature in cargo_config.features {
+ features.push(feature.clone());
+ }
+ features.dedup();
+ for feature in features {
+ args.push("--features".to_string());
+ args.push(feature);
+ }
}
Ok((args, extra_args))
global_state_snapshot: &GlobalStateSnapshot,
file_id: FileId,
) -> Result<Option<CargoTargetSpec>> {
- let crate_id = match global_state_snapshot.analysis().crate_for(file_id)?.first() {
+ let crate_id = match global_state_snapshot.analysis.crate_for(file_id)?.first() {
Some(crate_id) => *crate_id,
None => return Ok(None),
};
Some(it) => it,
None => return Ok(None),
};
+
+ let target_data = &cargo_ws[target];
+ let package_data = &cargo_ws[target_data.package];
let res = CargoTargetSpec {
workspace_root: cargo_ws.workspace_root().to_path_buf(),
- package: cargo_ws.package_flag(&cargo_ws[cargo_ws[target].package]),
- target: cargo_ws[target].name.clone(),
- target_kind: cargo_ws[target].kind,
+ cargo_toml: package_data.manifest.clone(),
+ package: cargo_ws.package_flag(package_data),
+ target: target_data.name.clone(),
+ target_kind: target_data.kind,
};
+
Ok(Some(res))
}
TargetKind::Lib => {
buf.push("--lib".to_string());
}
- TargetKind::Other => (),
+ TargetKind::Other | TargetKind::BuildScript => (),
}
}
}
/// Fill minimal features needed
fn required_features(cfg_expr: &CfgExpr, features: &mut Vec<String>) {
match cfg_expr {
- CfgExpr::KeyValue { key, value } if key == "feature" => features.push(value.to_string()),
+ CfgExpr::Atom(CfgAtom::KeyValue { key, value }) if key == "feature" => {
+ features.push(value.to_string())
+ }
CfgExpr::All(preds) => {
preds.iter().for_each(|cfg| required_features(cfg, features));
}
mod tests {
use super::*;
- use mbe::{ast_to_token_tree, TokenMap};
- use ra_cfg::parse_cfg;
- use ra_syntax::{
+ use cfg::CfgExpr;
+ use mbe::ast_to_token_tree;
+ use syntax::{
ast::{self, AstNode},
SmolStr,
};
- fn get_token_tree_generated(input: &str) -> (tt::Subtree, TokenMap) {
- let source_file = ast::SourceFile::parse(input).ok().unwrap();
- let tt = source_file.syntax().descendants().find_map(ast::TokenTree::cast).unwrap();
- ast_to_token_tree(&tt).unwrap()
- }
-
- #[test]
- fn test_cfg_expr_minimal_features_needed() {
- let (subtree, _) = get_token_tree_generated(r#"#![cfg(feature = "baz")]"#);
- let cfg_expr = parse_cfg(&subtree);
- let mut min_features = vec![];
- required_features(&cfg_expr, &mut min_features);
-
- assert_eq!(min_features, vec![SmolStr::new("baz")]);
-
- let (subtree, _) =
- get_token_tree_generated(r#"#![cfg(all(feature = "baz", feature = "foo"))]"#);
- let cfg_expr = parse_cfg(&subtree);
-
- let mut min_features = vec![];
- required_features(&cfg_expr, &mut min_features);
- assert_eq!(min_features, vec![SmolStr::new("baz"), SmolStr::new("foo")]);
+ fn check(cfg: &str, expected_features: &[&str]) {
+ let cfg_expr = {
+ let source_file = ast::SourceFile::parse(cfg).ok().unwrap();
+ let tt = source_file.syntax().descendants().find_map(ast::TokenTree::cast).unwrap();
+ let (tt, _) = ast_to_token_tree(&tt);
+ CfgExpr::parse(&tt)
+ };
- let (subtree, _) =
- get_token_tree_generated(r#"#![cfg(any(feature = "baz", feature = "foo", unix))]"#);
- let cfg_expr = parse_cfg(&subtree);
+ let mut features = vec![];
+ required_features(&cfg_expr, &mut features);
- let mut min_features = vec![];
- required_features(&cfg_expr, &mut min_features);
- assert_eq!(min_features, vec![SmolStr::new("baz")]);
+ let expected_features =
+ expected_features.iter().map(|&it| SmolStr::new(it)).collect::<Vec<_>>();
- let (subtree, _) = get_token_tree_generated(r#"#![cfg(foo)]"#);
- let cfg_expr = parse_cfg(&subtree);
+ assert_eq!(features, expected_features);
+ }
- let mut min_features = vec![];
- required_features(&cfg_expr, &mut min_features);
- assert!(min_features.is_empty());
+ #[test]
+ fn test_cfg_expr_minimal_features_needed() {
+ check(r#"#![cfg(feature = "baz")]"#, &["baz"]);
+ check(r#"#![cfg(all(feature = "baz", feature = "foo"))]"#, &["baz", "foo"]);
+ check(r#"#![cfg(any(feature = "baz", feature = "foo", unix))]"#, &["baz"]);
+ check(r#"#![cfg(foo)]"#, &[]);
}
}
projects / rust.git / blobdiff