diff options
| author | bors[bot] <bors[bot]@users.noreply.github.com> | 2018-12-16 18:18:17 +0000 |
|---|---|---|
| committer | bors[bot] <bors[bot]@users.noreply.github.com> | 2018-12-16 18:18:17 +0000 |
| commit | c2fbb2848851e32b78e79ff9e919538b7d5ab8a0 (patch) | |
| tree | cadf6359329573a79e937afcef2972f2cf01f6b4 /src | |
| parent | 5c458fc115393b93b158b7f6770bc81596d97977 (diff) | |
| parent | d35f5bc0b0453c2e98b8398d36bd2ba553edce45 (diff) | |
Merge #114
114: properly handle conditional compilation r=japaric a=japaric
of resources and tasks
Co-authored-by: Jorge Aparicio <jorge@japaric.io>
Diffstat (limited to 'src')
| -rw-r--r-- | src/export.rs | 1 | ||||
| -rw-r--r-- | src/lib.rs | 4 |
2 files changed, 2 insertions, 3 deletions
diff --git a/src/export.rs b/src/export.rs index c1eeb87..ed40b62 100644 --- a/src/export.rs +++ b/src/export.rs @@ -10,7 +10,6 @@ pub use cortex_m::{ asm::wfi, interrupt, peripheral::scb::SystemHandler, peripheral::syst::SystClkSource, peripheral::Peripherals, }; -pub use cortex_m_rt::{entry, exception}; pub use heapless::consts; use heapless::spsc::{Queue, SingleCore}; @@ -295,7 +295,7 @@ impl<'a, T> fmt::Debug for Exclusive<'a, T> where T: fmt::Debug, { - fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result { + fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result { (**self).fmt(f) } } @@ -304,7 +304,7 @@ impl<'a, T> fmt::Display for Exclusive<'a, T> where T: fmt::Display, { - fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result { + fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result { (**self).fmt(f) } } |
