Skip to content

Commit e774b98

Browse files
bors[bot]lucabEmilgardis
authored
Merge #216
216: svd-encoder: fix device node 'headerDefinitionsPrefix' r=burrbull a=lucab This fixes a typo when encoding the `headerDefinitionsPrefix` node in a device, which otherwise results in an invalid XML generated by `svdtools patch`: ``` $ xmllint --schema svd/cmsis-svd.xsd --noout svd/lpc1342.svd.patched svd/lpc1342.svd.patched:15: element header_definitions_prefix: Schemas validity error : Element 'header_definitions_prefix': This element is not expected. Expected is one of ( headerSystemFilename, headerDefinitionsPrefix, addressUnitBits ) ``` Ref: lpc-rs/lpc-pac#77 Co-authored-by: Luca BRUNO <lucab@lucabruno.net> Co-authored-by: Emil Gardström <emil.gardstrom@gmail.com>
2 parents 1345326 + e26b068 commit e774b98

File tree

3 files changed

+3
-2
lines changed

3 files changed

+3
-2
lines changed

svd-encoder/src/device.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ impl Encode for Device {
4141

4242
if let Some(v) = &self.header_definitions_prefix {
4343
elem.children
44-
.push(new_node("header_definitions_prefix", v.clone()));
44+
.push(new_node("headerDefinitionsPrefix", v.clone()));
4545
}
4646

4747
elem.children.push(new_node(

svd-parser/src/expand.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -259,7 +259,7 @@ impl<'a> Index<'a> {
259259
fn add_field(&mut self, path: &RegisterPath, f: &'a Field) {
260260
if let Field::Array(info, dim) = f {
261261
for name in names(info, dim) {
262-
let fpath = path.new_field(&name);
262+
let fpath = path.new_field(name);
263263
for evs in &f.enumerated_values {
264264
if let Some(name) = evs.name.as_ref() {
265265
self.evs.insert(fpath.new_enum(name), evs);

svd-rs/src/registercluster.rs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@ use super::{Cluster, Register};
77
serde(rename_all = "lowercase")
88
)]
99
#[derive(Clone, Debug, PartialEq)]
10+
#[allow(clippy::large_enum_variant)]
1011
pub enum RegisterCluster {
1112
/// Register
1213
Register(Register),

0 commit comments

Comments
 (0)