Merge pull request #206 from farcaller/fix_nightly

Changed Unsafe -> UnsafeCell; removed Share

Author: bgamari

src/zinc/os/cond_var.rs

@@ -22,7 +22,7 @@ mod internal {
   use core::option::{None, Some};
   use core::ty::Unsafe;
   use core::kinds::marker;
-  use core::kinds::Share;
+  use core::kinds::Sync;
 
   use hal::cortex_m3::sched::NoInterrupts;
   use util::queue::{Queue, Node};
@@ -87,13 +87,13 @@ mod internal {
     }
   }
 
-  impl Share for CondVar {}
+  impl Sync for CondVar {}
 }
 
 #[cfg(not(multitasking))]
 mod internal {
   use core::kinds::marker;
-  use core::kinds::Share;
+  use core::kinds::Sync;
   use core::cell::UnsafeCell;
 
   use util::support::wfi;
@@ -143,5 +143,5 @@ mod internal {
     }
   }
 
-  impl Share for CondVar {}
+  impl Sync for CondVar {}
 }

src/zinc/os/mutex.rs

@@ -21,7 +21,7 @@ pub use os::mutex::internal::{MUTEX_INIT, Mutex, Guard};
 mod internal {
   use core::kinds::marker;
   use core::ty::Unsafe;
-  use core::kinds::{Share};
+  use core::kinds::Sync;
   use core::option::{Option, None, Some};
   use core::ops::Drop;
 
@@ -137,12 +137,12 @@ mod internal {
     }
   }
 
-  impl Share for Mutex { }
+  impl Sync for Mutex { }
 }
 
 #[cfg(not(multitasking))]
 mod internal {
-  use core::kinds::{Share};
+  use core::kinds::Sync;
   use core::option::{Option, None, Some};
   use core::ops::Drop;
   use core::intrinsics::abort;
@@ -202,5 +202,5 @@ mod internal {
     }
   }
 
-  impl Share for Mutex { }
+  impl Sync for Mutex { }
 }

src/zinc/util/shared.rs

@@ -15,9 +15,9 @@
 
 //! Concurrency-friendly shared state
 
-use core::ty::Unsafe;
+use core::cell::UnsafeCell;
 use core::ops::{Deref, DerefMut};
-use core::kinds::{Share, Send};
+use core::kinds::{Sync, Send};
 use core::kinds::marker;
 
 use hal::cortex_m3::irq::NoInterrupts;
@@ -26,7 +26,7 @@ use hal::cortex_m3::irq::NoInterrupts;
 /// when in a critical section.
 #[allow(missing_doc)]
 pub struct Shared<T> {
-  pub value: Unsafe<T>,
+  pub value: UnsafeCell<T>,
   pub invariant: marker::InvariantType<T>,
 }
 
@@ -41,7 +41,7 @@ impl<T> Shared<T> {
   /// Create a new `Shared` value
   pub fn new(value: T) -> Shared<T> {
     Shared {
-      value: Unsafe::new(value),
+      value: UnsafeCell::new(value),
       invariant: marker::InvariantType,
     }
   }
@@ -68,4 +68,4 @@ impl<'a, T> DerefMut<T> for SharedRef<'a, T> {
   }
 }
 
-impl<T: Send> Share for Shared<T> {}
+impl<T: Send> Sync for Shared<T> {}