Skip to content

Commit 5a1bc63

Browse files
committed
Updated for removal of NoCopy marker in nightly
(rust-lang/rust#27684)
1 parent f2425e2 commit 5a1bc63

File tree

1 file changed

+1
-6
lines changed

1 file changed

+1
-6
lines changed

src/os/cond_var.rs

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,6 @@ pub use os::cond_var::internal::{CondVar, COND_VAR_INIT};
2121
mod internal {
2222
use core::option::{None, Some};
2323
use core::ty::Unsafe;
24-
use core::marker;
2524
use core::marker::Sync;
2625

2726
use hal::cortex_m3::sched::NoInterrupts;
@@ -92,7 +91,6 @@ mod internal {
9291

9392
#[cfg(not(multitasking))]
9493
mod internal {
95-
use core::marker;
9694
use core::marker::Sync;
9795
use core::cell::UnsafeCell;
9896

@@ -101,21 +99,18 @@ mod internal {
10199
/// A condition variable
102100
pub struct CondVar {
103101
waiting: UnsafeCell<bool>,
104-
nocopy: marker::NoCopy
105102
}
106103

107104
/// Static initializer
108105
pub const COND_VAR_INIT: CondVar = CondVar {
109-
waiting: UnsafeCell { value: false },
110-
nocopy: marker::NoCopy,
106+
waiting: UnsafeCell::new(false),
111107
};
112108

113109
impl CondVar {
114110
/// Create a new condition variable
115111
pub fn new() -> CondVar {
116112
CondVar {
117113
waiting: UnsafeCell::new(false),
118-
nocopy: marker::NoCopy,
119114
}
120115
}
121116

0 commit comments

Comments
 (0)