short serde derive

Author: burrbull

CHANGELOG.md

@@ -11,6 +11,7 @@ and this project adheres to [Semantic Versioning](http://semver.org/).
   and added into `Peripheral` and `ClusterInfo`
 - Updated dependencies, use `Edition 2018`
 - Added missing `zeroToToggle`
+- Added serializing/deserializing with `serde`
 
 ## [v0.7.0] - 2019-01-11
 

Cargo.toml

@@ -11,7 +11,6 @@ version = "0.7.0"
 
 [features]
 unproven = []
-serde_svd = ["serde"]
 
 [dependencies]
 either = "1.5"

src/svd/access.rs

@@ -8,10 +8,7 @@ use crate::error::*;
 use crate::new_element;
 use crate::types::Parse;
 
-#[cfg(feature = "serde_svd")]
-use super::serde::{ Deserialize, Serialize };
-
-#[cfg_attr(feature = "serde_svd", derive(Deserialize, Serialize))]
+#[cfg_attr(feature = "serde", derive(serde::Deserialize, serde::Serialize))]
 #[derive(Clone, Copy, Debug, PartialEq)]
 pub enum Access {
     ReadOnly,

src/svd/addressblock.rs

@@ -12,10 +12,7 @@ use crate::error::SVDError;
 #[cfg(feature = "unproven")]
 use crate::new_element;
 
-#[cfg(feature = "serde_svd")]
-use super::serde::{ Deserialize, Serialize };
-
-#[cfg_attr(feature = "serde_svd", derive(Deserialize, Serialize))]
+#[cfg_attr(feature = "serde", derive(serde::Deserialize, serde::Serialize))]
 #[derive(Clone, Debug, PartialEq)]
 pub struct AddressBlock {
     pub offset: u32,

src/svd/bitrange.rs

@@ -6,18 +6,15 @@ use crate::error::*;
 use crate::new_element;
 use crate::types::Parse;
 
-#[cfg(feature = "serde_svd")]
-use super::serde::{ Deserialize, Serialize };
-
-#[cfg_attr(feature = "serde_svd", derive(Deserialize, Serialize))]
+#[cfg_attr(feature = "serde", derive(serde::Deserialize, serde::Serialize))]
 #[derive(Clone, Copy, Debug, PartialEq)]
 pub struct BitRange {
     pub offset: u32,
     pub width: u32,
     pub range_type: BitRangeType,
 }
 
-#[cfg_attr(feature = "serde_svd", derive(Deserialize, Serialize))]
+#[cfg_attr(feature = "serde", derive(serde::Deserialize, serde::Serialize))]
 #[derive(Clone, Copy, Debug, PartialEq)]
 pub enum BitRangeType {
     BitRange,

src/svd/cluster.rs

@@ -13,10 +13,7 @@ use crate::svd::{
     registerclusterarrayinfo::RegisterClusterArrayInfo,
 };
 
-#[cfg(feature = "serde_svd")]
-use super::serde::{ Deserialize, Serialize };
-
-#[cfg_attr(feature = "serde_svd", derive(Deserialize, Serialize))]
+#[cfg_attr(feature = "serde", derive(serde::Deserialize, serde::Serialize))]
 #[derive(Clone, Debug, PartialEq)]
 pub enum Cluster {
     Single(ClusterInfo),

src/svd/clusterinfo.rs

@@ -14,10 +14,7 @@ use crate::svd::{
     registerproperties::RegisterProperties,
 };
 
-#[cfg(feature = "serde_svd")]
-use super::serde::{ Deserialize, Serialize };
-
-#[cfg_attr(feature = "serde_svd", derive(Deserialize, Serialize))]
+#[cfg_attr(feature = "serde", derive(serde::Deserialize, serde::Serialize))]
 #[derive(Clone, Debug, PartialEq)]
 pub struct ClusterInfo {
     pub name: String,

src/svd/cpu.rs

@@ -12,10 +12,7 @@ use crate::new_element;
 use crate::svd::endian::Endian;
 use crate::types::Parse;
 
-#[cfg(feature = "serde_svd")]
-use super::serde::{ Deserialize, Serialize };
-
-#[cfg_attr(feature = "serde_svd", derive(Deserialize, Serialize))]
+#[cfg_attr(feature = "serde", derive(serde::Deserialize, serde::Serialize))]
 #[derive(Clone, Debug, PartialEq)]
 pub struct Cpu {
     pub name: String,

src/svd/device.rs

@@ -17,10 +17,7 @@ use crate::svd::{
     peripheral::Peripheral,
 };
 
-#[cfg(feature = "serde_svd")]
-use super::serde::{ Deserialize, Serialize };
-
-#[cfg_attr(feature = "serde_svd", derive(Deserialize, Serialize))]
+#[cfg_attr(feature = "serde", derive(serde::Deserialize, serde::Serialize))]
 #[derive(Clone, Debug)]
 pub struct Device {
     pub name: String,

src/svd/endian.rs

@@ -10,10 +10,7 @@ use crate::types::Parse;
 
 use crate::error::*;
 
-#[cfg(feature = "serde_svd")]
-use super::serde::{ Deserialize, Serialize };
-
-#[cfg_attr(feature = "serde_svd", derive(Deserialize, Serialize))]
+#[cfg_attr(feature = "serde", derive(serde::Deserialize, serde::Serialize))]
 #[derive(Clone, Copy, Debug, PartialEq)]
 pub enum Endian {
     Little,