From c454e95fac0c7e68b3298ea87bd402ef954394bf Mon Sep 17 00:00:00 2001
From: Ben Blum <bblum@andrew.cmu.edu>
Date: Thu, 13 Jun 2013 19:38:36 -0400
Subject: [PATCH] Add basic test cases for closure bounds. (#3569)

---
 ...bounds-cant-promote-superkind-in-struct.rs | 20 ++++++++++++++
 ...re-bounds-copy-cant-capture-noncopyable.rs | 26 +++++++++++++++++++
 ...ure-bounds-static-cant-capture-borrowed.rs | 21 +++++++++++++++
 .../compile-fail/closure-bounds-subtype.rs    |  7 ++++-
 .../closure-bounds-can-capture-chan.rs        | 23 ++++++++++++++++
 5 files changed, 96 insertions(+), 1 deletion(-)
 create mode 100644 src/test/compile-fail/closure-bounds-cant-promote-superkind-in-struct.rs
 create mode 100644 src/test/compile-fail/closure-bounds-copy-cant-capture-noncopyable.rs
 create mode 100644 src/test/compile-fail/closure-bounds-static-cant-capture-borrowed.rs
 create mode 100644 src/test/run-pass/closure-bounds-can-capture-chan.rs

diff --git a/src/test/compile-fail/closure-bounds-cant-promote-superkind-in-struct.rs b/src/test/compile-fail/closure-bounds-cant-promote-superkind-in-struct.rs
new file mode 100644
index 00000000000..c3c8467233c
--- /dev/null
+++ b/src/test/compile-fail/closure-bounds-cant-promote-superkind-in-struct.rs
@@ -0,0 +1,20 @@
+// Copyright 2013 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.
+
+struct X {
+    field: @fn:Copy(),
+}
+
+fn foo(blk: @fn()) -> X {
+    return X { field: blk }; //~ ERROR expected bounds `Copy` but found no bounds
+}
+
+fn main() {
+}
diff --git a/src/test/compile-fail/closure-bounds-copy-cant-capture-noncopyable.rs b/src/test/compile-fail/closure-bounds-copy-cant-capture-noncopyable.rs
new file mode 100644
index 00000000000..0b11da14e71
--- /dev/null
+++ b/src/test/compile-fail/closure-bounds-copy-cant-capture-noncopyable.rs
@@ -0,0 +1,26 @@
+// Copyright 2013 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::comm;
+
+// If this were legal you could use it to copy captured noncopyables.
+// Issue (#2828)
+
+fn foo(blk: ~fn:Copy()) {
+    blk();
+}
+
+fn main() {
+    let (p,c) = comm::stream();
+    do foo {
+        c.send(()); //~ ERROR does not fulfill `Copy`
+    }
+    p.recv();
+}
diff --git a/src/test/compile-fail/closure-bounds-static-cant-capture-borrowed.rs b/src/test/compile-fail/closure-bounds-static-cant-capture-borrowed.rs
new file mode 100644
index 00000000000..cac1244a560
--- /dev/null
+++ b/src/test/compile-fail/closure-bounds-static-cant-capture-borrowed.rs
@@ -0,0 +1,21 @@
+// Copyright 2013 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.
+
+fn bar(blk: &fn:'static()) {
+}
+
+fn foo(x: &()) {
+    do bar {
+        let _ = x; //~ ERROR does not fulfill `'static`
+    }
+}
+
+fn main() {
+}
diff --git a/src/test/compile-fail/closure-bounds-subtype.rs b/src/test/compile-fail/closure-bounds-subtype.rs
index ebec113cedc..a975349e730 100644
--- a/src/test/compile-fail/closure-bounds-subtype.rs
+++ b/src/test/compile-fail/closure-bounds-subtype.rs
@@ -1,3 +1,4 @@
+
 fn take_any(_: &fn()) {
 }
 
@@ -7,6 +8,9 @@ fn take_copyable(_: &fn:Copy()) {
 fn take_copyable_owned(_: &fn:Copy+Owned()) {
 }
 
+fn take_const_owned(_: &fn:Const+Owned()) {
+}
+
 fn give_any(f: &fn()) {
     take_any(f);
     take_copyable(f); //~ ERROR expected bounds `Copy` but found no bounds
@@ -29,6 +33,7 @@ fn give_copyable_owned(f: &fn:Copy+Owned()) {
     take_any(f);
     take_copyable(f);
     take_copyable_owned(f);
+    take_const_owned(f); //~ ERROR expected bounds `Owned+Const` but found bounds `Copy+Owned`
 }
 
-fn main() {}
\ No newline at end of file
+fn main() {}
diff --git a/src/test/run-pass/closure-bounds-can-capture-chan.rs b/src/test/run-pass/closure-bounds-can-capture-chan.rs
new file mode 100644
index 00000000000..26bea0e5141
--- /dev/null
+++ b/src/test/run-pass/closure-bounds-can-capture-chan.rs
@@ -0,0 +1,23 @@
+// Copyright 2013 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::comm;
+
+fn foo(blk: ~fn:Owned()) {
+    blk();
+}
+
+fn main() {
+    let (p,c) = comm::stream();
+    do foo {
+        c.send(());
+    }
+    p.recv();
+}