Make esp-config structs de-serialization friendly (#3455)

* Make esp-config's structs de-serialization friendly

* Simplify ConfigOption's constructor

* CHANGELOG.md

* Make sure `esp-wifi/build.rs` formats correctly

* Typo

* Run tests, again

* Tests

Author: bjoernQ

esp-backtrace/build.rs

@@ -1,5 +1,5 @@
 use esp_build::assert_unique_used_features;
-use esp_config::{ConfigOption, Stability, Value, generate_config};
+use esp_config::{ConfigOption, generate_config};
 
 fn main() {
     // Ensure that only a single chip is specified:
@@ -15,14 +15,11 @@ fn main() {
     // emit config
     generate_config(
         "esp_backtrace",
-        &[ConfigOption {
-            name: "backtrace-frames",
-            description: "The maximum number of frames that will be printed in a backtrace",
-            default_value: Value::Integer(10),
-            constraint: None,
-            stability: Stability::Unstable,
-            active: true,
-        }],
+        &[ConfigOption::new(
+            "backtrace-frames",
+            "The maximum number of frames that will be printed in a backtrace",
+            10,
+        )],
         true,
         true,
     );

esp-bootloader-esp-idf/Cargo.toml

@@ -15,7 +15,7 @@ default-target = "riscv32imac-unknown-none-elf"
 
 [lib]
 bench = false
-test  = false
+test  = true
 
 [dependencies]
 defmt = { version = "1.0.1", optional = true }

esp-bootloader-esp-idf/build.rs

@@ -1,7 +1,7 @@
 use std::env;
 
 use chrono::{TimeZone, Utc};
-use esp_config::{ConfigOption, Stability, Validator, Value, generate_config};
+use esp_config::{ConfigOption, Validator, generate_config};
 
 fn main() {
     let build_time = match env::var("SOURCE_DATE_EPOCH") {
@@ -19,40 +19,33 @@ fn main() {
     generate_config(
         "esp-bootloader-esp-idf",
         &[
-            ConfigOption {
-                name: "mmu_page_size",
-                description: "ESP32-C2, ESP32-C6 and ESP32-H2 support configurable page sizes. \
+            ConfigOption::new(
+                "mmu_page_size",
+                "ESP32-C2, ESP32-C6 and ESP32-H2 support configurable page sizes. \
                 This is currently only used to populate the app descriptor.",
-                default_value: Value::String(String::from("64k")),
-                constraint: Some(Validator::Enumeration(vec![
-                    String::from("8k"),
-                    String::from("16k"),
-                    String::from("32k"),
-                    String::from("64k"),
-                ])),
-                stability: Stability::Unstable,
-                active: true, // TODO we need to know the device here
-            },
-            ConfigOption {
-                name: "esp_idf_version",
-                description: "ESP-IDF version used in the application descriptor. Currently it's \
+                "64k",
+            )
+            .constraint(Validator::Enumeration(vec![
+                String::from("8k"),
+                String::from("16k"),
+                String::from("32k"),
+                String::from("64k"),
+            ])), // .active(true) TODO we need to know the device here
+            ConfigOption::new(
+                "esp_idf_version",
+                "ESP-IDF version used in the application descriptor. Currently it's \
                 not checked by the bootloader.",
-                default_value: Value::String(String::from("0.0.0")),
-                constraint: None,
-                stability: Stability::Unstable,
-                active: true,
-            },
-            ConfigOption {
-                name: "partition-table-offset",
-                description: "The address of partition table (by default 0x8000). Allows you to \
+                "0.0.0",
+            ),
+            ConfigOption::new(
+                "partition-table-offset",
+                "The address of partition table (by default 0x8000). Allows you to \
                 move the partition table, it gives more space for the bootloader. Note that the \
-                bootloader and app will both need to be compiled with the same |
+                bootloader and app will both need to be compiled with the same \
                 PARTITION_TABLE_OFFSET value.",
-                default_value: Value::Integer(0x8000),
-                constraint: Some(Validator::PositiveInteger),
-                stability: Stability::Unstable,
-                active: true,
-            },
+                0x8000,
+            )
+            .constraint(Validator::PositiveInteger),
         ],
         true,
         true,

esp-config/CHANGELOG.md

@@ -16,6 +16,8 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 - `generate_config` now takes a slice of `ConfigOption`s instead of tuples. (#3362)
 - Bump Rust edition to 2024, bump MSRV to 1.85. (#3391)
+- `ConfigOption` favors `String` over `&str` (#3455)
+- Removed the `Custom` validator (#3455)
 
 ### Fixed
 

esp-config/Cargo.toml

@@ -10,7 +10,7 @@ license       = "MIT OR Apache-2.0"
 
 [lib]
 bench = false
-test  = false
+test  = true
 
 [dependencies]
 document-features = "0.2.11"