Move ctor tests from methods.rs to or_fun_calls.rs

Author: Michael Wright

tests/ui/methods.rs

@@ -268,21 +268,3 @@ fn main() {
     let opt = Some(0);
     let _ = opt.unwrap();
 }
-
-struct Foo(u8);
-#[rustfmt::skip]
-fn test_or_with_ctors() {
-    let opt = Some(1);
-    let opt_opt = Some(Some(1));
-    // we also test for const promotion, this makes sure we don't hit that
-    let two = 2;
-
-    let _ = opt_opt.unwrap_or(Some(2));
-    let _ = opt_opt.unwrap_or(Some(two));
-    let _ = opt.ok_or(Some(2));
-    let _ = opt.ok_or(Some(two));
-    let _ = opt.ok_or(Foo(2));
-    let _ = opt.ok_or(Foo(two));
-    let _ = opt.or(Some(2));
-    let _ = opt.or(Some(two));
-}

tests/ui/or_fun_call.rs

@@ -70,4 +70,22 @@ fn or_fun_call() {
     let _ = opt.ok_or(format!("{} world.", hello));
 }
 
+struct Foo(u8);
+#[rustfmt::skip]
+fn test_or_with_ctors() {
+    let opt = Some(1);
+    let opt_opt = Some(Some(1));
+    // we also test for const promotion, this makes sure we don't hit that
+    let two = 2;
+
+    let _ = opt_opt.unwrap_or(Some(2));
+    let _ = opt_opt.unwrap_or(Some(two));
+    let _ = opt.ok_or(Some(2));
+    let _ = opt.ok_or(Some(two));
+    let _ = opt.ok_or(Foo(2));
+    let _ = opt.ok_or(Foo(two));
+    let _ = opt.or(Some(2));
+    let _ = opt.or(Some(two));
+}
+
 fn main() {}