aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGravatar Jorge Aparicio <jorge@japaric.io> 2018-08-24 16:31:04 +0200
committerGravatar Jorge Aparicio <jorge@japaric.io> 2018-08-24 16:31:04 +0200
commitabca8299268e55bdb80b649ceb6b0cc5d0f3c34a (patch)
treeebd4128dc1904f4adc60fea365f3f9d97620b58c
parent5a3605050e210ab819af83b59556cfc78a2f667f (diff)
downloadrtic-abca8299268e55bdb80b649ceb6b0cc5d0f3c34a.tar.gz
rtic-abca8299268e55bdb80b649ceb6b0cc5d0f3c34a.tar.zst
rtic-abca8299268e55bdb80b649ceb6b0cc5d0f3c34a.zip
more fixes
-rw-r--r--Xargo.toml5
-rw-r--r--examples/custom-type.rs1
-rw-r--r--examples/full-syntax.rs3
-rw-r--r--examples/generics.rs3
-rw-r--r--examples/late-resources.rs1
-rw-r--r--examples/nested.rs13
-rw-r--r--examples/one-task.rs1
-rw-r--r--examples/preemption.rs1
-rw-r--r--examples/safe-static-mut-ref.rs1
-rw-r--r--examples/two-tasks.rs1
-rw-r--r--examples/zero-tasks.rs2
-rw-r--r--macros/src/lib.rs1
-rw-r--r--macros/src/trans.rs4
-rw-r--r--src/examples/_0_zero_tasks.rs2
-rw-r--r--src/examples/_1_one_task.rs1
-rw-r--r--src/examples/_2_two_tasks.rs1
-rw-r--r--src/examples/_3_preemption.rs1
-rw-r--r--src/examples/_4_nested.rs12
-rw-r--r--src/examples/_5_late_resources.rs1
-rw-r--r--src/examples/_6_safe_static_mut_ref.rs1
-rw-r--r--src/examples/_7_generics.rs3
-rw-r--r--src/examples/_8_full_syntax.rs3
-rw-r--r--src/lib.rs1
-rw-r--r--tests/cfail/critical-section.rs1
-rw-r--r--tests/cfail/duplicated-task.rs1
-rw-r--r--tests/cfail/exception.rs1
-rw-r--r--tests/cfail/idle.rs1
-rw-r--r--tests/cfail/init-resource-share-idle.rs1
-rw-r--r--tests/cfail/init-resource-share-task.rs1
-rw-r--r--tests/cfail/init.rs1
-rw-r--r--tests/cfail/interrupt.rs1
-rw-r--r--tests/cfail/late-resource-init.rs1
-rw-r--r--tests/cfail/lock.rs1
-rw-r--r--tests/cfail/peripheral-alias.rs1
-rw-r--r--tests/cfail/priority-too-high.rs6
-rw-r--r--tests/cfail/priority-too-low.rs6
-rw-r--r--tests/cfail/resource-alias.rs1
-rw-r--r--tests/cfail/resource-not-send-sync.rs3
-rw-r--r--tests/cfail/token-outlive.rs1
-rw-r--r--tests/cfail/token-transfer.rs3
-rw-r--r--tests/cfail/wrong-threshold.rs1
41 files changed, 30 insertions, 65 deletions
diff --git a/Xargo.toml b/Xargo.toml
deleted file mode 100644
index bd7ffe03..00000000
--- a/Xargo.toml
+++ /dev/null
@@ -1,5 +0,0 @@
-[dependencies.core]
-stage = 0
-
-[dependencies.compiler_builtins]
-stage = 1 \ No newline at end of file
diff --git a/examples/custom-type.rs b/examples/custom-type.rs
index 79d6cc46..826e9dd1 100644
--- a/examples/custom-type.rs
+++ b/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;
diff --git a/examples/full-syntax.rs b/examples/full-syntax.rs
index 5b274122..9bdcd7b4 100644
--- a/examples/full-syntax.rs
+++ b/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) {
diff --git a/examples/generics.rs b/examples/generics.rs
index ca7726d0..aceba1a9 100644
--- a/examples/generics.rs
+++ b/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,
diff --git a/examples/late-resources.rs b/examples/late-resources.rs
index 07c321f6..3bfc3884 100644
--- a/examples/late-resources.rs
+++ b/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;
diff --git a/examples/nested.rs b/examples/nested.rs
index 6af70879..46c00b2b 100644
--- a/examples/nested.rs
+++ b/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
diff --git a/examples/one-task.rs b/examples/one-task.rs
index c62fbbfe..dc2bfd29 100644
--- a/examples/one-task.rs
+++ b/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;
diff --git a/examples/preemption.rs b/examples/preemption.rs
index 8e501887..340b9766 100644
--- a/examples/preemption.rs
+++ b/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;
diff --git a/examples/safe-static-mut-ref.rs b/examples/safe-static-mut-ref.rs
index 81dbde26..9579f523 100644
--- a/examples/safe-static-mut-ref.rs
+++ b/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;
diff --git a/examples/two-tasks.rs b/examples/two-tasks.rs
index 4f567f0c..23489151 100644
--- a/examples/two-tasks.rs
+++ b/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;
diff --git a/examples/zero-tasks.rs b/examples/zero-tasks.rs
index b1ebab6f..abd1c4cd 100644
--- a/examples/zero-tasks.rs
+++ b/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
diff --git a/macros/src/lib.rs b/macros/src/lib.rs
index 728e6133..65d5ad89 100644
--- a/macros/src/lib.rs
+++ b/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]
diff --git a/macros/src/trans.rs b/macros/src/trans.rs
index 3da1e3ef..dcd6cfb6 100644
--- a/macros/src/trans.rs
+++ b/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! {
diff --git a/src/examples/_0_zero_tasks.rs b/src/examples/_0_zero_tasks.rs
index 90f16d48..0484bb9d 100644
--- a/src/examples/_0_zero_tasks.rs
+++ b/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
diff --git a/src/examples/_1_one_task.rs b/src/examples/_1_one_task.rs
index c9004e86..b9075a59 100644
--- a/src/examples/_1_one_task.rs
+++ b/src/examples/_1_one_task.rs
@@ -3,7 +3,6 @@
//! ```
//! #![deny(unsafe_code)]
//! #![deny(warnings)]
-//! #![feature(proc_macro)]
//! #![no_std]
//!
//! extern crate cortex_m;
diff --git a/src/examples/_2_two_tasks.rs b/src/examples/_2_two_tasks.rs
index cf6b33d6..516ff0c9 100644
--- a/src/examples/_2_two_tasks.rs
+++ b/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;
diff --git a/src/examples/_3_preemption.rs b/src/examples/_3_preemption.rs
index 4360185a..14c9d925 100644
--- a/src/examples/_3_preemption.rs
+++ b/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;
diff --git a/src/examples/_4_nested.rs b/src/examples/_4_nested.rs
index e211cf87..26f8fd84 100644
--- a/src/examples/_4_nested.rs
+++ b/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
diff --git a/src/examples/_5_late_resources.rs b/src/examples/_5_late_resources.rs
index 8958e854..7ab90a4e 100644
--- a/src/examples/_5_late_resources.rs
+++ b/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;
diff --git a/src/examples/_6_safe_static_mut_ref.rs b/src/examples/_6_safe_static_mut_ref.rs
index 32eb3d98..8f7267f5 100644
--- a/src/examples/_6_safe_static_mut_ref.rs
+++ b/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;
diff --git a/src/examples/_7_generics.rs b/src/examples/_7_generics.rs
index 22bb777a..5dafdbf2 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,
diff --git a/src/examples/_8_full_syntax.rs b/src/examples/_8_full_syntax.rs
index f8db4087..cc7fbc22 100644
--- a/src/examples/_8_full_syntax.rs
+++ b/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) {
diff --git a/src/lib.rs b/src/lib.rs
index 8e5884ca..9d558875 100644
--- a/src/lib.rs
+++ b/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;
diff --git a/tests/cfail/critical-section.rs b/tests/cfail/critical-section.rs
index 65719788..c0f475c4 100644
--- a/tests/cfail/critical-section.rs
+++ b/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;
diff --git a/tests/cfail/duplicated-task.rs b/tests/cfail/duplicated-task.rs
index 82b7ac63..885c961c 100644
--- a/tests/cfail/duplicated-task.rs
+++ b/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;
diff --git a/tests/cfail/exception.rs b/tests/cfail/exception.rs
index e2e749a2..b4e025fc 100644
--- a/tests/cfail/exception.rs
+++ b/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;
diff --git a/tests/cfail/idle.rs b/tests/cfail/idle.rs
index 79fe99b0..ef20e1a8 100644
--- a/tests/cfail/idle.rs
+++ b/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;
diff --git a/tests/cfail/init-resource-share-idle.rs b/tests/cfail/init-resource-share-idle.rs
index 4e2ed4aa..5b29f302 100644
--- a/tests/cfail/init-resource-share-idle.rs
+++ b/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;
diff --git a/tests/cfail/init-resource-share-task.rs b/tests/cfail/init-resource-share-task.rs
index 391c543d..a93e840e 100644
--- a/tests/cfail/init-resource-share-task.rs
+++ b/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;
diff --git a/tests/cfail/init.rs b/tests/cfail/init.rs
index d2823e3f..057a2ee2 100644
--- a/tests/cfail/init.rs
+++ b/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;
diff --git a/tests/cfail/interrupt.rs b/tests/cfail/interrupt.rs
index 7c345a11..522763a4 100644
--- a/tests/cfail/interrupt.rs
+++ b/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;
diff --git a/tests/cfail/late-resource-init.rs b/tests/cfail/late-resource-init.rs
index a1059f34..5235d930 100644
--- a/tests/cfail/late-resource-init.rs
+++ b/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;
diff --git a/tests/cfail/lock.rs b/tests/cfail/lock.rs
index eb03b7d5..9cb0f3e6 100644
--- a/tests/cfail/lock.rs
+++ b/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;
diff --git a/tests/cfail/peripheral-alias.rs b/tests/cfail/peripheral-alias.rs
index 3528ec66..7f3790a5 100644
--- a/tests/cfail/peripheral-alias.rs
+++ b/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;
diff --git a/tests/cfail/priority-too-high.rs b/tests/cfail/priority-too-high.rs
index 15f6b7a8..d63b9d05 100644
--- a/tests/cfail/priority-too-high.rs
+++ b/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
- //~^ error constant evaluation error
+app! { //~ error referenced constant has errors
+ //~^ error could not evaluate constant
+ //~| error constant evaluation error
device: stm32f103xx,
tasks: {
diff --git a/tests/cfail/priority-too-low.rs b/tests/cfail/priority-too-low.rs
index e8795112..476b7a07 100644
--- a/tests/cfail/priority-too-low.rs
+++ b/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
- //~^ error constant evaluation error
+app! { //~ error referenced constant has errors
+ //~^ error could not evaluate constant
+ //~| error constant evaluation error
device: stm32f103xx,
tasks: {
diff --git a/tests/cfail/resource-alias.rs b/tests/cfail/resource-alias.rs
index e1c73bb5..81eeea07 100644
--- a/tests/cfail/resource-alias.rs
+++ b/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;
diff --git a/tests/cfail/resource-not-send-sync.rs b/tests/cfail/resource-not-send-sync.rs
index 60a20db1..27e5cb05 100644
--- a/tests/cfail/resource-not-send-sync.rs
+++ b/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) {
diff --git a/tests/cfail/token-outlive.rs b/tests/cfail/token-outlive.rs
index 819a3d15..41ee827b 100644
--- a/tests/cfail/token-outlive.rs
+++ b/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;
diff --git a/tests/cfail/token-transfer.rs b/tests/cfail/token-transfer.rs
index f92e4b2b..5c6a22b1 100644
--- a/tests/cfail/token-transfer.rs
+++ b/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: {
diff --git a/tests/cfail/wrong-threshold.rs b/tests/cfail/wrong-threshold.rs
index 149f357d..86d8e262 100644
--- a/tests/cfail/wrong-threshold.rs
+++ b/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;