Skip to content

Commit 8216980

Browse files
bors[bot]burrbull
andauthored
Merge #571
571: update svd-parser r=adamgreig a=burrbull Co-authored-by: Andrey Zgarbul <[email protected]>
2 parents adbed49 + c2c5c8a commit 8216980

File tree

3 files changed

+12
-8
lines changed

3 files changed

+12
-8
lines changed

CHANGELOG.md

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,11 +7,15 @@ and this project adheres to [Semantic Versioning](http://semver.org/).
77

88
## [Unreleased]
99

10+
### Changed
11+
12+
- Use `svd-parser` v0.13.1
13+
- Replace suffix in fields' name before converting to snake case when generating methods #563
14+
1015
### Fixed
1116

12-
- Don't cast if field same type as register
17+
- Fix ValidateLevel usage in lib.rs
1318
- Parenthesizing `#offset_calc` to avoid clippy's warning of operator precedence
14-
- Replace suffix in fields' name before converting to snake case when generating methods #563
1519

1620
### Changed
1721

Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ thiserror = "1.0"
4848

4949
[dependencies.svd-parser]
5050
features = ["derive-from"]
51-
version = "0.12"
51+
version = "0.13.1"
5252

5353
[dependencies.syn]
5454
version = "1.0"

src/generate/register.rs

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -50,8 +50,8 @@ pub fn render(
5050
let mut w_impl_items = TokenStream::new();
5151
let mut methods = vec![];
5252

53-
let can_read = [Access::ReadOnly, Access::ReadWriteOnce, Access::ReadWrite].contains(&access);
54-
let can_write = access != Access::ReadOnly;
53+
let can_read = access.can_read();
54+
let can_write = access.can_write();
5555
let can_reset = properties.reset_value.is_some();
5656

5757
if can_read {
@@ -297,8 +297,8 @@ pub fn fields(
297297
config: &Config,
298298
) -> Result<()> {
299299
let span = Span::call_site();
300-
let can_read = [Access::ReadOnly, Access::ReadWriteOnce, Access::ReadWrite].contains(&access);
301-
let can_write = access != Access::ReadOnly;
300+
let can_read = access.can_read();
301+
let can_write = access.can_write();
302302

303303
// TODO enumeratedValues
304304
let inline = quote! { #[inline(always)] };
@@ -1267,7 +1267,7 @@ fn lookup_in_peripherals<'p>(
12671267
all_peripherals: &'p [Peripheral],
12681268
) -> Result<(&'p EnumeratedValues, Option<Base<'p>>)> {
12691269
if let Some(peripheral) = all_peripherals.iter().find(|p| p.name == base_peripheral) {
1270-
let all_registers = peripheral.reg_iter().collect::<Vec<_>>();
1270+
let all_registers = peripheral.all_registers().collect::<Vec<_>>();
12711271
lookup_in_peripheral(
12721272
Some(base_peripheral),
12731273
base_register,

0 commit comments

Comments
 (0)