From 26c93433dafaabfd6f61d15c03fde68c9f214bf5 Mon Sep 17 00:00:00 2001
From: Keegan McAllister <kmcallister@mozilla.com>
Date: Sun, 23 Nov 2014 10:21:47 -0800
Subject: Require <T: Send> for AtomicOption

Fixes #19247.
---
 src/test/compile-fail/atomicoption-not-send-ref.rs | 16 ++++++++++++++++
 src/test/compile-fail/atomicoption-not-send.rs     | 16 ++++++++++++++++
 2 files changed, 32 insertions(+)
 create mode 100644 src/test/compile-fail/atomicoption-not-send-ref.rs
 create mode 100644 src/test/compile-fail/atomicoption-not-send.rs

(limited to 'src/test')

diff --git a/src/test/compile-fail/atomicoption-not-send-ref.rs b/src/test/compile-fail/atomicoption-not-send-ref.rs
new file mode 100644
index 00000000000..15c726be2fd
--- /dev/null
+++ b/src/test/compile-fail/atomicoption-not-send-ref.rs
@@ -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
+}
diff --git a/src/test/compile-fail/atomicoption-not-send.rs b/src/test/compile-fail/atomicoption-not-send.rs
new file mode 100644
index 00000000000..df3ebf530df
--- /dev/null
+++ b/src/test/compile-fail/atomicoption-not-send.rs
@@ -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
+}
-- 
cgit 1.4.1-3-g733a5