Skip to content

Commit da9aa2c

Browse files
committed
Auto merge of #42 - brandonedens:optional-header-struct-name, r=japaric
Optional header struct name The tag headerStructName is optional. Adjust SVD to account for that. Bump version of SVD due to incompatible changes surrounding usage of Either<>
2 parents 53f2510 + 4cd4094 commit da9aa2c

File tree

2 files changed

+3
-3
lines changed

2 files changed

+3
-3
lines changed

Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ keywords = ["CMSIS", "SVD", "parser"]
66
license = "MIT OR Apache-2.0"
77
name = "svd-parser"
88
repository = "https://github.com/japaric/svd"
9-
version = "0.5.2"
9+
version = "0.6.0"
1010

1111
[dependencies]
1212
either = "1.1.0"

src/lib.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -225,7 +225,7 @@ impl Interrupt {
225225
pub struct ClusterInfo {
226226
pub name: String,
227227
pub description: String,
228-
pub header_struct_name: String,
228+
pub header_struct_name: Option<String>,
229229
pub address_offset: u32,
230230
pub size: Option<u32>,
231231
pub access: Option<Access>,
@@ -327,7 +327,7 @@ impl ClusterInfo {
327327
ClusterInfo {
328328
name: try!(tree.get_child_text("name")),
329329
description: try!(tree.get_child_text("description")),
330-
header_struct_name: try!(tree.get_child_text("headerStructName")),
330+
header_struct_name: tree.get_child_text("headerStructName"),
331331
address_offset: {
332332
try!(parse::u32(try!(tree.get_child("addressOffset"))))
333333
},

0 commit comments

Comments
 (0)