Skip to content

Commit 70592bd

Browse files
burrbullburrbull
committed
rustfmt
1 parent 8491829 commit 70592bd

25 files changed

+213
-380
lines changed

‎.rustfmt.toml

Lines changed: 0 additions & 7 deletions
This file was deleted.

‎src/elementext.rs

Lines changed: 6 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,8 @@
33
44
use xmltree::Element;
55

6-
use failure::ResultExt;
76
use crate::types::{BoolParse, Parse};
7+
use failure::ResultExt;
88

99
use crate::error::*;
1010

@@ -36,9 +36,7 @@ impl ElementExt for Element {
3636
String: PartialEq<K>,
3737
{
3838
if let Some(child) = self.get_child(k) {
39-
Ok(Some(child
40-
.get_text()
41-
.map(|s| s.to_owned())?))
39+
Ok(Some(child.get_text().map(|s| s.to_owned())?))
4240
} else {
4341
Ok(None)
4442
}
@@ -48,9 +46,8 @@ impl ElementExt for Element {
4846
String: PartialEq<K>,
4947
K: core::fmt::Display + Clone,
5048
{
51-
self.get_child_text_opt(k.clone())?.ok_or(
52-
SVDErrorKind::MissingTag(self.clone(), format!("{}", k)).into(),
53-
)
49+
self.get_child_text_opt(k.clone())?
50+
.ok_or(SVDErrorKind::MissingTag(self.clone(), format!("{}", k)).into())
5451
}
5552

5653
/// Get text contained by an XML Element
@@ -60,20 +57,15 @@ impl ElementExt for Element {
6057
// FIXME: Doesn't look good because SVDErrorKind doesn't format by itself. We already
6158
// capture the element and this information can be used for getting the name
6259
// This would fix ParseError
63-
None => Err(SVDErrorKind::EmptyTag(
64-
self.clone(),
65-
self.name.clone(),
66-
).into()),
60+
None => Err(SVDErrorKind::EmptyTag(self.clone(), self.name.clone()).into()),
6761
}
6862
}
6963

7064
/// Get a named child element from an XML Element
7165
fn get_child_elem<'a>(&'a self, n: &str) -> Result<&'a Element, SVDError> {
7266
match self.get_child(n) {
7367
Some(s) => Ok(s),
74-
None => Err(
75-
SVDErrorKind::MissingTag(self.clone(), n.to_string()).into(),
76-
),
68+
None => Err(SVDErrorKind::MissingTag(self.clone(), n.to_string()).into()),
7769
}
7870
}
7971

‎src/error.rs

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
//! SVD Errors.
22
//! This module defines error types and messages for SVD parsing and encoding
33
4-
use failure::{Backtrace, Context, Fail};
54
use core::fmt::{self, Display};
5+
use failure::{Backtrace, Context, Fail};
66
use xmltree::{Element, ParseError};
77

88
#[derive(Debug)]
@@ -47,8 +47,7 @@ pub enum SVDErrorKind {
4747
InvalidModifiedWriteValues(Element, String),
4848
#[fail(
4949
display = "The content of the element could not be parsed to a boolean value {}: {}",
50-
_1,
51-
_2
50+
_1, _2
5251
)]
5352
InvalidBooleanValue(Element, String, core::str::ParseBoolError),
5453
#[fail(display = "encoding method not implemented for svd object {}", _0)]

‎src/lib.rs

Lines changed: 8 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -93,30 +93,27 @@ pub(crate) fn new_element(name: &str, text: Option<String>) -> Element {
9393
#[cfg(test)]
9494
#[cfg(feature = "unproven")]
9595
pub fn run_test<
96-
T: Parse<Error = SVDError, Object = T>
97-
+ Encode<Error = SVDError>
98-
+ core::fmt::Debug
99-
+ PartialEq,
96+
T: Parse<Error = SVDError, Object = T> + Encode<Error = SVDError> + core::fmt::Debug + PartialEq,
10097
>(
10198
tests: &[(T, &str)],
10299
) {
103100
for t in tests {
104101
let mut tree1 = Element::parse(t.1.as_bytes()).unwrap();
105102
let elem = T::parse(&tree1).unwrap();
106103
// Hack to make assert be order agnostic
107-
tree1.children.sort_by(|e1,e2| e1.name.cmp(&e2.name));
108-
tree1.children.iter_mut().for_each(|e| {
109-
e.children.sort_by(|e1,e2| e1.name.cmp(&e2.name));
104+
tree1.children.sort_by(|e1, e2| e1.name.cmp(&e2.name));
105+
tree1.children.iter_mut().for_each(|e| {
106+
e.children.sort_by(|e1, e2| e1.name.cmp(&e2.name));
110107
});
111108
assert_eq!(
112109
elem, t.0,
113110
"Error parsing xml` (mismatch between parsed and expected)"
114111
);
115-
let mut tree2 = elem.encode().unwrap();
112+
let mut tree2 = elem.encode().unwrap();
116113
// Hack to make assert be order agnostic
117-
tree2.children.sort_by(|e1,e2| e1.name.cmp(&e2.name));
118-
tree2.children.iter_mut().for_each(|e| {
119-
e.children.sort_by(|e1,e2| e1.name.cmp(&e2.name));
114+
tree2.children.sort_by(|e1, e2| e1.name.cmp(&e2.name));
115+
tree2.children.iter_mut().for_each(|e| {
116+
e.children.sort_by(|e1, e2| e1.name.cmp(&e2.name));
120117
});
121118
assert_eq!(
122119
tree1, tree2,

‎src/parse.rs

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -18,10 +18,7 @@ pub trait Parse {
1818
/// Parses an optional child element with the provided name and Parse function
1919
/// Returns an none if the child doesn't exist, Ok(Some(e)) if parsing succeeds,
2020
/// and Err() if parsing fails.
21-
pub fn optional<'a, T>(
22-
n: &str,
23-
e: &'a Element,
24-
) -> Result<Option<T::Object>, SVDError>
21+
pub fn optional<'a, T>(n: &str, e: &'a Element) -> Result<Option<T::Object>, SVDError>
2522
where
2623
T: Parse<Error = SVDError>,
2724
{

‎src/svd/access.rs

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -64,10 +64,7 @@ mod tests {
6464
let tests = vec![
6565
(Access::ReadOnly, "<access>read-only</access>"),
6666
(Access::ReadWrite, "<access>read-write</access>"),
67-
(
68-
Access::ReadWriteOnce,
69-
"<access>read-writeOnce</access>",
70-
),
67+
(Access::ReadWriteOnce, "<access>read-writeOnce</access>"),
7168
(Access::WriteOnly, "<access>write-only</access>"),
7269
(Access::WriteOnce, "<access>writeOnce</access>"),
7370
];

‎src/svd/bitrange.rs

Lines changed: 24 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -27,9 +27,7 @@ impl Parse for BitRange {
2727
type Error = SVDError;
2828

2929
fn parse(tree: &Element) -> Result<BitRange, SVDError> {
30-
let (end, start, range_type): (u32, u32, BitRangeType) = if let Some(
31-
range,
32-
) =
30+
let (end, start, range_type): (u32, u32, BitRangeType) = if let Some(range) =
3331
tree.get_child("bitRange")
3432
{
3533
let text = range
@@ -39,16 +37,14 @@ impl Parse for BitRange {
3937
// TODO: If the `InvalidBitRange` enum was an error we could context into here somehow so that
4038
// the output would be similar to the parse error
4139
if !text.starts_with('[') {
42-
return Err(SVDErrorKind::InvalidBitRange(
43-
tree.clone(),
44-
InvalidBitRange::Syntax,
45-
).into()); // TODO: Maybe have a MissingOpen/MissingClosing variant
40+
return Err(
41+
SVDErrorKind::InvalidBitRange(tree.clone(), InvalidBitRange::Syntax).into(),
42+
); // TODO: Maybe have a MissingOpen/MissingClosing variant
4643
}
4744
if !text.ends_with(']') {
48-
return Err(SVDErrorKind::InvalidBitRange(
49-
tree.clone(),
50-
InvalidBitRange::Syntax,
51-
).into()); // TODO: Maybe have a MissingOpen/MissingClosing variant
45+
return Err(
46+
SVDErrorKind::InvalidBitRange(tree.clone(), InvalidBitRange::Syntax).into(),
47+
); // TODO: Maybe have a MissingOpen/MissingClosing variant
5248
}
5349

5450
let mut parts = text[1..text.len() - 1].split(':');
@@ -78,9 +74,7 @@ impl Parse for BitRange {
7874
BitRangeType::BitRange,
7975
)
8076
// TODO: Consider matching instead so we can say which of these tags are missing
81-
} else if let (Some(lsb), Some(msb)) =
82-
(tree.get_child("lsb"), tree.get_child("msb"))
83-
{
77+
} else if let (Some(lsb), Some(msb)) = (tree.get_child("lsb"), tree.get_child("msb")) {
8478
(
8579
// TODO: `u32::parse` should not hide it's errors
8680
u32::parse(msb).context(SVDErrorKind::InvalidBitRange(
@@ -93,26 +87,30 @@ impl Parse for BitRange {
9387
))?,
9488
BitRangeType::MsbLsb,
9589
)
96-
} else if let (Some(offset), Some(width)) = (
97-
tree.get_child("bitOffset"),
98-
tree.get_child("bitWidth"),
99-
) {
90+
} else if let (Some(offset), Some(width)) =
91+
(tree.get_child("bitOffset"), tree.get_child("bitWidth"))
92+
{
10093
(
10194
// Special case because offset and width are directly provided
10295
// (ie. do not need to be calculated as in the final step)
10396
return Ok(BitRange {
10497
// TODO: capture that error comes from offset/width tag
10598
// TODO: `u32::parse` should not hide it's errors
106-
offset: u32::parse(offset).context(SVDErrorKind::InvalidBitRange(tree.clone(), InvalidBitRange::ParseError))?,
107-
width: u32::parse(width).context(SVDErrorKind::InvalidBitRange(tree.clone(), InvalidBitRange::ParseError))?,
108-
range_type: BitRangeType::OffsetWidth
99+
offset: u32::parse(offset).context(SVDErrorKind::InvalidBitRange(
100+
tree.clone(),
101+
InvalidBitRange::ParseError,
102+
))?,
103+
width: u32::parse(width).context(SVDErrorKind::InvalidBitRange(
104+
tree.clone(),
105+
InvalidBitRange::ParseError,
106+
))?,
107+
range_type: BitRangeType::OffsetWidth,
109108
})
110109
)
111110
} else {
112-
return Err(SVDErrorKind::InvalidBitRange(
113-
tree.clone(),
114-
InvalidBitRange::Syntax,
115-
).into());
111+
return Err(
112+
SVDErrorKind::InvalidBitRange(tree.clone(), InvalidBitRange::Syntax).into(),
113+
);
116114
};
117115

118116
Ok(BitRange {
@@ -137,10 +135,7 @@ impl BitRange {
137135
)]),
138136
BitRangeType::MsbLsb => Ok(vec![
139137
new_element("lsb", Some(format!("{}", self.offset))),
140-
new_element(
141-
"msb",
142-
Some(format!("{}", self.offset + self.width - 1)),
143-
),
138+
new_element("msb", Some(format!("{}", self.offset + self.width - 1))),
144139
]),
145140
BitRangeType::OffsetWidth => Ok(vec![
146141
new_element("bitOffset", Some(format!("{}", self.offset))),

‎src/svd/cluster.rs

Lines changed: 2 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -8,10 +8,7 @@ use crate::elementext::ElementExt;
88
#[cfg(feature = "unproven")]
99
use crate::encode::Encode;
1010
use crate::error::*;
11-
use crate::svd::{
12-
clusterinfo::ClusterInfo,
13-
registerclusterarrayinfo::RegisterClusterArrayInfo,
14-
};
11+
use crate::svd::{clusterinfo::ClusterInfo, registerclusterarrayinfo::RegisterClusterArrayInfo};
1512

1613
#[cfg_attr(feature = "serde", derive(serde::Deserialize, serde::Serialize))]
1714
#[derive(Clone, Debug, PartialEq)]
@@ -70,9 +67,7 @@ impl Encode for Cluster {
7067
// TODO: support Cluster encoding
7168
fn encode(&self) -> Result<Element, SVDError> {
7269
match self {
73-
Cluster::Single(i) => {
74-
i.encode()
75-
}
70+
Cluster::Single(i) => i.encode(),
7671
Cluster::Array(i, a) => {
7772
let mut e = i.encode()?;
7873
e = e.merge(&a.encode()?);

‎src/svd/clusterinfo.rs

Lines changed: 9 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -9,10 +9,7 @@ use crate::encode::{Encode, EncodeChildren};
99
use crate::new_element;
1010

1111
use crate::error::SVDError;
12-
use crate::svd::{
13-
registercluster::RegisterCluster,
14-
registerproperties::RegisterProperties,
15-
};
12+
use crate::svd::{registercluster::RegisterCluster, registerproperties::RegisterProperties};
1613

1714
#[cfg_attr(feature = "serde", derive(serde::Deserialize, serde::Serialize))]
1815
#[derive(Clone, Debug, PartialEq)]
@@ -41,7 +38,8 @@ impl Parse for ClusterInfo {
4138
address_offset: tree.get_child_u32("addressOffset")?,
4239
default_register_properties: RegisterProperties::parse(tree)?,
4340
children: {
44-
let children: Result<Vec<_>, _> = tree.children
41+
let children: Result<Vec<_>, _> = tree
42+
.children
4543
.iter()
4644
.filter(|t| t.name == "register" || t.name == "cluster")
4745
.map(RegisterCluster::parse)
@@ -60,13 +58,12 @@ impl Encode for ClusterInfo {
6058
let mut e = new_element("cluster", None);
6159

6260
if let Some(v) = &self.derived_from {
63-
e.attributes.insert(String::from("derivedFrom"), format!("{}", v));
61+
e.attributes
62+
.insert(String::from("derivedFrom"), format!("{}", v));
6463
}
6564

66-
e.children.push(new_element(
67-
"description",
68-
Some(self.description.clone()),
69-
));
65+
e.children
66+
.push(new_element("description", Some(self.description.clone())));
7067

7168
if let Some(v) = &self.header_struct_name {
7269
e.children
@@ -78,7 +75,8 @@ impl Encode for ClusterInfo {
7875
Some(format!("{}", self.address_offset)),
7976
));
8077

81-
e.children.extend(self.default_register_properties.encode()?);
78+
e.children
79+
.extend(self.default_register_properties.encode()?);
8280

8381
for c in &self.children {
8482
e.children.push(c.encode()?);

‎src/svd/cpu.rs

Lines changed: 3 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -64,18 +64,9 @@ impl Encode for Cpu {
6464
new_element("name", Some(self.name.clone())),
6565
new_element("revision", Some(self.revision.clone())),
6666
self.endian.encode()?,
67-
new_element(
68-
"mpuPresent",
69-
Some(format!("{}", self.mpu_present)),
70-
),
71-
new_element(
72-
"fpuPresent",
73-
Some(format!("{}", self.fpu_present)),
74-
),
75-
new_element(
76-
"nvicPrioBits",
77-
Some(format!("{}", self.nvic_priority_bits)),
78-
),
67+
new_element("mpuPresent", Some(format!("{}", self.mpu_present))),
68+
new_element("fpuPresent", Some(format!("{}", self.fpu_present))),
69+
new_element("nvicPrioBits", Some(format!("{}", self.nvic_priority_bits))),
7970
new_element(
8071
"vendorSystickConfig",
8172
Some(format!("{}", self.has_vendor_systick)),

0 commit comments

Comments
 (0)