Skip to content

Add support for arrays > 32 in Rust [GV2-74] #1174

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Jun 27, 2022
Merged

Add support for arrays > 32 in Rust [GV2-74] #1174

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 5 additions & 1 deletion generator/sbpg/targets/resources/rust/sbp_cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ readme = "../../README.md"
[features]
default = []
async = ["futures", "dencode/async"]
json = ["serde", "serde_json", "base64"]
json = ["serde", "serde_json", "serde-big-array", "base64"]
link = ["slotmap"]

[lib]
Expand Down Expand Up @@ -48,6 +48,10 @@ optional = true
version = "1.0"
optional = true

[dependencies.serde-big-array]
version = "0.4.1"
optional = true

[dependencies.base64]
version = "0.13"
optional = true
Expand Down
3 changes: 3 additions & 0 deletions generator/sbpg/targets/resources/rust/sbp_messages_mod.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,9 @@ mod lib {

pub use bytes::{Buf, BufMut};

#[cfg(feature = "serde")]
pub use serde_big_array::BigArray;

macro_rules! get_bit_range {
($bitrange:expr, $source_ty:ty, $target_ty:ty, $msb:expr, $lsb:expr) => {{
let source_bit_len = std::mem::size_of::<$source_ty>() * 8;
Expand Down
5 changes: 5 additions & 0 deletions generator/sbpg/targets/resources/rust/sbp_messages_template.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,12 @@ pub struct (((m.msg_name))) {
((*- if f.desc *))
/// (((f.desc | commentify(indent=2) )))
((*- endif *))
((*- if f.type_id == "array" and "size" in f.options and f.options["size"].value >= 32 *))
#[cfg_attr(feature = "serde", serde(with="BigArray", rename(serialize = "(((f.identifier)))")))]
((*- else *))
#[cfg_attr(feature = "serde", serde(rename(serialize = "(((f.identifier)))")))]
((*- endif *))

pub (((f.field_name))): (((f.type))),
((*- endfor *))
}
Expand Down
6 changes: 5 additions & 1 deletion rust/sbp/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ readme = "../../README.md"
[features]
default = []
async = ["futures", "dencode/async"]
json = ["serde", "serde_json", "base64"]
json = ["serde", "serde_json", "serde-big-array", "base64"]
link = ["slotmap"]

[lib]
Expand Down Expand Up @@ -48,6 +48,10 @@ optional = true
version = "1.0"
optional = true

[dependencies.serde-big-array]
version = "0.4.1"
optional = true

[dependencies.base64]
version = "0.13"
optional = true
Expand Down
3 changes: 3 additions & 0 deletions rust/sbp/src/messages/mod.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -270,6 +270,9 @@ mod lib {

pub use bytes::{Buf, BufMut};

#[cfg(feature = "serde")]
pub use serde_big_array::BigArray;

macro_rules! get_bit_range {
($bitrange:expr, $source_ty:ty, $target_ty:ty, $msb:expr, $lsb:expr) => {{
let source_bit_len = std::mem::size_of::<$source_ty>() * 8;
Expand Down