From 91c155bcd7af54fba0b705de1a2c2d55fa9788fa Mon Sep 17 00:00:00 2001
From: Camille GILLOT <gillot.camille@gmail.com>
Date: Tue, 27 Nov 2018 15:15:27 +0100
Subject: Change return types and check return values in tests.

This allows to verify that we handle
different types as return types,
and that we call the expected functions.
---
 src/test/run-pass/issue-18952.rs | 56 ++++++++++++++++++++++++++++++++++++++++
 src/test/run-pass/issue-45510.rs | 32 +++++++++++++++++++++++
 src/test/ui/issue-18952.rs       | 49 -----------------------------------
 src/test/ui/issue-45510.rs       | 28 --------------------
 4 files changed, 88 insertions(+), 77 deletions(-)
 create mode 100644 src/test/run-pass/issue-18952.rs
 create mode 100644 src/test/run-pass/issue-45510.rs
 delete mode 100644 src/test/ui/issue-18952.rs
 delete mode 100644 src/test/ui/issue-45510.rs

(limited to 'src/test')

diff --git a/src/test/run-pass/issue-18952.rs b/src/test/run-pass/issue-18952.rs
new file mode 100644
index 00000000000..56378b59e36
--- /dev/null
+++ b/src/test/run-pass/issue-18952.rs
@@ -0,0 +1,56 @@
+// This issue tests fn_traits overloading on arity.
+// run-pass
+
+#![feature(fn_traits)]
+#![feature(unboxed_closures)]
+
+struct Foo;
+
+impl Fn<(isize, isize)> for Foo {
+    extern "rust-call" fn call(&self, args: (isize, isize)) -> Self::Output {
+        println!("{:?}", args);
+        (args.0 + 1, args.1 + 1)
+    }
+}
+
+impl FnMut<(isize, isize)> for Foo {
+    extern "rust-call" fn call_mut(&mut self, args: (isize, isize)) -> Self::Output {
+        println!("{:?}", args);
+        (args.0 + 1, args.1 + 1)
+    }
+}
+
+impl FnOnce<(isize, isize)> for Foo {
+    type Output = (isize, isize);
+    extern "rust-call" fn call_once(self, args: (isize, isize)) -> Self::Output {
+        println!("{:?}", args);
+        (args.0 + 1, args.1 + 1)
+    }
+}
+
+impl Fn<(isize, isize, isize)> for Foo {
+    extern "rust-call" fn call(&self, args: (isize, isize, isize)) -> Self::Output {
+        println!("{:?}", args);
+        (args.0 + 3, args.1 + 3, args.2 + 3)
+    }
+}
+
+impl FnMut<(isize, isize, isize)> for Foo {
+    extern "rust-call" fn call_mut(&mut self, args: (isize, isize, isize)) -> Self::Output {
+        println!("{:?}", args);
+        (args.0 + 3, args.1 + 3, args.2 + 3)
+    }
+}
+impl FnOnce<(isize, isize, isize)> for Foo {
+    type Output = (isize, isize, isize);
+    extern "rust-call" fn call_once(self, args: (isize, isize, isize)) -> Self::Output {
+        println!("{:?}", args);
+        (args.0 + 3, args.1 + 3, args.2 + 3)
+    }
+}
+
+fn main() {
+    let foo = Foo;
+    assert_eq!(foo(1, 1), (2, 2));
+    assert_eq!(foo(1, 1, 1), (4, 4, 4));
+}
diff --git a/src/test/run-pass/issue-45510.rs b/src/test/run-pass/issue-45510.rs
new file mode 100644
index 00000000000..9e104ce6c4f
--- /dev/null
+++ b/src/test/run-pass/issue-45510.rs
@@ -0,0 +1,32 @@
+// Test overloaded resolution of fn_traits.
+// run-pass
+
+#![feature(fn_traits)]
+#![feature(unboxed_closures)]
+
+#[derive(Debug, PartialEq, Eq)]
+struct Ishmael;
+#[derive(Debug, PartialEq, Eq)]
+struct Maybe;
+struct CallMe;
+
+impl FnOnce<(Ishmael,)> for CallMe {
+    type Output = Ishmael;
+    extern "rust-call" fn call_once(self, _args: (Ishmael,)) -> Ishmael {
+        println!("Split your lungs with blood and thunder!");
+        Ishmael
+    }
+}
+
+impl FnOnce<(Maybe,)> for CallMe {
+    type Output = Maybe;
+    extern "rust-call" fn call_once(self, _args: (Maybe,)) -> Maybe {
+        println!("So we just met, and this is crazy");
+        Maybe
+    }
+}
+
+fn main() {
+    assert_eq!(CallMe(Ishmael), Ishmael);
+    assert_eq!(CallMe(Maybe), Maybe);
+}
diff --git a/src/test/ui/issue-18952.rs b/src/test/ui/issue-18952.rs
deleted file mode 100644
index 08e48c232c9..00000000000
--- a/src/test/ui/issue-18952.rs
+++ /dev/null
@@ -1,49 +0,0 @@
-// This issue tests fn_traits overloading on arity.
-// run-pass
-
-#![feature(fn_traits)]
-#![feature(unboxed_closures)]
-
-struct Foo;
-
-impl Fn<(isize, isize)> for Foo {
-    extern "rust-call" fn call(&self, args: (isize, isize)) -> Self::Output {
-        println!("{:?}", args);
-    }
-}
-
-impl FnMut<(isize, isize)> for Foo {
-    extern "rust-call" fn call_mut(&mut self, args: (isize, isize)) -> Self::Output {
-        println!("{:?}", args);
-    }
-}
-
-impl FnOnce<(isize, isize)> for Foo {
-    type Output = ();
-    extern "rust-call" fn call_once(self, args: (isize, isize)) -> Self::Output {
-        println!("{:?}", args);
-    }
-}
-
-impl Fn<(isize, isize, isize)> for Foo {
-    extern "rust-call" fn call(&self, args: (isize, isize, isize)) -> Self::Output {
-        println!("{:?}", args);
-    }
-}
-
-impl FnMut<(isize, isize, isize)> for Foo {
-    extern "rust-call" fn call_mut(&mut self, args: (isize, isize, isize)) -> Self::Output {
-        println!("{:?}", args);
-    }
-}
-impl FnOnce<(isize, isize, isize)> for Foo {
-    type Output = ();
-    extern "rust-call" fn call_once(self, args: (isize, isize, isize)) -> Self::Output {
-        println!("{:?}", args);
-    }
-}
-
-fn main() {
-    let foo = Foo;
-    foo(1, 1);
-}
diff --git a/src/test/ui/issue-45510.rs b/src/test/ui/issue-45510.rs
deleted file mode 100644
index 2fa1ee813c3..00000000000
--- a/src/test/ui/issue-45510.rs
+++ /dev/null
@@ -1,28 +0,0 @@
-// Test overloaded resolution of fn_traits.
-// run-pass
-
-#![feature(fn_traits)]
-#![feature(unboxed_closures)]
-
-struct Ishmael;
-struct Maybe;
-struct CallMe;
-
-impl FnOnce<(Ishmael,)> for CallMe {
-    type Output = ();
-    extern "rust-call" fn call_once(self, _args: (Ishmael,)) -> () {
-        println!("Split your lungs with blood and thunder!");
-    }
-}
-
-impl FnOnce<(Maybe,)> for CallMe {
-    type Output = ();
-    extern "rust-call" fn call_once(self, _args: (Maybe,)) -> () {
-        println!("So we just met, and this is crazy");
-    }
-}
-
-fn main() {
-    CallMe(Ishmael);
-    CallMe(Maybe);
-}
-- 
cgit 1.4.1-3-g733a5