Read crate configs from metadata.

3 files changed, 48 insertions, 48 deletions

diff --git a/release/src/main.rs b/release/src/main.rs
index 0dbcc5d45..a49d8f36c 100644
--- a/release/src/main.rs
+++ b/release/src/main.rs
@@ -1,4 +1,3 @@
-use simple_logger::SimpleLogger;
 use std::collections::{BTreeMap, HashMap};
 use std::fs;
 use std::path::{Path, PathBuf};
@@ -6,9 +5,11 @@ use std::process::Command as ProcessCommand;
 
 use anyhow::{anyhow, Result};
 use clap::{Parser, Subcommand};
+use log::info;
 use petgraph::graph::{Graph, NodeIndex};
 use petgraph::visit::Bfs;
 use petgraph::{Directed, Direction};
+use simple_logger::SimpleLogger;
 use toml_edit::{DocumentMut, Item, Value};
 use types::*;
 
@@ -63,15 +64,6 @@ enum Command {
     },
 }
 
-fn load_release_config(repo: &Path) -> ReleaseConfig {
-    let config_path = repo.join("release/config.toml");
-    if !config_path.exists() {
-        return HashMap::new();
-    }
-    let content = fs::read_to_string(&config_path).expect("Failed to read release/config.toml");
-    toml::from_str(&content).expect("Invalid TOML format in release/config.toml")
-}
-
 fn update_version(c: &mut Crate, new_version: &str) -> Result<()> {
     let path = c.path.join("Cargo.toml");
     c.version = new_version.to_string();
@@ -122,12 +114,10 @@ fn update_versions(to_update: &Crate, dep: &CrateId, new_version: &str) -> Resul
 
 fn list_crates(root: &PathBuf) -> Result<BTreeMap<CrateId, Crate>> {
     let d = std::fs::read_dir(root)?;
-    let release_config = load_release_config(root);
     let mut crates = BTreeMap::new();
     for c in d {
         let entry = c?;
-        let name = entry.file_name().to_str().unwrap().to_string();
-        if entry.file_type()?.is_dir() && name.starts_with("embassy-") {
+        if entry.file_type()?.is_dir() {
             let path = root.join(entry.path());
             let entry = path.join("Cargo.toml");
             if entry.exists() {
@@ -135,6 +125,8 @@ fn list_crates(root: &PathBuf) -> Result<BTreeMap<CrateId, Crate>> {
                 let parsed: ParsedCrate = toml::from_str(&content)?;
                 let id = parsed.package.name;
 
+                let metadata = &parsed.package.metadata.embassy;
+
                 let mut dependencies = Vec::new();
                 for (k, _) in parsed.dependencies {
                     if k.starts_with("embassy-") {
@@ -142,18 +134,19 @@ fn list_crates(root: &PathBuf) -> Result<BTreeMap<CrateId, Crate>> {
                     }
                 }
 
-                if let Some(config) = release_config.get(&id) {
-                    crates.insert(
-                        id.clone(),
-                        Crate {
-                            name: id,
-                            version: parsed.package.version,
-                            path,
-                            dependencies,
-                            config: config.clone(),
-                        },
-                    );
-                }
+                crates.insert(
+                    id.clone(),
+                    Crate {
+                        name: id,
+                        version: parsed.package.version,
+                        path,
+                        dependencies,
+                        config: metadata.build.first().cloned().unwrap_or_else(|| BuildConfig {
+                            features: vec![],
+                            target: None,
+                        }),
+                    },
+                );
             }
         }
     }
@@ -313,10 +306,8 @@ fn main() -> Result<()> {
                     c.path.join("Cargo.toml").display().to_string(),
                 ];
 
-                if let Some(features) = &c.config.features {
-                    args.push("--features".into());
-                    args.push(features.join(","));
-                }
+                args.push("--features".into());
+                args.push(c.config.features.join(","));
 
                 if let Some(target) = &c.config.target {
                     args.push("--target".into());
@@ -376,10 +367,8 @@ fn publish_release(_repo: &Path, c: &Crate, push: bool) -> Result<()> {
         c.path.join("Cargo.toml").display().to_string(),
     ];
 
-    if let Some(features) = &c.config.features {
-        args.push("--features".into());
-        args.push(features.join(","));
-    }
+    args.push("--features".into());
+    args.push(c.config.features.join(","));
 
     if let Some(target) = &c.config.target {
         args.push("--target".into());
diff --git a/release/src/semver_check.rs b/release/src/semver_check.rs
index 7b2e50672..96f8ebe2e 100644
--- a/release/src/semver_check.rs
+++ b/release/src/semver_check.rs
@@ -23,11 +23,9 @@ pub fn minimum_update(krate: &Crate) -> Result<ReleaseType, anyhow::Error> {
     semver_check.with_default_features();
     semver_check.set_baseline(baseline);
     semver_check.set_packages(vec![package_name]);
-    if let Some(features) = &krate.config.features {
-        let extra_current_features = features.clone();
-        let extra_baseline_features = features.clone();
-        semver_check.set_extra_features(extra_current_features, extra_baseline_features);
-    }
+    let extra_current_features = krate.config.features.clone();
+    let extra_baseline_features = krate.config.features.clone();
+    semver_check.set_extra_features(extra_current_features, extra_baseline_features);
     if let Some(target) = &krate.config.target {
         semver_check.set_build_target(target.clone());
     }
@@ -70,11 +68,7 @@ pub(crate) fn build_doc_json(krate: &Crate) -> Result<PathBuf, anyhow::Error> {
         .join(format!("{}.json", krate.name.to_string().replace("-", "_")));
 
     std::fs::remove_file(&current_path).ok();
-    let features = if let Some(features) = &krate.config.features {
-        features.clone()
-    } else {
-        vec![]
-    };
+    let features = krate.config.features.clone();
 
     log::info!("Building doc json for {} with features: {:?}", krate.name, features);
 
diff --git a/release/src/types.rs b/release/src/types.rs
index 56a886e6f..39e8e9f48 100644
--- a/release/src/types.rs
+++ b/release/src/types.rs
@@ -1,7 +1,8 @@
-use serde::Deserialize;
 use std::collections::{BTreeMap, HashMap};
 use std::path::PathBuf;
 
+use serde::Deserialize;
+
 #[derive(Debug, Deserialize)]
 pub struct ParsedCrate {
     pub package: ParsedPackage,
@@ -12,15 +13,31 @@ pub struct ParsedCrate {
 pub struct ParsedPackage {
     pub name: String,
     pub version: String,
+    #[serde(default)]
+    pub metadata: Metadata,
+}
+
+#[derive(Debug, Deserialize, Default)]
+pub struct Metadata {
+    #[serde(default)]
+    pub embassy: MetadataEmbassy,
+}
+
+#[derive(Debug, Deserialize, Default)]
+pub struct MetadataEmbassy {
+    #[serde(default)]
+    pub skip: bool,
+    #[serde(default)]
+    pub build: Vec<BuildConfig>,
 }
 
 #[derive(Debug, Clone, Deserialize)]
-pub struct CrateConfig {
-    pub features: Option<Vec<String>>,
+pub struct BuildConfig {
+    #[serde(default)]
+    pub features: Vec<String>,
     pub target: Option<String>,
 }
 
-pub type ReleaseConfig = HashMap<String, CrateConfig>;
 pub type CrateId = String;
 
 #[derive(Debug, Clone)]
@@ -28,6 +45,6 @@ pub struct Crate {
     pub name: String,
     pub version: String,
     pub path: PathBuf,
-    pub config: CrateConfig,
     pub dependencies: Vec<CrateId>,
+    pub config: BuildConfig, // TODO make this a vec.
 }