Skip to content

common serde helpers for arrays #173

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
bors merged 2 commits into from
Nov 10, 2021
Merged

common serde helpers for arrays #173

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
b6ed0c0
more info.array(dim)
burrbull Nov 10, 2021
556faf5
common serde helpers for arrays
burrbull Nov 10, 2021
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
1 change: 1 addition & 0 deletions svd-rs/CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@ and this project adheres to [Semantic Versioning](http://semver.org/).

## Unreleased

- Don't clone when serialize
- Add optional entries to `Cpu`
- `AddressBlock` now uses builder
- Add `dim_name` and `dim_array_index` to `DimElement`
Expand Down
20 changes: 3 additions & 17 deletions svd-rs/src/cluster.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,31 +45,17 @@ impl Cluster {
#[cfg(feature = "serde")]
mod ser_de {
use super::*;
use crate::{DeserArray, SerArray};
use serde::{Deserialize, Deserializer, Serialize, Serializer};

#[derive(serde::Deserialize, serde::Serialize)]
struct ClusterArray {
#[cfg_attr(
feature = "serde",
serde(flatten, default, skip_serializing_if = "Option::is_none")
)]
dim: Option<DimElement>,
#[cfg_attr(feature = "serde", serde(flatten))]
info: ClusterInfo,
}

impl Serialize for Cluster {
fn serialize<S>(&self, serializer: S) -> Result<S::Ok, S::Error>
where
S: Serializer,
{
match self {
Self::Single(info) => info.serialize(serializer),
Self::Array(info, dim) => ClusterArray {
dim: Some(dim.clone()),
info: info.clone(),
}
.serialize(serializer),
Self::Array(info, dim) => SerArray { dim, info }.serialize(serializer),
}
}
}
Expand All @@ -79,7 +65,7 @@ mod ser_de {
where
D: Deserializer<'de>,
{
let ClusterArray { dim, info } = ClusterArray::deserialize(deserializer)?;
let DeserArray { dim, info } = DeserArray::<ClusterInfo>::deserialize(deserializer)?;
if let Some(dim) = dim {
Ok(info.array(dim))
} else {
Expand Down
32 changes: 12 additions & 20 deletions svd-rs/src/derive_from.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -110,17 +110,15 @@ impl DeriveFrom for FieldInfo {
impl DeriveFrom for Peripheral {
fn derive_from(&self, other: &Self) -> Self {
match (self, other) {
(Self::Single(info), Self::Single(other_info)) => {
Self::Single(info.derive_from(other_info))
}
(Self::Single(info), Self::Single(other_info)) => info.derive_from(other_info).single(),
(Self::Single(info), Self::Array(other_info, other_dim)) => {
let mut dim = other_dim.clone();
dim.dim_name = None;
Self::Array(info.derive_from(other_info), dim)
info.derive_from(other_info).array(dim)
}
(Self::Array(info, dim), Self::Single(other_info))
| (Self::Array(info, dim), Self::Array(other_info, _)) => {
Self::Array(info.derive_from(other_info), dim.clone())
info.derive_from(other_info).array(dim.clone())
}
}
}
Expand All @@ -129,17 +127,15 @@ impl DeriveFrom for Peripheral {
impl DeriveFrom for Cluster {
fn derive_from(&self, other: &Self) -> Self {
match (self, other) {
(Self::Single(info), Self::Single(other_info)) => {
Self::Single(info.derive_from(other_info))
}
(Self::Single(info), Self::Single(other_info)) => info.derive_from(other_info).single(),
(Self::Single(info), Self::Array(other_info, other_dim)) => {
let mut dim = other_dim.clone();
dim.dim_name = None;
Self::Array(info.derive_from(other_info), dim)
info.derive_from(other_info).array(dim)
}
(Self::Array(info, dim), Self::Single(other_info))
| (Self::Array(info, dim), Self::Array(other_info, _)) => {
Self::Array(info.derive_from(other_info), dim.clone())
info.derive_from(other_info).array(dim.clone())
}
}
}
Expand All @@ -148,17 +144,15 @@ impl DeriveFrom for Cluster {
impl DeriveFrom for Register {
fn derive_from(&self, other: &Self) -> Self {
match (self, other) {
(Self::Single(info), Self::Single(other_info)) => {
Self::Single(info.derive_from(other_info))
}
(Self::Single(info), Self::Single(other_info)) => info.derive_from(other_info).single(),
(Self::Single(info), Self::Array(other_info, other_dim)) => {
let mut dim = other_dim.clone();
dim.dim_name = None;
Self::Array(info.derive_from(other_info), dim)
info.derive_from(other_info).array(dim)
}
(Self::Array(info, dim), Self::Single(other_info))
| (Self::Array(info, dim), Self::Array(other_info, _)) => {
Self::Array(info.derive_from(other_info), dim.clone())
info.derive_from(other_info).array(dim.clone())
}
}
}
Expand All @@ -167,17 +161,15 @@ impl DeriveFrom for Register {
impl DeriveFrom for Field {
fn derive_from(&self, other: &Self) -> Self {
match (self, other) {
(Self::Single(info), Self::Single(other_info)) => {
Self::Single(info.derive_from(other_info))
}
(Self::Single(info), Self::Single(other_info)) => info.derive_from(other_info).single(),
(Self::Single(info), Self::Array(other_info, other_dim)) => {
let mut dim = other_dim.clone();
dim.dim_name = None;
Self::Array(info.derive_from(other_info), dim)
info.derive_from(other_info).array(dim)
}
(Self::Array(info, dim), Self::Single(other_info))
| (Self::Array(info, dim), Self::Array(other_info, _)) => {
Self::Array(info.derive_from(other_info), dim.clone())
info.derive_from(other_info).array(dim.clone())
}
}
}
Expand Down
20 changes: 3 additions & 17 deletions svd-rs/src/field.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,31 +44,17 @@ impl Field {
#[cfg(feature = "serde")]
mod ser_de {
use super::*;
use crate::{DeserArray, SerArray};
use serde::{Deserialize, Deserializer, Serialize, Serializer};

#[derive(serde::Deserialize, serde::Serialize)]
struct FieldArray {
#[cfg_attr(
feature = "serde",
serde(flatten, default, skip_serializing_if = "Option::is_none")
)]
dim: Option<DimElement>,
#[cfg_attr(feature = "serde", serde(flatten))]
info: FieldInfo,
}

impl Serialize for Field {
fn serialize<S>(&self, serializer: S) -> Result<S::Ok, S::Error>
where
S: Serializer,
{
match self {
Self::Single(info) => info.serialize(serializer),
Self::Array(info, dim) => FieldArray {
dim: Some(dim.clone()),
info: info.clone(),
}
.serialize(serializer),
Self::Array(info, dim) => SerArray { dim, info }.serialize(serializer),
}
}
}
Expand All @@ -78,7 +64,7 @@ mod ser_de {
where
D: Deserializer<'de>,
{
let FieldArray { dim, info } = FieldArray::deserialize(deserializer)?;
let DeserArray { dim, info } = DeserArray::<FieldInfo>::deserialize(deserializer)?;
if let Some(dim) = dim {
Ok(info.array(dim))
} else {
Expand Down
18 changes: 18 additions & 0 deletions svd-rs/src/lib.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -238,3 +238,21 @@ impl<T> EmptyToNone for Option<Vec<T>> {
self.and_then(|v| if v.is_empty() { None } else { Some(v) })
}
}

#[cfg(feature = "serde")]
#[derive(serde::Serialize)]
struct SerArray<'a, T> {
#[serde(flatten)]
dim: &'a DimElement,
#[serde(flatten)]
info: &'a T,
}

#[cfg(feature = "serde")]
#[derive(serde::Deserialize)]
struct DeserArray<T> {
#[serde(flatten, default)]
dim: Option<DimElement>,
#[serde(flatten)]
info: T,
}
20 changes: 3 additions & 17 deletions svd-rs/src/peripheral.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,31 +45,17 @@ impl Peripheral {
#[cfg(feature = "serde")]
mod ser_de {
use super::*;
use crate::{DeserArray, SerArray};
use serde::{Deserialize, Deserializer, Serialize, Serializer};

#[derive(serde::Deserialize, serde::Serialize)]
struct PeripheralArray {
#[cfg_attr(
feature = "serde",
serde(flatten, default, skip_serializing_if = "Option::is_none")
)]
dim: Option<DimElement>,
#[cfg_attr(feature = "serde", serde(flatten))]
info: PeripheralInfo,
}

impl Serialize for Peripheral {
fn serialize<S>(&self, serializer: S) -> Result<S::Ok, S::Error>
where
S: Serializer,
{
match self {
Self::Single(info) => info.serialize(serializer),
Self::Array(info, dim) => PeripheralArray {
dim: Some(dim.clone()),
info: info.clone(),
}
.serialize(serializer),
Self::Array(info, dim) => SerArray { dim, info }.serialize(serializer),
}
}
}
Expand All @@ -79,7 +65,7 @@ mod ser_de {
where
D: Deserializer<'de>,
{
let PeripheralArray { dim, info } = PeripheralArray::deserialize(deserializer)?;
let DeserArray { dim, info } = DeserArray::<PeripheralInfo>::deserialize(deserializer)?;
if let Some(dim) = dim {
Ok(info.array(dim))
} else {
Expand Down
20 changes: 3 additions & 17 deletions svd-rs/src/register.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -93,31 +93,17 @@ impl<'a> std::iter::Iterator for RegIterMut<'a> {
#[cfg(feature = "serde")]
mod ser_de {
use super::*;
use crate::{DeserArray, SerArray};
use serde::{Deserialize, Deserializer, Serialize, Serializer};

#[derive(serde::Deserialize, serde::Serialize)]
struct RegisterArray {
#[cfg_attr(
feature = "serde",
serde(flatten, default, skip_serializing_if = "Option::is_none")
)]
dim: Option<DimElement>,
#[cfg_attr(feature = "serde", serde(flatten))]
info: RegisterInfo,
}

impl Serialize for Register {
fn serialize<S>(&self, serializer: S) -> Result<S::Ok, S::Error>
where
S: Serializer,
{
match self {
Self::Single(info) => info.serialize(serializer),
Self::Array(info, dim) => RegisterArray {
dim: Some(dim.clone()),
info: info.clone(),
}
.serialize(serializer),
Self::Array(info, dim) => SerArray { dim, info }.serialize(serializer),
}
}
}
Expand All @@ -127,7 +113,7 @@ mod ser_de {
where
D: Deserializer<'de>,
{
let RegisterArray { dim, info } = RegisterArray::deserialize(deserializer)?;
let DeserArray { dim, info } = DeserArray::<RegisterInfo>::deserialize(deserializer)?;
if let Some(dim) = dim {
Ok(info.array(dim))
} else {
Expand Down