improve CrateInfoSource

cargo/src/package/mod.rs

@@ -590,9 +590,11 @@ impl<'cfg, 'm> ManifestSource<'cfg, 'm> {
 	}
 }
 
-impl CrateInfoSource for ManifestSource<'_, '_> {
+impl<'cfg> CrateInfoSource for ManifestSource<'cfg, '_> {
+	type Authors = [&'cfg str];
+
 	fn name(&self) -> Cow<str> { self.package.name().as_str().into() }
-	fn authors(&self) -> &[&str] { &self.authors }
+	fn authors(&self) -> &[&'cfg str] { &self.authors }
 	fn version(&self) -> Cow<str> { self.package.version().to_string().into() }
 	fn description(&self) -> Option<Cow<str>> {
 		self.package

cargo/src/utils/cargo/unit_graph.rs

@@ -35,7 +35,7 @@ pub mod format {
 		pub roots: Vec<usize>,
 	}
 
-	#[derive(Debug, Deserialize)]
+	#[derive(Debug, Deserialize, Eq, Hash, PartialEq)]
 	pub struct Unit {
 		#[serde(deserialize_with = "deserialize_package_id", alias = "pkg_id")]
 		pub package_id: PackageId,
@@ -46,13 +46,13 @@ pub mod format {
 		#[serde(serialize_with = "CompileMode::serialize")]
 		#[serde(deserialize_with = "CompileModeProxy::deserialize")]
 		pub mode: CompileMode,
-		pub features: Vec<serde_json::Value>,
 		pub dependencies: Vec<UnitDep>,
 		// ...
+		// pub features: Vec<serde_json::Value>,
 		// pub profile: crate::proc::reader::format::ArtifactProfile,
 	}
 
-	#[derive(Debug, Deserialize)]
+	#[derive(Debug, Deserialize, Eq, Hash, PartialEq)]
 	pub struct UnitTarget {
 		pub kind: TargetKind,
 		#[serde(deserialize_with = "deserialize_crate_types")]
@@ -62,7 +62,7 @@ pub mod format {
 		// ...
 	}
 
-	#[derive(Debug, Deserialize)]
+	#[derive(Debug, Deserialize, Eq, Hash, PartialEq)]
 	pub struct UnitDep {
 		pub index: usize,
 		pub extern_crate_name: String,

support/build/src/lib.rs

@@ -1,5 +1,6 @@
 #![feature(extract_if)]
 #![feature(io_error_more)]
+#![feature(slice_concat_trait)]
 #![cfg_attr(test, feature(assert_matches))]
 
 #[macro_use]

support/build/src/metadata/format.rs

@@ -303,7 +303,7 @@ impl<S: Eq + Hash> Default for AssetsRules<S> {
 	fn default() -> Self { Self::List(Vec::with_capacity(0)) }
 }
 
-impl AssetsRules {
+impl<S: Eq + Hash> AssetsRules<S> {
 	pub fn is_empty(&self) -> bool {
 		match self {
 			Self::List(list) => list.is_empty(),

support/build/src/metadata/source.rs

@@ -6,10 +6,13 @@ use super::format::{AssetsOptions, AssetsRules, Ext, ExtraFields, ExtraValue, Ma
 
 
 pub trait CrateInfoSource {
+	type Authors: ?Sized + std::slice::Join<&'static str, Output = String>;
+
 	/// Crate name.
 	fn name(&self) -> Cow<str>;
 	/// Crate authors.
-	fn authors(&self) -> &[&str];
+	fn authors(&self) -> &Self::Authors;
+	// fn authors(&self) -> &[&str];
 	/// Crate version (semver).
 	fn version(&self) -> Cow<str>;
 	/// Crate description.
@@ -28,9 +31,11 @@ pub trait CrateInfoSource {
 
 	fn manifest_for_crate(&self) -> impl ManifestSourceOptExt {
 		use super::format::Manifest;
+		use std::slice::Join;
 
 		let author = {
-			let author = self.authors().join(", ");
+			// let author = self.authors().join(", ");
+			let author = Join::join(self.authors(), ", ");
 			if author.trim().is_empty() {
 				None
 			} else {
@@ -495,8 +500,10 @@ mod tests {
 
 	struct CrateInfoNoMeta;
 	impl CrateInfoSource for CrateInfoNoMeta {
+		type Authors = [&'static str];
+
 		fn name(&self) -> Cow<str> { "Name".into() }
-		fn authors(&self) -> &[&str] { &["John"] }
+		fn authors(&self) -> &Self::Authors { &["John"] }
 		fn version(&self) -> Cow<str> { "0.0.0".into() }
 		fn description(&self) -> Option<Cow<str>> { None }
 		fn bins(&self) -> &[&str] { &[SOME_TARGET] }
@@ -518,8 +525,10 @@ mod tests {
 
 	struct CrateInfo;
 	impl CrateInfoSource for CrateInfo {
+		type Authors = [&'static str];
+
 		fn name(&self) -> Cow<str> { "Crate Name".into() }
-		fn authors(&self) -> &[&str] { &["John"] }
+		fn authors(&self) -> &[&'static str] { &["John"] }
 		fn version(&self) -> Cow<str> { "0.0.0".into() }
 		fn description(&self) -> Option<Cow<str>> { None }