Merge pull request #40 from YuhanLiin/multi-heapless

Support both heapless 0.8 and 0.9

Author: YuhanLiin

.github/workflows/ci.yml

@@ -9,7 +9,7 @@ jobs:
       matrix:
         toolchain:
           - stable
-          - 1.85.0
+          - 1.88.0
     steps:
       - uses: actions/checkout@v4
       - uses: dtolnay/rust-toolchain@master
@@ -28,7 +28,7 @@ jobs:
       matrix:
         toolchain:
           - stable
-          - 1.85.0
+          - 1.88.0
     steps:
       - uses: actions/checkout@v4
       - uses: dtolnay/rust-toolchain@master
@@ -47,7 +47,7 @@ jobs:
       matrix:
         toolchain:
           - stable
-          - 1.85.0
+          - 1.88.0
     steps:
       - uses: actions/checkout@v4
       - uses: dtolnay/rust-toolchain@master

CHANGELOG.md

@@ -7,10 +7,19 @@
 - Add `encode_cache` option to enable caching of message field lengths during encoding
 - Add `compile_protos_with_config_files` to compile proto files with corresponding config files
 - Add new unified error type `micropb_gen::Error`
+- Add `micropb` support for heapless 0.9
 
 ### Changed
 
-- Top-level APIs now return `micropb_gen::Error` instead of `io::ErrorNew`
+- Top-level APIs now return `micropb_gen::Error` instead of `io::Error`
+- Split `container-heapless` into `container-heapless-0-8` and `container-heapless-0-9`
+- Change `container-arrayvec` to `container-arrayvec-0-7`
+- `use_container_heapless` now sets `map_type` to `heapless::index_map::FnvIndexMap`, which is the correct path in v0.9
+- Bump MSRV to 1.88
+
+### Removed
+
+- Remove `micropb` re-exports of `heapless` and `arrayvec`
 
 ## 0.5.1
 

README.md

@@ -38,7 +38,7 @@ Documentation is at [docs.rs](https://docs.rs/micropb-gen/latest/micropb_gen/).
 
 ## MSRV
 
-The oldest version of Rust that `micropb` supports is **1.85.0**.
+The oldest version of Rust that `micropb` supports is **1.88.0**.
 
 ## License
 

examples/arm-app/Cargo.toml

@@ -11,7 +11,8 @@ cortex-m-rt = "0.6.10"
 cortex-m-semihosting = { version = "0.3.3", optional = true }
 panic-halt = "0.2.0"
 
-micropb = { path = "../../micropb", features = ["container-heapless"] }
+micropb = { path = "../../micropb", features = ["container-heapless-0-9"] }
+heapless = "0.9"
 
 [build-dependencies]
 micropb-gen = { path = "../../micropb-gen" }

examples/arm-app/src/main.rs

@@ -5,10 +5,8 @@ use core::{hint::black_box, mem::size_of, str::FromStr};
 
 #[cfg(feature = "formatting")]
 use cortex_m_semihosting::{debug, hprintln};
-use micropb::{
-    heapless::{String, Vec},
-    MessageDecode, MessageEncode, PbDecoder, PbEncoder,
-};
+use heapless::{String, Vec};
+use micropb::{MessageDecode, MessageEncode, PbDecoder, PbEncoder};
 use panic_halt as _; // you can put a breakpoint on `rust_begin_unwind` to catch panics
 
 use cortex_m_rt::entry;

examples/basic/Cargo.toml

@@ -3,10 +3,9 @@ name = "basic"
 version = "0.1.0"
 edition = "2021"
 
-# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
-
 [dependencies]
-micropb = { path = "../../micropb", features = ["container-heapless"] }
+micropb = { path = "../../micropb", features = ["container-heapless-0-9"] }
+heapless = "0.9"
 
 [build-dependencies]
 micropb-gen = { path = "../../micropb-gen" }

examples/basic/src/main.rs

@@ -22,7 +22,7 @@ fn main() {
     // const CAPACITY: usize = 32;
 
     // Use heapless::Vec as the output stream and build an encoder around it
-    let mut encoder = PbEncoder::new(micropb::heapless::Vec::<u8, CAPACITY>::new());
+    let mut encoder = PbEncoder::new(heapless::Vec::<u8, CAPACITY>::new());
 
     // Compute the size of the `Example` on the wire
     let _size = example.compute_size();

examples/no-panicking/Cargo.toml

@@ -4,7 +4,8 @@ version = "0.0.0"
 edition = "2021"
 
 [dependencies]
-micropb = { path = "../../micropb", features = ["container-heapless"] }
+micropb = { path = "../../micropb", features = ["container-heapless-0-9"] }
+heapless = "0.9"
 no-panic = { version = "0.1" }
 
 [build-dependencies]

examples/no-panicking/src/main.rs

@@ -34,7 +34,7 @@ fn raw_point(raw: &[u8]) -> proto::gps_::LocationData_::Point {
 
 #[no_panic]
 fn round_trip() -> Result<(proto::gps_::LocationData, proto::gps_::LocationData), &'static str> {
-    let mut points = micropb::heapless::Vec::new();
+    let mut points = heapless::Vec::new();
     points
         .push(gps_point(proto::gps_::Gps {
             time: 165547,
@@ -57,20 +57,20 @@ fn round_trip() -> Result<(proto::gps_::LocationData, proto::gps_::LocationData)
         .unwrap();
     points.push(raw_point(b"abcdefg")).unwrap();
 
-    let mut time_to_type = micropb::heapless::FnvIndexMap::new();
+    let mut time_to_type = heapless::index_map::FnvIndexMap::new();
     // Can't unwrap these inserts, since the compiler will generate panics here
     let _ = time_to_type.insert(165547, proto::gps_::LocationData_::Type::Gps);
     let _ = time_to_type.insert(165577, proto::gps_::LocationData_::Type::Accel);
     let _ = time_to_type.insert(165578, proto::gps_::LocationData_::Type::Raw);
 
     let input_location = proto::gps_::LocationData {
         checksum: 0xDEADBEEF,
-        comment: micropb::heapless::String::try_from("nice").unwrap(),
+        comment: heapless::String::try_from("nice").unwrap(),
         points,
         time_to_type,
     };
 
-    let mut encoder = PbEncoder::new(micropb::heapless::Vec::<u8, 100>::new());
+    let mut encoder = PbEncoder::new(heapless::Vec::<u8, 100>::new());
     input_location
         .encode(&mut encoder)
         .map_err(|_| "Encode error")?;

micropb-gen/Cargo.toml

@@ -7,7 +7,7 @@ description = "Generate Rust module from Protobuf files"
 keywords = ["protobuf", "no_std", "embedded", "serialization"]
 categories = ["embedded", "no-std::no-alloc", "encoding"]
 repository = "https://github.com/YuhanLiin/micropb"
-rust-version = "1.85.0"
+rust-version = "1.88.0"
 license = "MIT OR Apache-2.0"
 
 [dependencies]
@@ -25,7 +25,8 @@ regex = { version = "1" }
 [dev-dependencies]
 syn = { version = "2", default-features = false, features = ["extra-traits"] }
 # Used for doc examples
-micropb = { version = "0.5.1", path = "../micropb", features = ["std", "container-heapless"] }
+micropb = { version = "0.5.1", path = "../micropb", features = ["std", "container-heapless-0-9"] }
+heapless = "0.9"
 
 [features]
 default = ["format", "config-file"]