diff options
| author | bors[bot] <bors[bot]@users.noreply.github.com> | 2018-08-24 14:36:59 +0000 |
|---|---|---|
| committer | bors[bot] <bors[bot]@users.noreply.github.com> | 2018-08-24 14:36:59 +0000 |
| commit | 62a232f5c64890e2d666d23227df1c21675fc863 (patch) | |
| tree | 78dc3e80181da30d331e0ac3634dfa99c4784498 /src/examples/_7_generics.rs | |
| parent | 53dbbad891e1c223ba5b1939e114b37667011f11 (diff) | |
| parent | 90c9f64c5a010944bc1bc4efb308f18e0af9100a (diff) | |
Merge #85
85: fix master r=japaric a=japaric
closes #80
Co-authored-by: Ferdia McKeogh <chocol4te@users.noreply.github.com>
Co-authored-by: Jorge Aparicio <jorge@japaric.io>
Diffstat (limited to 'src/examples/_7_generics.rs')
| -rw-r--r-- | src/examples/_7_generics.rs | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/src/examples/_7_generics.rs b/src/examples/_7_generics.rs index 22bb777..5dafdbf 100644 --- a/src/examples/_7_generics.rs +++ b/src/examples/_7_generics.rs @@ -3,14 +3,13 @@ //! ``` //! #![deny(unsafe_code)] //! #![deny(warnings)] -//! #![feature(proc_macro)] //! #![no_std] //! //! extern crate cortex_m_rtfm as rtfm; //! extern crate stm32f103xx; //! //! use rtfm::{app, Resource, Threshold}; -//! use stm32f103xx::{SPI1, GPIOA}; +//! use stm32f103xx::{GPIOA, SPI1}; //! //! app! { //! device: stm32f103xx, |