diff options
| author |  bors[bot] <26634292+bors[bot]@users.noreply.github.com>
| 2022-01-27 22:51:03 +0000 |
|---|---|---|
| committer |  GitHub <noreply@github.com>
| 2022-01-27 22:51:03 +0000 |
| commit | 093928142cbecc2a07dbf649abae15e8ed20127a (patch) | |
| tree | 2f743155831af2aeae0abc5887b3ba3ac30ef3ba | |
| parent | 08111803edae11ab0fa4d0f287a865f434f4c12c (diff) | |
| parent | 06dc05cce2e9dd4a71105eaa3a0f00d2fdad8799 (diff) | |
| download | cortex-m-093928142cbecc2a07dbf649abae15e8ed20127a.tar.gz cortex-m-093928142cbecc2a07dbf649abae15e8ed20127a.tar.zst cortex-m-093928142cbecc2a07dbf649abae15e8ed20127a.zip | |
Merge #416
416: Fix #414, use fully qualified path for `exception` enum in `#[exception]` macro r=thalesfragoso a=adamgreig
Partially reverts https://github.com/rust-embedded/cortex-m-rt/pull/224
to continue to use a fully-qualified path to `exception`.
Co-authored-by: Adam Greig <adam@adamgreig.com>
| -rw-r--r-- | cortex-m-rt/CHANGELOG.md | 11 | ||||
| -rw-r--r-- | cortex-m-rt/Cargo.toml | 1 | ||||
| -rw-r--r-- | cortex-m-rt/macros/src/lib.rs | 4 |
3 files changed, 14 insertions, 2 deletions
diff --git a/cortex-m-rt/CHANGELOG.md b/cortex-m-rt/CHANGELOG.md index cadeac0..c66b5c0 100644 --- a/cortex-m-rt/CHANGELOG.md +++ b/cortex-m-rt/CHANGELOG.md @@ -7,6 +7,17 @@ and this project adheres to [Semantic Versioning](http://semver.org/). ## [Unreleased] +## Fixes + +- Fix `cortex_m_rt::exception` macro no longer being usable fully-qualified ([#414]) + +[#414]: https://github.com/rust-embedded/cortex-m/issues/414 + +## Notes + +- From this release onwards, cortex-m-rt lives in the cortex-m repository; + issue numbers refer there. + ## [v0.7.1] ## Fixes diff --git a/cortex-m-rt/Cargo.toml b/cortex-m-rt/Cargo.toml index 33a08eb..5289057 100644 --- a/cortex-m-rt/Cargo.toml +++ b/cortex-m-rt/Cargo.toml @@ -15,6 +15,7 @@ repository = "https://github.com/rust-embedded/cortex-m" version = "0.7.1" autoexamples = true links = "cortex-m-rt" # Prevent multiple versions of cortex-m-rt being linked +edition = "2018" [dependencies] cortex-m-rt-macros = { path = "macros", version = "=0.7.0" } diff --git a/cortex-m-rt/macros/src/lib.rs b/cortex-m-rt/macros/src/lib.rs index 24f3fa1..fbcf4fa 100644 --- a/cortex-m-rt/macros/src/lib.rs +++ b/cortex-m-rt/macros/src/lib.rs @@ -174,7 +174,7 @@ pub fn exception(args: TokenStream, input: TokenStream) -> TokenStream { Exception::Other => { quote! { const _: () = { - let _ = cortex_m_rt::Exception::#ident; + let _ = ::cortex_m_rt::Exception::#ident; }; } } @@ -328,7 +328,7 @@ pub fn exception(args: TokenStream, input: TokenStream) -> TokenStream { f.block.stmts = iter::once( syn::parse2(quote! {{ // check that this exception actually exists - exception::#ident; + ::cortex_m_rt::exception::#ident; }}) .unwrap(), ) |