more fixes

Xargo.toml

@@ -1,5 +0,0 @@
-[dependencies.core]
-stage = 0
-
-[dependencies.compiler_builtins]
-stage = 1

examples/custom-type.rs

@@ -1,6 +1,5 @@
 #![deny(unsafe_code)]
 #![deny(warnings)]
-#![feature(proc_macro)]
 #![no_std]
 
 extern crate cortex_m_rtfm as rtfm;

examples/full-syntax.rs

@@ -1,7 +1,6 @@
 //! A showcase of the `app!` macro syntax
 #![deny(unsafe_code)]
 #![deny(warnings)]
-#![feature(proc_macro)]
 #![no_std]
 
 extern crate cortex_m_rtfm as rtfm;
@@ -60,7 +59,7 @@ mod main {
 
     pub fn idle(t: &mut Threshold, mut r: ::idle::Resources) -> ! {
         loop {
-            *r.OWNED != *r.OWNED;
+            *r.OWNED = !*r.OWNED;
 
             if *r.OWNED {
                 if r.SHARED.claim(t, |shared, _| *shared) {

examples/generics.rs

@@ -1,14 +1,13 @@
 //! Working with resources in a generic fashion
 #![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,

examples/late-resources.rs

@@ -1,7 +1,6 @@
 //! Demonstrates initialization of resources in `init`.
 #![deny(unsafe_code)]
 #![deny(warnings)]
-#![feature(proc_macro)]
 #![no_std]
 
 extern crate cortex_m_rtfm as rtfm;

examples/nested.rs

@@ -4,7 +4,6 @@
 //! letters in the comments: A, then B, then C, etc.
 #![deny(unsafe_code)]
 #![deny(warnings)]
-#![feature(proc_macro)]
 #![no_std]
 
 extern crate cortex_m_rtfm as rtfm;
@@ -60,7 +59,13 @@ fn idle() -> ! {
 }
 
 #[allow(non_snake_case)]
-fn exti0(t: &mut Threshold, EXTI0::Resources { mut LOW, mut HIGH }: EXTI0::Resources) {
+fn exti0(
+    t: &mut Threshold,
+    EXTI0::Resources {
+        LOW: mut low,
+        HIGH: mut high,
+    }: EXTI0::Resources,
+) {
     // Because this task has a priority of 1 the preemption threshold `t` also
     // starts at 1
 
@@ -71,7 +76,7 @@ fn exti0(t: &mut Threshold, EXTI0::Resources { mut LOW, mut HIGH }: EXTI0::Resou
     rtfm::set_pending(Interrupt::EXTI1); // ~> exti1
 
     // A claim creates a critical section
-    LOW.claim_mut(t, |_low, t| {
+    low.claim_mut(t, |_low, t| {
         // This claim increases the preemption threshold to 2
         //
         // 2 is just high enough to not race with task `exti1` for access to the
@@ -92,7 +97,7 @@ fn exti0(t: &mut Threshold, EXTI0::Resources { mut LOW, mut HIGH }: EXTI0::Resou
         rtfm::bkpt();
 
         // Claims can be nested
-        HIGH.claim_mut(t, |_high, _| {
+        high.claim_mut(t, |_high, _| {
             // This claim increases the preemption threshold to 3
 
             // Now `exti2` can't preempt this task

examples/one-task.rs

@@ -1,7 +1,6 @@
 //! An application with one task
 #![deny(unsafe_code)]
 #![deny(warnings)]
-#![feature(proc_macro)]
 #![no_std]
 
 extern crate cortex_m;

examples/preemption.rs

@@ -1,7 +1,6 @@
 //! Two tasks running at *different* priorities with access to the same resource
 #![deny(unsafe_code)]
 #![deny(warnings)]
-#![feature(proc_macro)]
 #![no_std]
 
 extern crate cortex_m_rtfm as rtfm;

examples/safe-static-mut-ref.rs

@@ -1,7 +1,6 @@
 //! Safe creation of `&'static mut` references
 #![deny(unsafe_code)]
 #![deny(warnings)]
-#![feature(proc_macro)]
 #![no_std]
 
 extern crate cortex_m_rtfm as rtfm;

examples/two-tasks.rs

@@ -1,7 +1,6 @@
 //! Two tasks running at the *same* priority with access to the same resource
 #![deny(unsafe_code)]
 #![deny(warnings)]
-#![feature(proc_macro)]
 #![no_std]
 
 extern crate cortex_m_rtfm as rtfm;

examples/zero-tasks.rs

@@ -1,8 +1,6 @@
 //! Minimal example with zero tasks
 #![deny(unsafe_code)]
 #![deny(warnings)]
-// IMPORTANT always include this feature gate
-#![feature(proc_macro)]
 #![no_std]
 
 extern crate cortex_m_rtfm as rtfm; // IMPORTANT always do this rename

macros/src/lib.rs

@@ -1,6 +1,5 @@
 //! Procedural macros of the `cortex-m-rtfm` crate
 // #![deny(warnings)]
-#![feature(proc_macro)]
 #![recursion_limit = "128"]
 
 #[macro_use]

macros/src/trans.rs

@@ -85,7 +85,7 @@ fn idle(app: &App, ownerships: &Ownerships, main: &mut Vec<TokenStream>, root: &
                 });
 
                 rexprs.push(quote! {
-                    #name: ::idle::#name { _0: core::marker::PhantomData },
+                    #name: ::idle::#name { _0: ::core::marker::PhantomData },
                 });
             }
         }
@@ -149,7 +149,7 @@ fn idle(app: &App, ownerships: &Ownerships, main: &mut Vec<TokenStream>, root: &
 
         mod_items.push(quote! {
             #[allow(non_camel_case_types)]
-            pub struct #name { _0: core::marker::PhantomData<*const ()> }
+            pub struct #name { _0: ::core::marker::PhantomData<*const ()> }
         });
 
         root.push(quote! {

src/examples/_0_zero_tasks.rs

@@ -3,8 +3,6 @@
 //! ```
 //! #![deny(unsafe_code)]
 //! #![deny(warnings)]
-//! // IMPORTANT always include this feature gate
-//! #![feature(proc_macro)]
 //! #![no_std]
 //! 
 //! extern crate cortex_m_rtfm as rtfm; // IMPORTANT always do this rename

src/examples/_1_one_task.rs

@@ -3,7 +3,6 @@
 //! ```
 //! #![deny(unsafe_code)]
 //! #![deny(warnings)]
-//! #![feature(proc_macro)]
 //! #![no_std]
 //! 
 //! extern crate cortex_m;

src/examples/_2_two_tasks.rs

@@ -3,7 +3,6 @@
 //! ```
 //! #![deny(unsafe_code)]
 //! #![deny(warnings)]
-//! #![feature(proc_macro)]
 //! #![no_std]
 //! 
 //! extern crate cortex_m_rtfm as rtfm;

src/examples/_3_preemption.rs

@@ -3,7 +3,6 @@
 //! ```
 //! #![deny(unsafe_code)]
 //! #![deny(warnings)]
-//! #![feature(proc_macro)]
 //! #![no_std]
 //! 
 //! extern crate cortex_m_rtfm as rtfm;

src/examples/_4_nested.rs

@@ -6,14 +6,13 @@
 //! ```
 //! #![deny(unsafe_code)]
 //! #![deny(warnings)]
-//! #![feature(proc_macro)]
 //! #![no_std]
 //! 
 //! extern crate cortex_m_rtfm as rtfm;
 //! extern crate stm32f103xx;
 //! 
-//! use stm32f103xx::Interrupt;
 //! use rtfm::{app, Resource, Threshold};
+//! use stm32f103xx::Interrupt;
 //! 
 //! app! {
 //!     device: stm32f103xx,
@@ -64,7 +63,10 @@
 //! #[allow(non_snake_case)]
 //! fn exti0(
 //!     t: &mut Threshold,
-//!     EXTI0::Resources { mut LOW, mut HIGH }: EXTI0::Resources,
+//!     EXTI0::Resources {
+//!         LOW: mut low,
+//!         HIGH: mut high,
+//!     }: EXTI0::Resources,
 //! ) {
 //!     // Because this task has a priority of 1 the preemption threshold `t` also
 //!     // starts at 1
@@ -76,7 +78,7 @@
 //!     rtfm::set_pending(Interrupt::EXTI1); // ~> exti1
 //! 
 //!     // A claim creates a critical section
-//!     LOW.claim_mut(t, |_low, t| {
+//!     low.claim_mut(t, |_low, t| {
 //!         // This claim increases the preemption threshold to 2
 //!         //
 //!         // 2 is just high enough to not race with task `exti1` for access to the
@@ -97,7 +99,7 @@
 //!         rtfm::bkpt();
 //! 
 //!         // Claims can be nested
-//!         HIGH.claim_mut(t, |_high, _| {
+//!         high.claim_mut(t, |_high, _| {
 //!             // This claim increases the preemption threshold to 3
 //! 
 //!             // Now `exti2` can't preempt this task

src/examples/_5_late_resources.rs

@@ -3,7 +3,6 @@
 //! ```
 //! #![deny(unsafe_code)]
 //! #![deny(warnings)]
-//! #![feature(proc_macro)]
 //! #![no_std]
 //! 
 //! extern crate cortex_m_rtfm as rtfm;

src/examples/_6_safe_static_mut_ref.rs

@@ -3,7 +3,6 @@
 //! ```
 //! #![deny(unsafe_code)]
 //! #![deny(warnings)]
-//! #![feature(proc_macro)]
 //! #![no_std]
 //! 
 //! extern crate cortex_m_rtfm as rtfm;

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,

src/examples/_8_full_syntax.rs

@@ -3,7 +3,6 @@
 //! ```
 //! #![deny(unsafe_code)]
 //! #![deny(warnings)]
-//! #![feature(proc_macro)]
 //! #![no_std]
 //! 
 //! extern crate cortex_m_rtfm as rtfm;
@@ -62,7 +61,7 @@
 //! 
 //!     pub fn idle(t: &mut Threshold, mut r: ::idle::Resources) -> ! {
 //!         loop {
-//!             *r.OWNED != *r.OWNED;
+//!             *r.OWNED = !*r.OWNED;
 //! 
 //!             if *r.OWNED {
 //!                 if r.SHARED.claim(t, |shared, _| *shared) {

src/lib.rs

@@ -79,7 +79,6 @@
 //! [rtfm]: http://www.diva-portal.org/smash/get/diva2:1005680/FULLTEXT01.pdf
 #![deny(missing_docs)]
 #![deny(warnings)]
-#![feature(proc_macro)]
 #![no_std]
 
 extern crate cortex_m;

tests/cfail/critical-section.rs

@@ -1,7 +1,6 @@
 #![deny(unsafe_code)]
 #![deny(warnings)]
 #![feature(const_fn)]
-#![feature(proc_macro)]
 #![no_std]
 
 extern crate cortex_m_rtfm as rtfm;

tests/cfail/duplicated-task.rs

@@ -1,6 +1,5 @@
 #![deny(unsafe_code)]
 #![deny(warnings)]
-#![feature(proc_macro)]
 #![no_std]
 
 extern crate cortex_m_rtfm as rtfm;

tests/cfail/exception.rs

@@ -1,6 +1,5 @@
 #![deny(unsafe_code)]
 #![deny(warnings)]
-#![feature(proc_macro)]
 #![no_std]
 
 extern crate cortex_m_rtfm as rtfm;

tests/cfail/idle.rs

@@ -1,6 +1,5 @@
 #![deny(unsafe_code)]
 #![deny(warnings)]
-#![feature(proc_macro)]
 #![no_std]
 
 extern crate cortex_m_rtfm as rtfm;

tests/cfail/init-resource-share-idle.rs

@@ -1,5 +1,4 @@
 #![deny(warnings)]
-#![feature(proc_macro)]
 #![no_std]
 
 extern crate cortex_m_rtfm as rtfm;

tests/cfail/init-resource-share-task.rs

@@ -1,5 +1,4 @@
 #![deny(warnings)]
-#![feature(proc_macro)]
 #![no_std]
 
 extern crate cortex_m_rtfm as rtfm;

tests/cfail/init.rs

@@ -1,6 +1,5 @@
 #![deny(unsafe_code)]
 #![deny(warnings)]
-#![feature(proc_macro)]
 #![no_std]
 
 extern crate cortex_m_rtfm as rtfm;

tests/cfail/interrupt.rs

@@ -1,6 +1,5 @@
 #![deny(unsafe_code)]
 #![deny(warnings)]
-#![feature(proc_macro)]
 #![no_std]
 
 extern crate cortex_m_rtfm as rtfm;

tests/cfail/late-resource-init.rs

@@ -1,6 +1,5 @@
 #![deny(unsafe_code)]
 #![deny(warnings)]
-#![feature(proc_macro)]
 #![no_std]
 
 extern crate cortex_m_rtfm as rtfm;

tests/cfail/lock.rs

@@ -1,7 +1,6 @@
 #![deny(unsafe_code)]
 #![deny(warnings)]
 #![feature(const_fn)]
-#![feature(proc_macro)]
 #![no_std]
 
 extern crate cortex_m_rtfm as rtfm;

tests/cfail/peripheral-alias.rs

@@ -1,6 +1,5 @@
 #![deny(unsafe_code)]
 #![deny(warnings)]
-#![feature(proc_macro)]
 #![no_std]
 
 extern crate cortex_m_rtfm as rtfm;

tests/cfail/priority-too-high.rs

@@ -1,6 +1,5 @@
 #![deny(unsafe_code)]
 #![deny(warnings)]
-#![feature(proc_macro)]
 #![no_std]
 
 extern crate cortex_m_rtfm as rtfm;
@@ -8,8 +7,9 @@ extern crate stm32f103xx;
 
 use rtfm::app;
 
-app! { //~ error attempt to subtract with overflow
+app! { //~ error referenced constant has errors
-    //~^ error constant evaluation error
+    //~^ error could not evaluate constant
+    //~| error constant evaluation error
     device: stm32f103xx,
 
     tasks: {

tests/cfail/priority-too-low.rs

@@ -1,6 +1,5 @@
 #![deny(unsafe_code)]
 #![deny(warnings)]
-#![feature(proc_macro)]
 #![no_std]
 
 extern crate cortex_m_rtfm as rtfm;
@@ -8,8 +7,9 @@ extern crate stm32f103xx;
 
 use rtfm::app;
 
-app! { //~ error attempt to subtract with overflow
+app! { //~ error referenced constant has errors
-    //~^ error constant evaluation error
+    //~^ error could not evaluate constant
+    //~| error constant evaluation error
     device: stm32f103xx,
 
     tasks: {

tests/cfail/resource-alias.rs

@@ -1,6 +1,5 @@
 #![deny(unsafe_code)]
 #![deny(warnings)]
-#![feature(proc_macro)]
 #![no_std]
 
 extern crate cortex_m_rtfm as rtfm;

tests/cfail/resource-not-send-sync.rs

@@ -1,7 +1,6 @@
 #![deny(unsafe_code)]
 #![deny(warnings)]
 #![feature(const_fn)]
-#![feature(proc_macro)]
 #![no_std]
 
 extern crate cortex_m_rtfm as rtfm;
@@ -47,7 +46,7 @@ fn exti0(_t: &mut Threshold, r: EXTI0::Resources) {
 
     // ERROR resource proxies are not `Send`able across tasks
     is_send(&r.SHARED);
-    //~^ error the trait bound `*const (): core::marker::Send` is not satisfied
+    //~^ error `*const ()` cannot be sent between threads safely
 }
 
 fn exti1(_t: &mut Threshold, _r: EXTI1::Resources) {

tests/cfail/token-outlive.rs

@@ -1,7 +1,6 @@
 #![deny(unsafe_code)]
 #![deny(warnings)]
 #![feature(const_fn)]
-#![feature(proc_macro)]
 #![no_std]
 
 extern crate cortex_m_rtfm as rtfm;

tests/cfail/token-transfer.rs

@@ -1,7 +1,6 @@
 #![deny(unsafe_code)]
 #![deny(warnings)]
 #![feature(const_fn)]
-#![feature(proc_macro)]
 #![no_std]
 
 extern crate cortex_m_rtfm as rtfm;
@@ -9,7 +8,7 @@ extern crate stm32f103xx;
 
 use rtfm::{app, Threshold};
 
-app! { //~ error bound `*const (): core::marker::Send` is not satisfied
+app! { //~ error `*const ()` cannot be sent between threads safely
     device: stm32f103xx,
 
     resources: {

tests/cfail/wrong-threshold.rs

@@ -1,6 +1,5 @@
 #![deny(unsafe_code)]
 #![deny(warnings)]
-#![feature(proc_macro)]
 #![no_std]
 
 extern crate cortex_m_rtfm as rtfm;