Skip to content

Commit 90dd0ff

Browse files
committed
Merge branch 'master' into atomic-everywhere
2 parents c97573a + 25d4b15 commit 90dd0ff

File tree

9 files changed

+385
-58
lines changed

9 files changed

+385
-58
lines changed

.github/workflows/ci.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -78,7 +78,7 @@ jobs:
7878
- { rust: stable, vendor: Toshiba, options: all }
7979
- { rust: stable, vendor: Toshiba, options: "" }
8080
# Test MSRV
81-
- { rust: 1.60.0, vendor: Nordic, options: "" }
81+
- { rust: 1.61.0, vendor: Nordic, options: "" }
8282
# Use nightly for architectures which don't support stable
8383
- { rust: nightly, vendor: MSP430, options: "--atomics" }
8484
- { rust: nightly, vendor: MSP430, options: "" }

CHANGELOG.md

+11-5
Original file line numberDiff line numberDiff line change
@@ -2,17 +2,22 @@
22

33
All notable changes to this project will be documented in this file.
44

5-
The format is based on [Keep a Changelog](http://keepachangelog.com/)
6-
and this project adheres to [Semantic Versioning](http://semver.org/).
5+
The format is based on [Keep a Changelog](https://keepachangelog.com/)
6+
and this project adheres to [Semantic Versioning](https://semver.org/).
77

88
## [Unreleased]
99

10+
- Generate atomic register code for non-MSP430 targets
11+
- Change --nightly flag to --atomics
12+
13+
## [v0.27.2] - 2022-11-06
14+
15+
- mark alternate register accessors with `const`, bump `pac` MSRV to 1.61
1016
- `fields` fn refactoring
1117
- Test patched STM32
1218
- simplify ci strategy
1319
- Fix generated code for MSP430 atomics
14-
- Generate atomic register code for non-MSP430 targets
15-
- Change --nightly flag to --atomics
20+
- Add handling for disjoint register arrays and validation of derives
1621

1722
## [v0.27.1] - 2022-10-25
1823

@@ -773,7 +778,8 @@ peripheral.register.write(|w| w.field().set());
773778

774779
- Initial version of the `svd2rust` tool
775780

776-
[Unreleased]: https://github.com/rust-embedded/svd2rust/compare/v0.27.1...HEAD
781+
[Unreleased]: https://github.com/rust-embedded/svd2rust/compare/v0.27.2...HEAD
782+
[v0.27.2]: https://github.com/rust-embedded/svd2rust/compare/v0.27.1...v0.27.2
777783
[v0.27.1]: https://github.com/rust-embedded/svd2rust/compare/v0.27.0...v0.27.1
778784
[v0.27.0]: https://github.com/rust-embedded/svd2rust/compare/v0.26.0...v0.27.0
779785
[v0.26.0]: https://github.com/rust-embedded/svd2rust/compare/v0.25.1...v0.26.0

CODE_OF_CONDUCT.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,6 @@ And if someone takes issue with something you said or did, resist the urge to be
3232

3333
The enforcement policies listed above apply to all official embedded WG venues; including official IRC channels (#rust-embedded); GitHub repositories under rust-embedded; and all forums under rust-embedded.org (forum.rust-embedded.org).
3434

35-
*Adapted from the [Node.js Policy on Trolling](http://blog.izs.me/post/30036893703/policy-on-trolling) as well as the [Contributor Covenant v1.3.0](https://www.contributor-covenant.org/version/1/3/0/).*
35+
*Adapted from the [Node.js Policy on Trolling](https://blog.izs.me/2012/08/policy-on-trolling/) as well as the [Contributor Covenant v1.3.0](https://www.contributor-covenant.org/version/1/3/0/).*
3636

3737
[team]: https://github.com/rust-embedded/wg#the-tools-team

Cargo.toml

+2-1
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ keywords = [
2323
license = "MIT OR Apache-2.0"
2424
name = "svd2rust"
2525
repository = "https://github.com/rust-embedded/svd2rust/"
26-
version = "0.27.1"
26+
version = "0.27.2"
2727
readme = "README.md"
2828
rust-version = "1.60"
2929

@@ -55,6 +55,7 @@ thiserror = "1.0"
5555
serde = { version = "1.0", optional = true }
5656
serde_json = { version = "1.0.85", optional = true }
5757
serde_yaml = { version = "0.9.11", optional = true }
58+
regex = "1.6.0"
5859

5960
[dependencies.svd-parser]
6061
features = ["expand"]

README.md

+4-4
Original file line numberDiff line numberDiff line change
@@ -13,9 +13,9 @@ This project is developed and maintained by the [Tools team][team].
1313

1414
## Minimum Supported Rust Version (MSRV)
1515

16-
The **generated code** is guaranteed to compile on stable Rust 1.60.0 and up.
16+
The **generated code** is guaranteed to compile on stable Rust 1.61.0 and up.
1717

18-
If you encounter compilation errors on any stable version newer than 1.60.0, please open an issue.
18+
If you encounter compilation errors on any stable version newer than 1.61.0, please open an issue.
1919

2020
# Testing Locally
2121

@@ -28,8 +28,8 @@ Check out the [svd2rust-regress README](ci/svd2rust-regress/README.md) for infor
2828
Licensed under either of
2929

3030
- Apache License, Version 2.0 ([LICENSE-APACHE](LICENSE-APACHE) or
31-
http://www.apache.org/licenses/LICENSE-2.0)
32-
- MIT license ([LICENSE-MIT](LICENSE-MIT) or http://opensource.org/licenses/MIT)
31+
https://www.apache.org/licenses/LICENSE-2.0)
32+
- MIT license ([LICENSE-MIT](LICENSE-MIT) or https://opensource.org/licenses/MIT)
3333

3434
at your option.
3535

src/generate/generic.rs

+2-2
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ pub trait RegisterSpec {
4949

5050
/// Trait implemented by readable registers to enable the `read` method.
5151
///
52-
/// Registers marked with `Writable` can be also `modify`'ed.
52+
/// Registers marked with `Writable` can be also be `modify`'ed.
5353
pub trait Readable: RegisterSpec {
5454
/// Result from a call to `read` and argument to `modify`.
5555
type Reader: From<R<Self>> + core::ops::Deref<Target = R<Self>>;
@@ -59,7 +59,7 @@ pub trait Readable: RegisterSpec {
5959
///
6060
/// This enables the `write`, `write_with_zero` and `reset` methods.
6161
///
62-
/// Registers marked with `Readable` can be also `modify`'ed.
62+
/// Registers marked with `Readable` can be also be `modify`'ed.
6363
pub trait Writable: RegisterSpec {
6464
/// Writer type argument to `write`, et al.
6565
type Writer: From<W<Self>> + core::ops::DerefMut<Target = W<Self>>;

0 commit comments

Comments
 (0)