Unnamed repository; edit this file 'description' to name the repository.
Diffstat (limited to 'crates/project-model/src/lib.rs')
-rw-r--r--crates/project-model/src/lib.rs16
1 files changed, 11 insertions, 5 deletions
diff --git a/crates/project-model/src/lib.rs b/crates/project-model/src/lib.rs
index da8afc5d3a..9a024f6b96 100644
--- a/crates/project-model/src/lib.rs
+++ b/crates/project-model/src/lib.rs
@@ -23,6 +23,7 @@ pub mod project_json;
mod rustc_cfg;
mod sysroot;
pub mod target_data_layout;
+mod target_triple;
mod workspace;
#[cfg(test)]
@@ -42,8 +43,8 @@ use rustc_hash::FxHashSet;
pub use crate::{
build_dependencies::WorkspaceBuildScripts,
cargo_workspace::{
- CargoConfig, CargoFeatures, CargoWorkspace, Package, PackageData, PackageDependency,
- RustLibSource, Target, TargetData, TargetKind,
+ CargoConfig, CargoFeatures, CargoMetadataConfig, CargoWorkspace, Package, PackageData,
+ PackageDependency, RustLibSource, Target, TargetData, TargetKind,
},
manifest_path::ManifestPath,
project_json::{ProjectJson, ProjectJsonData},
@@ -241,9 +242,14 @@ fn parse_cfg(s: &str) -> Result<cfg::CfgAtom, String> {
Ok(res)
}
-#[derive(Clone, Copy, Debug, Default, PartialEq, Eq)]
+#[derive(Clone, Debug, PartialEq, Eq)]
pub enum SysrootQueryMetadata {
- #[default]
- CargoMetadata,
+ CargoMetadata(CargoMetadataConfig),
None,
}
+
+impl Default for SysrootQueryMetadata {
+ fn default() -> Self {
+ SysrootQueryMetadata::CargoMetadata(Default::default())
+ }
+}