nordic-dev.net/rust
nordic-dev.net/rust
2
0
Fork 0
mirror of https://github.com/rust-lang/rust.git synced 2024-11-22 06:44:35 +00:00
Code Issues Packages Projects Releases Wiki Activity

auto merge of #19250 : kmcallister/rust/atomicoption, r=alexcrichton

Browse Source 
Fixes #19247.
This commit is contained in:
bors 2014-11-24 13:56:36 +00:00
commit 377d7524a8
3 changed files with 35 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/libsync/atomic.rs
View File

@ -96,7 +96,7 @@
use alloc::boxed::Box;
use core::mem;
use core::prelude::{Drop, None, Option, Some};
use core::prelude::{Send, Drop, None, Option, Some};
pub use core::atomic::{AtomicBool, AtomicInt, AtomicUint, AtomicPtr};
pub use core::atomic::{Ordering, Relaxed, Release, Acquire, AcqRel, SeqCst};
@ -114,7 +114,7 @@ pub struct AtomicOption<T> {
p: AtomicUint,
}
impl<T> AtomicOption<T> {
impl<T: Send> AtomicOption<T> {
/// Create a new `AtomicOption`
pub fn new(p: Box<T>) -> AtomicOption<T> {
unsafe { AtomicOption { p: AtomicUint::new(mem::transmute(p)) } }
@ -170,7 +170,7 @@ impl<T> AtomicOption<T> {
}
#[unsafe_destructor]
impl<T> Drop for AtomicOption<T> {
impl<T: Send> Drop for AtomicOption<T> {
fn drop(&mut self) {
let _ = self.take(SeqCst);
}

16
src/test/compile-fail/atomicoption-not-send-ref.rs Normal file
View File

@ -0,0 +1,16 @@
// Copyright 2014 The Rust Project Developers. See the COPYRIGHT
// file at the top-level directory of this distribution and at
// http://rust-lang.org/COPYRIGHT.
//
// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
// option. This file may not be copied, modified, or distributed
// except according to those terms.
use std::sync::atomic::AtomicOption;
fn main() {
let x = 0u;
AtomicOption::new(box &x); //~ ERROR `x` does not live long enough
}

16
src/test/compile-fail/atomicoption-not-send.rs Normal file
View File

@ -0,0 +1,16 @@
// Copyright 2014 The Rust Project Developers. See the COPYRIGHT
// file at the top-level directory of this distribution and at
// http://rust-lang.org/COPYRIGHT.
//
// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
// option. This file may not be copied, modified, or distributed
// except according to those terms.
use std::kinds::marker;
use std::sync::atomic::AtomicOption;
fn main() {
AtomicOption::new(box marker::NoSend); //~ ERROR `core::kinds::Send` is not implemented
}