//! See [`CargoWorkspace`].
+use std::convert::TryInto;
use std::iter;
use std::path::PathBuf;
-use std::{convert::TryInto, ops, process::Command, sync::Arc};
+use std::{ops, process::Command};
use anyhow::{Context, Result};
use base_db::Edition;
use serde_json::from_value;
use crate::CfgOverrides;
-use crate::{build_data::BuildDataConfig, utf8_stdout};
+use crate::{utf8_stdout, ManifestPath};
/// [`CargoWorkspace`] represents the logical structure of, well, a Cargo
/// workspace. It pretty closely mirrors `cargo metadata` output.
packages: Arena<PackageData>,
targets: Arena<TargetData>,
workspace_root: AbsPathBuf,
- build_data_config: BuildDataConfig,
}
impl ops::Index<Package> for CargoWorkspace {
/// crates to disable `#[cfg(test)]` on
pub unset_test_crates: Vec<String>,
+
+ pub wrap_rustc_in_build_scripts: bool,
}
impl CargoConfig {
#[derive(Debug, Clone, Eq, PartialEq)]
pub struct PackageData {
/// Version given in the `Cargo.toml`
- pub version: String,
+ pub version: semver::Version,
/// Name as given in the `Cargo.toml`
pub name: String,
/// Path containing the `Cargo.toml`
- pub manifest: AbsPathBuf,
+ pub manifest: ManifestPath,
/// Targets provided by the crate (lib, bin, example, test, ...)
pub targets: Vec<Target>,
/// Is this package a member of the current workspace
}
}
-impl PackageData {
- pub fn root(&self) -> &AbsPath {
- self.manifest.parent().unwrap()
- }
-}
-
#[derive(Deserialize, Default)]
// Deserialise helper for the cargo metadata
struct PackageMetadata {
impl CargoWorkspace {
pub fn fetch_metadata(
- cargo_toml: &AbsPath,
+ cargo_toml: &ManifestPath,
config: &CargoConfig,
progress: &dyn Fn(String),
) -> Result<cargo_metadata::Metadata> {
+ let target = config
+ .target
+ .clone()
+ .or_else(|| cargo_config_build_target(cargo_toml))
+ .or_else(|| rustc_discover_host_triple(cargo_toml));
+
let mut meta = MetadataCommand::new();
meta.cargo_path(toolchain::cargo());
meta.manifest_path(cargo_toml.to_path_buf());
meta.features(CargoOpt::SomeFeatures(config.features.clone()));
}
}
- if let Some(parent) = cargo_toml.parent() {
- meta.current_dir(parent.to_path_buf());
- }
- let target = if let Some(target) = &config.target {
- Some(target.clone())
- } else if let stdout @ Some(_) = cargo_config_build_target(cargo_toml) {
- stdout
- } else {
- rustc_discover_host_triple(cargo_toml)
- };
+ meta.current_dir(cargo_toml.parent().as_os_str());
+
if let Some(target) = target {
meta.other_options(vec![String::from("--filter-platform"), target]);
}
progress("metadata".to_string());
let meta = meta.exec().with_context(|| {
- let cwd: Option<AbsPathBuf> =
- std::env::current_dir().ok().and_then(|p| p.try_into().ok());
-
- let workdir = cargo_toml
- .parent()
- .map(|p| p.to_path_buf())
- .or(cwd)
- .map(|dir| format!(" in `{}`", dir.display()))
- .unwrap_or_default();
-
- format!(
- "Failed to run `cargo metadata --manifest-path {}`{}",
- cargo_toml.display(),
- workdir
- )
+ format!("Failed to run `cargo metadata --manifest-path {}`", cargo_toml.display(),)
})?;
Ok(meta)
}
- pub fn new(
- cargo_toml: &AbsPath,
- config: &CargoConfig,
- mut meta: cargo_metadata::Metadata,
- ) -> CargoWorkspace {
+ pub fn new(mut meta: cargo_metadata::Metadata) -> CargoWorkspace {
let mut pkg_by_id = FxHashMap::default();
let mut packages = Arena::default();
let mut targets = Arena::default();
let pkg = packages.alloc(PackageData {
id: id.repr.clone(),
name: name.clone(),
- version: version.to_string(),
- manifest: AbsPathBuf::assert(PathBuf::from(&manifest_path)),
+ version: version.clone(),
+ manifest: AbsPathBuf::assert(PathBuf::from(&manifest_path)).try_into().unwrap(),
targets: Vec::new(),
is_member,
edition,
let workspace_root =
AbsPathBuf::assert(PathBuf::from(meta.workspace_root.into_os_string()));
- let build_data_config =
- BuildDataConfig::new(cargo_toml.to_path_buf(), config.clone(), Arc::new(meta.packages));
- CargoWorkspace { packages, targets, workspace_root, build_data_config }
+ CargoWorkspace { packages, targets, workspace_root }
}
pub fn from_cargo_metadata3(
- cargo_toml: &AbsPath,
+ cargo_toml: &ManifestPath,
config: &CargoConfig,
progress: &dyn Fn(String),
) -> Result<CargoWorkspace> {
let meta = CargoWorkspace::fetch_metadata(cargo_toml, config, progress)?;
- Ok(CargoWorkspace::new(cargo_toml, config, meta))
+ Ok(CargoWorkspace::new(meta))
}
pub fn packages<'a>(&'a self) -> impl Iterator<Item = Package> + ExactSizeIterator + 'a {
}
}
- pub(crate) fn build_data_config(&self) -> &BuildDataConfig {
- &self.build_data_config
- }
-
fn is_unique(&self, name: &str) -> bool {
self.packages.iter().filter(|(_, v)| v.name == name).count() == 1
}
}
-fn rustc_discover_host_triple(cargo_toml: &AbsPath) -> Option<String> {
+fn rustc_discover_host_triple(cargo_toml: &ManifestPath) -> Option<String> {
let mut rustc = Command::new(toolchain::rustc());
- rustc.current_dir(cargo_toml.parent().unwrap()).arg("-vV");
+ rustc.current_dir(cargo_toml.parent()).arg("-vV");
log::debug!("Discovering host platform by {:?}", rustc);
match utf8_stdout(rustc) {
Ok(stdout) => {
}
}
-fn cargo_config_build_target(cargo_toml: &AbsPath) -> Option<String> {
+fn cargo_config_build_target(cargo_toml: &ManifestPath) -> Option<String> {
let mut cargo_config = Command::new(toolchain::cargo());
cargo_config
- .current_dir(cargo_toml.parent().unwrap())
+ .current_dir(cargo_toml.parent())
.args(&["-Z", "unstable-options", "config", "get", "build.target"])
.env("RUSTC_BOOTSTRAP", "1");
// if successful we receive `build.target = "target-triple"`
projects / rust.git / blobdiff