aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--.travis.yml5
-rw-r--r--examples/full-syntax.rs1
-rw-r--r--examples/generics.rs1
-rw-r--r--examples/late-resources.rs1
-rw-r--r--examples/nested.rs1
-rw-r--r--examples/one-task.rs1
-rw-r--r--examples/preemption.rs1
-rw-r--r--examples/two-tasks.rs1
-rw-r--r--examples/zero-tasks.rs1
-rw-r--r--macros/src/trans.rs8
-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.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.rs1
-rw-r--r--tests/cfail/priority-too-low.rs1
-rw-r--r--tests/cfail/resource-alias.rs1
-rw-r--r--tests/cfail/resource-not-send.rs53
-rw-r--r--tests/cfail/token-outlive.rs1
-rw-r--r--tests/cfail/token-transfer.rs1
-rw-r--r--tests/cfail/wrong-threshold.rs1
26 files changed, 86 insertions, 3 deletions
diff --git a/.travis.yml b/.travis.yml
index 094e996..59a66b4 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -51,7 +51,10 @@ script:
after_script: set +e
-cache: cargo
+cache:
+ cargo: true
+ directories:
+ - $HOME/.xargo
before_cache:
- chmod -R a+r $HOME/.cargo
diff --git a/examples/full-syntax.rs b/examples/full-syntax.rs
index 9b6b394..a8f79a7 100644
--- a/examples/full-syntax.rs
+++ b/examples/full-syntax.rs
@@ -1,5 +1,6 @@
//! A showcase of the `app!` macro syntax
#![deny(unsafe_code)]
+#![deny(warnings)]
#![feature(proc_macro)]
#![no_std]
diff --git a/examples/generics.rs b/examples/generics.rs
index bc2fe7a..7cf9257 100644
--- a/examples/generics.rs
+++ b/examples/generics.rs
@@ -1,5 +1,6 @@
//! Working with resources in a generic fashion
#![deny(unsafe_code)]
+#![deny(warnings)]
#![feature(proc_macro)]
#![no_std]
diff --git a/examples/late-resources.rs b/examples/late-resources.rs
index 69a0ce8..d42431c 100644
--- a/examples/late-resources.rs
+++ b/examples/late-resources.rs
@@ -1,6 +1,7 @@
//! Demonstrates initialization of resources in `init`.
#![deny(unsafe_code)]
+#![deny(warnings)]
#![feature(proc_macro)]
#![no_std]
diff --git a/examples/nested.rs b/examples/nested.rs
index 1c164f8..d2309f3 100644
--- a/examples/nested.rs
+++ b/examples/nested.rs
@@ -3,6 +3,7 @@
//! If you run this program you'll hit the breakpoints as indicated by the
//! letters in the comments: A, then B, then C, etc.
#![deny(unsafe_code)]
+#![deny(warnings)]
#![feature(proc_macro)]
#![no_std]
diff --git a/examples/one-task.rs b/examples/one-task.rs
index 38f0135..2e77676 100644
--- a/examples/one-task.rs
+++ b/examples/one-task.rs
@@ -1,5 +1,6 @@
//! An application with one task
#![deny(unsafe_code)]
+#![deny(warnings)]
#![feature(proc_macro)]
#![no_std]
diff --git a/examples/preemption.rs b/examples/preemption.rs
index 5fda37d..98dde8d 100644
--- a/examples/preemption.rs
+++ b/examples/preemption.rs
@@ -1,5 +1,6 @@
//! Two tasks running at *different* priorities with access to the same resource
#![deny(unsafe_code)]
+#![deny(warnings)]
#![feature(proc_macro)]
#![no_std]
diff --git a/examples/two-tasks.rs b/examples/two-tasks.rs
index 2200e5b..df6e784 100644
--- a/examples/two-tasks.rs
+++ b/examples/two-tasks.rs
@@ -1,5 +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]
diff --git a/examples/zero-tasks.rs b/examples/zero-tasks.rs
index 58e6afc..b1ebab6 100644
--- a/examples/zero-tasks.rs
+++ b/examples/zero-tasks.rs
@@ -1,5 +1,6 @@
//! Minimal example with zero tasks
#![deny(unsafe_code)]
+#![deny(warnings)]
// IMPORTANT always include this feature gate
#![feature(proc_macro)]
#![no_std]
diff --git a/macros/src/trans.rs b/macros/src/trans.rs
index 96631d5..77eada4 100644
--- a/macros/src/trans.rs
+++ b/macros/src/trans.rs
@@ -438,12 +438,14 @@ fn resources(app: &App, ownerships: &Ownerships, root: &mut Vec<Tokens>) {
items.push(quote! {
#[allow(non_camel_case_types)]
- pub struct #name { _0: () }
+ pub struct #name { _0: PhantomData<*const ()> }
+
+ unsafe impl Sync for #name {}
#[allow(unsafe_code)]
impl #name {
pub unsafe fn new() -> Self {
- #name { _0: () }
+ #name { _0: PhantomData }
}
}
});
@@ -455,6 +457,8 @@ fn resources(app: &App, ownerships: &Ownerships, root: &mut Vec<Tokens>) {
root.push(quote! {
#[allow(unsafe_code)]
mod _resource {
+ use core::marker::PhantomData;
+
#(#items)*
}
})
diff --git a/tests/cfail/critical-section.rs b/tests/cfail/critical-section.rs
index 728388e..6571978 100644
--- a/tests/cfail/critical-section.rs
+++ b/tests/cfail/critical-section.rs
@@ -1,3 +1,4 @@
+#![deny(unsafe_code)]
#![deny(warnings)]
#![feature(const_fn)]
#![feature(proc_macro)]
diff --git a/tests/cfail/duplicated-task.rs b/tests/cfail/duplicated-task.rs
index d91f09b..82b7ac6 100644
--- a/tests/cfail/duplicated-task.rs
+++ b/tests/cfail/duplicated-task.rs
@@ -1,3 +1,4 @@
+#![deny(unsafe_code)]
#![deny(warnings)]
#![feature(proc_macro)]
#![no_std]
diff --git a/tests/cfail/exception.rs b/tests/cfail/exception.rs
index 065ccad..e2e749a 100644
--- a/tests/cfail/exception.rs
+++ b/tests/cfail/exception.rs
@@ -1,3 +1,4 @@
+#![deny(unsafe_code)]
#![deny(warnings)]
#![feature(proc_macro)]
#![no_std]
diff --git a/tests/cfail/idle.rs b/tests/cfail/idle.rs
index a362ec7..79fe99b 100644
--- a/tests/cfail/idle.rs
+++ b/tests/cfail/idle.rs
@@ -1,3 +1,4 @@
+#![deny(unsafe_code)]
#![deny(warnings)]
#![feature(proc_macro)]
#![no_std]
diff --git a/tests/cfail/init.rs b/tests/cfail/init.rs
index 73643b1..d2823e3 100644
--- a/tests/cfail/init.rs
+++ b/tests/cfail/init.rs
@@ -1,3 +1,4 @@
+#![deny(unsafe_code)]
#![deny(warnings)]
#![feature(proc_macro)]
#![no_std]
diff --git a/tests/cfail/interrupt.rs b/tests/cfail/interrupt.rs
index b913d83..e3ef2e8 100644
--- a/tests/cfail/interrupt.rs
+++ b/tests/cfail/interrupt.rs
@@ -1,3 +1,4 @@
+#![deny(unsafe_code)]
#![deny(warnings)]
#![feature(proc_macro)]
#![no_std]
diff --git a/tests/cfail/late-resource-init.rs b/tests/cfail/late-resource-init.rs
index cb37887..a1059f3 100644
--- a/tests/cfail/late-resource-init.rs
+++ b/tests/cfail/late-resource-init.rs
@@ -1,3 +1,4 @@
+#![deny(unsafe_code)]
#![deny(warnings)]
#![feature(proc_macro)]
#![no_std]
diff --git a/tests/cfail/lock.rs b/tests/cfail/lock.rs
index e0e37e0..5630649 100644
--- a/tests/cfail/lock.rs
+++ b/tests/cfail/lock.rs
@@ -1,3 +1,4 @@
+#![deny(unsafe_code)]
#![deny(warnings)]
#![feature(const_fn)]
#![feature(proc_macro)]
diff --git a/tests/cfail/peripheral-alias.rs b/tests/cfail/peripheral-alias.rs
index 042666a..3528ec6 100644
--- a/tests/cfail/peripheral-alias.rs
+++ b/tests/cfail/peripheral-alias.rs
@@ -1,3 +1,4 @@
+#![deny(unsafe_code)]
#![deny(warnings)]
#![feature(proc_macro)]
#![no_std]
diff --git a/tests/cfail/priority-too-high.rs b/tests/cfail/priority-too-high.rs
index c139471..5c35377 100644
--- a/tests/cfail/priority-too-high.rs
+++ b/tests/cfail/priority-too-high.rs
@@ -1,3 +1,4 @@
+#![deny(unsafe_code)]
#![deny(warnings)]
#![feature(proc_macro)]
#![no_std]
diff --git a/tests/cfail/priority-too-low.rs b/tests/cfail/priority-too-low.rs
index cefd342..2be2254 100644
--- a/tests/cfail/priority-too-low.rs
+++ b/tests/cfail/priority-too-low.rs
@@ -1,3 +1,4 @@
+#![deny(unsafe_code)]
#![deny(warnings)]
#![feature(proc_macro)]
#![no_std]
diff --git a/tests/cfail/resource-alias.rs b/tests/cfail/resource-alias.rs
index 788af6f..e1c73bb 100644
--- a/tests/cfail/resource-alias.rs
+++ b/tests/cfail/resource-alias.rs
@@ -1,3 +1,4 @@
+#![deny(unsafe_code)]
#![deny(warnings)]
#![feature(proc_macro)]
#![no_std]
diff --git a/tests/cfail/resource-not-send.rs b/tests/cfail/resource-not-send.rs
new file mode 100644
index 0000000..c89c3d3
--- /dev/null
+++ b/tests/cfail/resource-not-send.rs
@@ -0,0 +1,53 @@
+#![deny(unsafe_code)]
+#![deny(warnings)]
+#![feature(const_fn)]
+#![feature(proc_macro)]
+#![no_std]
+
+extern crate cortex_m_rtfm as rtfm;
+extern crate stm32f103xx;
+
+use rtfm::{app, Resource, Threshold};
+
+app! {
+ device: stm32f103xx,
+
+ resources: {
+ static SHARED: bool = false;
+ },
+
+ tasks: {
+ EXTI0: {
+ path: exti0,
+ priority: 1,
+ resources: [SHARED],
+ },
+
+ EXTI1: {
+ path: exti1,
+ priority: 2,
+ resources: [SHARED],
+ },
+ },
+}
+
+fn init(_p: init::Peripherals, _r: init::Resources) {}
+
+fn idle() -> ! {
+ loop {}
+}
+
+fn is_send<T>(_: &T) where T: Send {}
+fn is_sync<T>(_: &T) where T: Sync {}
+
+fn exti0(_t: &mut Threshold, r: EXTI0::Resources) {
+ // OK
+ is_sync(&r.SHARED);
+
+ // ERROR resource proxies are not `Send`able across tasks
+ is_send(&r.SHARED);
+ //~^ error the trait bound `*const (): core::marker::Send` is not satisfied
+}
+
+fn exti1(_t: &mut Threshold, _r: EXTI1::Resources) {
+}
diff --git a/tests/cfail/token-outlive.rs b/tests/cfail/token-outlive.rs
index 31231b7..819a3d1 100644
--- a/tests/cfail/token-outlive.rs
+++ b/tests/cfail/token-outlive.rs
@@ -1,3 +1,4 @@
+#![deny(unsafe_code)]
#![deny(warnings)]
#![feature(const_fn)]
#![feature(proc_macro)]
diff --git a/tests/cfail/token-transfer.rs b/tests/cfail/token-transfer.rs
index 38e8786..bc62052 100644
--- a/tests/cfail/token-transfer.rs
+++ b/tests/cfail/token-transfer.rs
@@ -1,3 +1,4 @@
+#![deny(unsafe_code)]
#![deny(warnings)]
#![feature(const_fn)]
#![feature(proc_macro)]
diff --git a/tests/cfail/wrong-threshold.rs b/tests/cfail/wrong-threshold.rs
index b974071..149f357 100644
--- a/tests/cfail/wrong-threshold.rs
+++ b/tests/cfail/wrong-threshold.rs
@@ -1,3 +1,4 @@
+#![deny(unsafe_code)]
#![deny(warnings)]
#![feature(proc_macro)]
#![no_std]
generated by cgit v1.2.3 (git 2.25.1) at 2025-12-27 00:35:33 +0000