Auto merge of #56 - japaric:not-send, r=japaric

make resource proxies !Send

None

.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
 

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]
 

examples/generics.rs

@@ -1,5 +1,6 @@
 //! Working with resources in a generic fashion
 #![deny(unsafe_code)]
+#![deny(warnings)]
 #![feature(proc_macro)]
 #![no_std]
 

examples/late-resources.rs

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

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]
 

examples/one-task.rs

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

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]
 

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]
 

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]

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)*
             }
         })

tests/cfail/critical-section.rs

@@ -1,3 +1,4 @@
+#![deny(unsafe_code)]
 #![deny(warnings)]
 #![feature(const_fn)]
 #![feature(proc_macro)]

tests/cfail/duplicated-task.rs

@@ -1,3 +1,4 @@
+#![deny(unsafe_code)]
 #![deny(warnings)]
 #![feature(proc_macro)]
 #![no_std]

tests/cfail/exception.rs

@@ -1,3 +1,4 @@
+#![deny(unsafe_code)]
 #![deny(warnings)]
 #![feature(proc_macro)]
 #![no_std]

tests/cfail/idle.rs

@@ -1,3 +1,4 @@
+#![deny(unsafe_code)]
 #![deny(warnings)]
 #![feature(proc_macro)]
 #![no_std]

tests/cfail/init.rs

@@ -1,3 +1,4 @@
+#![deny(unsafe_code)]
 #![deny(warnings)]
 #![feature(proc_macro)]
 #![no_std]

tests/cfail/interrupt.rs

@@ -1,3 +1,4 @@
+#![deny(unsafe_code)]
 #![deny(warnings)]
 #![feature(proc_macro)]
 #![no_std]

tests/cfail/late-resource-init.rs

@@ -1,3 +1,4 @@
+#![deny(unsafe_code)]
 #![deny(warnings)]
 #![feature(proc_macro)]
 #![no_std]

tests/cfail/lock.rs

@@ -1,3 +1,4 @@
+#![deny(unsafe_code)]
 #![deny(warnings)]
 #![feature(const_fn)]
 #![feature(proc_macro)]

tests/cfail/peripheral-alias.rs

@@ -1,3 +1,4 @@
+#![deny(unsafe_code)]
 #![deny(warnings)]
 #![feature(proc_macro)]
 #![no_std]

tests/cfail/priority-too-high.rs

@@ -1,3 +1,4 @@
+#![deny(unsafe_code)]
 #![deny(warnings)]
 #![feature(proc_macro)]
 #![no_std]

tests/cfail/priority-too-low.rs

@@ -1,3 +1,4 @@
+#![deny(unsafe_code)]
 #![deny(warnings)]
 #![feature(proc_macro)]
 #![no_std]

tests/cfail/resource-alias.rs

@@ -1,3 +1,4 @@
+#![deny(unsafe_code)]
 #![deny(warnings)]
 #![feature(proc_macro)]
 #![no_std]

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) {
+}

tests/cfail/token-outlive.rs

@@ -1,3 +1,4 @@
+#![deny(unsafe_code)]
 #![deny(warnings)]
 #![feature(const_fn)]
 #![feature(proc_macro)]

tests/cfail/token-transfer.rs

@@ -1,3 +1,4 @@
+#![deny(unsafe_code)]
 #![deny(warnings)]
 #![feature(const_fn)]
 #![feature(proc_macro)]

tests/cfail/wrong-threshold.rs

@@ -1,3 +1,4 @@
+#![deny(unsafe_code)]
 #![deny(warnings)]
 #![feature(proc_macro)]
 #![no_std]