Fix for hiding of UnsafeCell "value"

See rust-lang/rust#25867
mokus0 · Aug 16, 2015 · adf02aa · adf02aa
1 parent 5a1bc63
commit adf02aa
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 4 deletions.
diff --git a/src/lib.rs b/src/lib.rs
@@ -16,6 +16,7 @@
 #![feature(asm, lang_items, plugin, range_inclusive)]
 #![feature(core, core_intrinsics, core_prelude, core_slice_ext, core_str_ext)]
 #![allow(improper_ctypes)]
+#![feature(const_fn)]
 #![deny(missing_docs)]
 #![no_std]
 

diff --git a/src/os/mutex.rs b/src/os/mutex.rs
@@ -37,10 +37,10 @@ mod internal {
 
   /// Static initializer
   pub const MUTEX_INIT: Mutex = Mutex {
-    owner: UnsafeCell {value: None},
+    owner: UnsafeCell::new(None),
     waiting: Queue {
-      head: UnsafeCell {value: 0 as *mut Node<*mut TaskDescriptor>,},
-      tail: UnsafeCell {value: 0 as *mut Node<*mut TaskDescriptor>,},
+      head: UnsafeCell::new(0 as *mut Node<*mut TaskDescriptor>),
+      tail: UnsafeCell::new(0 as *mut Node<*mut TaskDescriptor>),
     }
   };
 
@@ -153,7 +153,7 @@ mod internal {
   }
 
   /// Static initializer
-  pub const MUTEX_INIT: Mutex = Mutex { taken: UnsafeCell { value: false  } };
+  pub const MUTEX_INIT: Mutex = Mutex { taken: UnsafeCell::new(false) };
 
   /// A mutex lock
   #[must_use]