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>

18 files changed, 8 insertions, 24 deletions

diff --git a/tests/cfail/critical-section.rs b/tests/cfail/critical-section.rs
index 6571978..c0f475c 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 82b7ac6..885c961 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 e2e749a..b4e025f 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 79fe99b..ef20e1a 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 4e2ed4a..5b29f30 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 391c543..a93e840 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 d2823e3..057a2ee 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 7c345a1..522763a 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 a1059f3..5235d93 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 eb03b7d..9cb0f3e 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 3528ec6..7f3790a 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 15f6b7a..d63b9d0 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 e879511..476b7a0 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 e1c73bb..81eeea0 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 60a20db..27e5cb0 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 819a3d1..41ee827 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 f92e4b2..5c6a22b 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 149f357..86d8e26 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;