Auto merge of #25117 - jooert:tests, r=alexcrichton

6 files changed, 120 insertions, 0 deletions

diff --git a/src/test/compile-fail/issue-20105.rs b/src/test/compile-fail/issue-20105.rs
new file mode 100644
index 00000000000..f133a59d722
--- /dev/null
+++ b/src/test/compile-fail/issue-20105.rs
@@ -0,0 +1,17 @@
+// Copyright 2015 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 f<F, R>(_: F) where F: Fn() -> R {
+}
+
+fn main() {
+    f(|| -> ! { () });
+//~^ ERROR: computation may converge in a function marked as diverging [E0270]
+}
diff --git a/src/test/compile-fail/issue-20862.rs b/src/test/compile-fail/issue-20862.rs
new file mode 100644
index 00000000000..72931141638
--- /dev/null
+++ b/src/test/compile-fail/issue-20862.rs
@@ -0,0 +1,23 @@
+// Copyright 2015 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 foo(x: i32) {
+    |y| x + y
+//~^ ERROR: mismatched types:
+//~| expected `()`,
+//~|     found closure
+//~| (expected (),
+//~|     found closure) [E0308]
+}
+
+fn main() {
+    let x = foo(5)(2);
+//~^ ERROR: expected function, found `()`
+}
diff --git a/src/test/compile-fail/issue-21174.rs b/src/test/compile-fail/issue-21174.rs
new file mode 100644
index 00000000000..ec258449cb1
--- /dev/null
+++ b/src/test/compile-fail/issue-21174.rs
@@ -0,0 +1,21 @@
+// Copyright 2015 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.
+
+trait Trait<'a> {
+    type A;
+    type B;
+}
+
+fn foo<'a, T: Trait<'a>>(value: T::A) {
+    let new: T::B = unsafe { std::mem::transmute(value) };
+//~^ ERROR: cannot transmute to or from a type that contains type parameters in its interior [E0139]
+}
+
+fn main() { }
diff --git a/src/test/run-pass/issue-20174.rs b/src/test/run-pass/issue-20174.rs
new file mode 100644
index 00000000000..07273881272
--- /dev/null
+++ b/src/test/run-pass/issue-20174.rs
@@ -0,0 +1,16 @@
+// Copyright 2015 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 GradFn<F: Fn() -> usize>(F);
+
+fn main() {
+    let GradFn(x_squared) : GradFn<_> = GradFn(|| -> usize { 2 });
+    let _  = x_squared();
+}
diff --git a/src/test/run-pass/issue-20186.rs b/src/test/run-pass/issue-20186.rs
new file mode 100644
index 00000000000..b3895e36a19
--- /dev/null
+++ b/src/test/run-pass/issue-20186.rs
@@ -0,0 +1,23 @@
+// Copyright 2015 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 Foo;
+
+impl Foo {
+    fn putc(&self, b: u8) { }
+
+    fn puts(&self, s: &str) {
+        for byte in s.bytes() {
+            self.putc(byte)
+        }
+    }
+}
+
+fn main() {}
diff --git a/src/test/run-pass/issue-21174.rs b/src/test/run-pass/issue-21174.rs
new file mode 100644
index 00000000000..6c0280de36d
--- /dev/null
+++ b/src/test/run-pass/issue-21174.rs
@@ -0,0 +1,20 @@
+// Copyright 2015 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.
+
+trait Trait<'a> {
+    type A;
+    type B;
+}
+
+fn foo<'a, T: Trait<'a>>(value: T::A) {
+    let new: T::B = unsafe { std::mem::transmute_copy(&value) };
+}
+
+fn main() { }