diff options
| author | bors[bot] <26634292+bors[bot]@users.noreply.github.com> | 2022-05-24 17:43:19 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-05-24 17:43:19 +0000 |
| commit | 8d3c803308197c2c9068da2b3c04163b07ea1d47 (patch) | |
| tree | 3460882b105e93eac2331d2211f14750b93ef825 | |
| parent | 5fe63502787baa740cb5d99d535044cf72f06d54 (diff) | |
| parent | 5c47aba1a11139742f8289ca4c47e045822ee219 (diff) | |
Merge #644
644: Fix macros to Rust 2021 r=perlindgren a=korken89
Co-authored-by: Emil Fresk <emil.fresk@gmail.com>
| -rw-r--r-- | macros/Cargo.toml | 4 | ||||
| -rw-r--r-- | ui/task-priority-too-high.stderr | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/macros/Cargo.toml b/macros/Cargo.toml index f9d8add..2534f8a 100644 --- a/macros/Cargo.toml +++ b/macros/Cargo.toml @@ -6,13 +6,13 @@ authors = [ categories = ["concurrency", "embedded", "no-std"] description = "Procedural macros of the cortex-m-rtic crate" documentation = "https://rtic-rs.github.io/cortex-m-rtic/api/cortex_m_rtic" -edition = "2018" +edition = "2021" keywords = ["arm", "cortex-m"] license = "MIT OR Apache-2.0" name = "cortex-m-rtic-macros" readme = "../README.md" repository = "https://github.com/rtic-rs/cortex-m-rtic" -version = "1.1.3" +version = "1.1.4" [lib] proc-macro = true diff --git a/ui/task-priority-too-high.stderr b/ui/task-priority-too-high.stderr index a5ce918..8b905c4 100644 --- a/ui/task-priority-too-high.stderr +++ b/ui/task-priority-too-high.stderr @@ -12,4 +12,4 @@ error[E0080]: evaluation of constant value failed 3 | #[rtic::app(device = lm3s6965)] | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ the evaluated program panicked at 'Maximum priority used by interrupt vector 'I2C0' is more than supported by hardware', $DIR/ui/task-priority-too-high.rs:3:1 | - = note: this error originates in the macro `$crate::panic::panic_2015` (in Nightly builds, run with -Z macro-backtrace for more info) + = note: this error originates in the macro `$crate::panic::panic_2021` (in Nightly builds, run with -Z macro-backtrace for more info) |