Skip to content

Commit e6cefa5

Browse files
authored
Merge branch 'master' into improve-ci
2 parents 0b03132 + c1acfbd commit e6cefa5

22 files changed

+613
-504
lines changed

.github/CODEOWNERS

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
* @rust-embedded/tools

.github/bors.toml

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
block_labels = ["needs-decision", "S-waiting-on-team"]
2+
delete_merged_branches = true
3+
required_approvals = 1
4+
status = [
5+
"continuous-integration/travis-ci/push",
6+
]
7+
timeout_sec = 14400

.travis.yml

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -48,6 +48,10 @@ matrix:
4848
- env: TARGET=x86_64-apple-darwin
4949
os: osx
5050

51+
# Windows
52+
- env: TARGET=x86_64-pc-windows-msvc
53+
os: windows
54+
5155
install:
5256
- bash ci/install.sh
5357

@@ -76,6 +80,8 @@ branches:
7680
only:
7781
- staging
7882
- trying
83+
# release tags
84+
- /^v\d+\.\d+\.\d+.*$/
7985

8086
notifications:
8187
email:

CHANGELOG.md

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

88
## [Unreleased]
99

10+
## [v0.14.0] - 2018-12-07
11+
12+
### Added
13+
14+
- On Cortex-M targets the generated code includes a re-export of the
15+
`cortex_m_rt::interrupt` attribute, but only when the `rt` feature is enabled.
16+
17+
### Changed
18+
19+
- [breaking-change] on non-Cortex targets Interrupt no longer implements the
20+
`TryFrom` trait; it now provides an inherent `try_from` method.
21+
22+
- [breaking-change] for non-Cortex targets svd2rust no longer outputs the
23+
generated code to stdout; instead it writes it to a file named `lib.rs`.
24+
25+
- Brackets generated in doc comments are now escaped to prevent warnings on
26+
nightly where the compiler tries to interpret bracketed content as links to
27+
structs, enums, etc.
28+
29+
### Fixed
30+
31+
- Some bugs around the generation of unions (see `--nightly` flag).
32+
33+
## [v0.13.1] - 2018-05-16
34+
35+
### Fixed
36+
37+
- Fixed code generation for non Cortex-M targets. `svd2rust` was generating a feature gate with the
38+
wrong name.
39+
40+
- Fixed the example Cargo.toml for msp430 in the documentation.
41+
1042
## [v0.13.0] - 2018-05-12
1143

1244
### Added
@@ -373,7 +405,8 @@ peripheral.register.write(|w| w.field().set());
373405

374406
- Initial version of the `svd2rust` tool
375407

376-
[Unreleased]: https://github.com/japaric/svd2rust/compare/v0.13.0...HEAD
408+
[Unreleased]: https://github.com/japaric/svd2rust/compare/v0.13.1...HEAD
409+
[v0.13.1]: https://github.com/japaric/svd2rust/compare/v0.13.0...v0.13.1
377410
[v0.13.0]: https://github.com/japaric/svd2rust/compare/v0.12.1...v0.13.0
378411
[v0.12.1]: https://github.com/japaric/svd2rust/compare/v0.12.0...v0.12.1
379412
[v0.12.0]: https://github.com/japaric/svd2rust/compare/v0.11.4...v0.12.0

CODE_OF_CONDUCT.md

Lines changed: 37 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,37 @@
1+
# The Rust Code of Conduct
2+
3+
## Conduct
4+
5+
**Contact**: [Tools team][team]
6+
7+
* We are committed to providing a friendly, safe and welcoming environment for all, regardless of level of experience, gender identity and expression, sexual orientation, disability, personal appearance, body size, race, ethnicity, age, religion, nationality, or other similar characteristic.
8+
* On IRC, please avoid using overtly sexual nicknames or other nicknames that might detract from a friendly, safe and welcoming environment for all.
9+
* Please be kind and courteous. There's no need to be mean or rude.
10+
* Respect that people have differences of opinion and that every design or implementation choice carries a trade-off and numerous costs. There is seldom a right answer.
11+
* Please keep unstructured critique to a minimum. If you have solid ideas you want to experiment with, make a fork and see how it works.
12+
* We will exclude you from interaction if you insult, demean or harass anyone. That is not welcome behavior. We interpret the term "harassment" as including the definition in the [Citizen Code of Conduct](http://citizencodeofconduct.org/); if you have any lack of clarity about what might be included in that concept, please read their definition. In particular, we don't tolerate behavior that excludes people in socially marginalized groups.
13+
* Private harassment is also unacceptable. No matter who you are, if you feel you have been or are being harassed or made uncomfortable by a community member, please contact one of the channel ops or any of the [Tools team][team] immediately. Whether you're a regular contributor or a newcomer, we care about making this community a safe place for you and we've got your back.
14+
* Likewise any spamming, trolling, flaming, baiting or other attention-stealing behavior is not welcome.
15+
16+
## Moderation
17+
18+
These are the policies for upholding our community's standards of conduct.
19+
20+
1. Remarks that violate the Rust standards of conduct, including hateful, hurtful, oppressive, or exclusionary remarks, are not allowed. (Cursing is allowed, but never targeting another user, and never in a hateful manner.)
21+
2. Remarks that moderators find inappropriate, whether listed in the code of conduct or not, are also not allowed.
22+
3. Moderators will first respond to such remarks with a warning.
23+
4. If the warning is unheeded, the user will be "kicked," i.e., kicked out of the communication channel to cool off.
24+
5. If the user comes back and continues to make trouble, they will be banned, i.e., indefinitely excluded.
25+
6. Moderators may choose at their discretion to un-ban the user if it was a first offense and they offer the offended party a genuine apology.
26+
7. If a moderator bans someone and you think it was unjustified, please take it up with that moderator, or with a different moderator, **in private**. Complaints about bans in-channel are not allowed.
27+
8. Moderators are held to a higher standard than other community members. If a moderator creates an inappropriate situation, they should expect less leeway than others.
28+
29+
In the Rust community we strive to go the extra step to look out for each other. Don't just aim to be technically unimpeachable, try to be your best self. In particular, avoid flirting with offensive or sensitive issues, particularly if they're off-topic; this all too often leads to unnecessary fights, hurt feelings, and damaged trust; worse, it can drive people away from the community entirely.
30+
31+
And if someone takes issue with something you said or did, resist the urge to be defensive. Just stop doing what it was they complained about and apologize. Even if you feel you were misinterpreted or unfairly accused, chances are good there was something you could've communicated better — remember that it's your responsibility to make your fellow Rustaceans comfortable. Everyone wants to get along and we are all here first and foremost because we want to talk about cool technology. You will find that people will be eager to assume good intent and forgive as long as you earn their trust.
32+
33+
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).
34+
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/).*
36+
37+
[team]: https://github.com/rust-embedded/wg#the-tools-team

Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ keywords = [
1919
license = "MIT OR Apache-2.0"
2020
name = "svd2rust"
2121
repository = "https://github.com/japaric/svd2rust"
22-
version = "0.13.0"
22+
version = "0.14.0"
2323

2424
[[bin]]
2525
doc = false

README.md

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,8 @@
55

66
> Generate Rust register maps (`struct`s) from SVD files
77
8+
This project is developed and maintained by the [Tools team][team].
9+
810
# [Documentation](https://docs.rs/svd2rust)
911

1012
# [API](https://docs.rs/svd2rust)
@@ -30,3 +32,12 @@ at your option.
3032
Unless you explicitly state otherwise, any contribution intentionally submitted for inclusion in the
3133
work by you, as defined in the Apache-2.0 license, shall be dual licensed as above, without any
3234
additional terms or conditions.
35+
36+
## Code of Conduct
37+
38+
Contribution to this crate is organized under the terms of the [Rust Code of
39+
Conduct][CoC], the maintainer of this crate, the [Tools team][team], promises
40+
to intervene to uphold that code of conduct.
41+
42+
[CoC]: CODE_OF_CONDUCT.md
43+
[team]: https://github.com/rust-embedded/wg#the-tools-team

appveyor.yml

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

bors.toml

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

ci/before_deploy.ps1

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

0 commit comments

Comments
 (0)