Skip to content

Commit

Permalink
Merge #322
Browse files Browse the repository at this point in the history
322: Fix missing peripheral::itm export, prepare v0.6.7 r=jonas-schievink a=adamgreig

This fixes the issue where cortex-m 0.5.10 re-exports 0.6's peripheral::itm module; in principle it's possible other crates could have been using this module directly too (it is public) but in practice it doesn't contain anything useful (all the useful things are in the top-level itm module).

Should fix rust-embedded/discovery#287.

Co-authored-by: Adam Greig <adam@adamgreig.com>
  • Loading branch information
bors[bot] and adamgreig committed Jan 26, 2021
2 parents 2dae1e4 + 80ce8ce commit 17fe7ec
Show file tree
Hide file tree
Showing 3 changed files with 12 additions and 2 deletions.
9 changes: 8 additions & 1 deletion CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,12 @@ and this project adheres to [Semantic Versioning](http://semver.org/).

## [Unreleased]

## [v0.6.7] - 2021-01-26

### Fixed

- Fixed missing `peripheral::itm` reexport.

## [v0.6.6] - 2021-01-26

### Fixed
Expand Down Expand Up @@ -613,7 +619,8 @@ fn main() {
- Functions to get the vector table
- Wrappers over miscellaneous instructions like `bkpt`

[Unreleased]: https://github.com/rust-embedded/cortex-m/compare/v0.6.6...HEAD
[Unreleased]: https://github.com/rust-embedded/cortex-m/compare/v0.6.7...HEAD
[v0.6.6]: https://github.com/rust-embedded/cortex-m/compare/v0.6.6...v0.6.7
[v0.6.6]: https://github.com/rust-embedded/cortex-m/compare/v0.6.5...v0.6.6
[v0.6.5]: https://github.com/rust-embedded/cortex-m/compare/v0.6.4...v0.6.5
[v0.6.4]: https://github.com/rust-embedded/cortex-m/compare/v0.6.3...v0.6.4
Expand Down
2 changes: 1 addition & 1 deletion Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ license = "MIT OR Apache-2.0"
name = "cortex-m"
readme = "README.md"
repository = "https://github.com/rust-embedded/cortex-m"
version = "0.6.6"
version = "0.6.7"
edition = "2018"

[dependencies]
Expand Down
3 changes: 3 additions & 0 deletions src/peripheral/mod.rs
Original file line number Diff line number Diff line change
Expand Up @@ -84,6 +84,9 @@ pub mod mpu;
pub mod nvic;
pub mod scb;

#[cfg(all(not(armv6m), not(armv8m_base)))]
pub use cortex_m_0_7::peripheral::itm;

pub use cortex_m_0_7::peripheral::{cpuid, dcb, dwt, syst};
#[cfg(not(armv6m))]
pub use cortex_m_0_7::peripheral::{fpb, tpiu};
Expand Down

0 comments on commit 17fe7ec

Please sign in to comment.