From 5307edce6faa5c675dc57a1dd3b4fdcbf1ebdc7d Mon Sep 17 00:00:00 2001
From: Yuki Okushi <huyuumi.dev@gmail.com>
Date: Tue, 25 Feb 2020 00:21:45 +0900
Subject: [PATCH] Tweak tests

---
 src/test/ui/assign-to-method.rs               | 24 -------------------
 src/test/ui/issues/issue-3763.rs              |  1 +
 src/test/ui/issues/issue-3763.stderr          | 10 ++++----
 src/test/ui/methods/assign-to-method.rs       | 24 +++++++++++++++++++
 .../ui/{ => methods}/assign-to-method.stderr  | 12 +++++-----
 5 files changed, 36 insertions(+), 35 deletions(-)
 delete mode 100644 src/test/ui/assign-to-method.rs
 create mode 100644 src/test/ui/methods/assign-to-method.rs
 rename src/test/ui/{ => methods}/assign-to-method.stderr (65%)

diff --git a/src/test/ui/assign-to-method.rs b/src/test/ui/assign-to-method.rs
deleted file mode 100644
index dec09625225..00000000000
--- a/src/test/ui/assign-to-method.rs
+++ /dev/null
@@ -1,24 +0,0 @@
-// compile-flags: -Zsave-analysis
-
-struct Cat {
-  meows : usize,
-
-  how_hungry : isize,
-}
-
-impl Cat {
-    pub fn speak(&self) { self.meows += 1; }
-}
-
-fn cat(in_x : usize, in_y : isize) -> Cat {
-    Cat {
-        meows: in_x,
-        how_hungry: in_y
-    }
-}
-
-fn main() {
-  let nyan : Cat = cat(52, 99);
-  nyan.speak = || println!("meow"); //~ ERROR attempted to take value of method
-  nyan.speak += || println!("meow"); //~ ERROR attempted to take value of method
-}
diff --git a/src/test/ui/issues/issue-3763.rs b/src/test/ui/issues/issue-3763.rs
index a220151c416..3494df37fe7 100644
--- a/src/test/ui/issues/issue-3763.rs
+++ b/src/test/ui/issues/issue-3763.rs
@@ -1,4 +1,5 @@
 // compile-flags: -Zsave-analysis
+// Also regression test for #69416
 
 mod my_mod {
     pub struct MyStruct {
diff --git a/src/test/ui/issues/issue-3763.stderr b/src/test/ui/issues/issue-3763.stderr
index 3db962142b5..873f69d390e 100644
--- a/src/test/ui/issues/issue-3763.stderr
+++ b/src/test/ui/issues/issue-3763.stderr
@@ -1,29 +1,29 @@
 error[E0616]: field `priv_field` of struct `my_mod::MyStruct` is private
-  --> $DIR/issue-3763.rs:17:19
+  --> $DIR/issue-3763.rs:18:19
    |
 LL |     let _woohoo = (&my_struct).priv_field;
    |                   ^^^^^^^^^^^^^^^^^^^^^^^
 
 error[E0616]: field `priv_field` of struct `my_mod::MyStruct` is private
-  --> $DIR/issue-3763.rs:20:19
+  --> $DIR/issue-3763.rs:21:19
    |
 LL |     let _woohoo = (Box::new(my_struct)).priv_field;
    |                   ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 
 error[E0624]: method `happyfun` is private
-  --> $DIR/issue-3763.rs:23:18
+  --> $DIR/issue-3763.rs:24:18
    |
 LL |     (&my_struct).happyfun();
    |                  ^^^^^^^^
 
 error[E0624]: method `happyfun` is private
-  --> $DIR/issue-3763.rs:25:27
+  --> $DIR/issue-3763.rs:26:27
    |
 LL |     (Box::new(my_struct)).happyfun();
    |                           ^^^^^^^^
 
 error[E0616]: field `priv_field` of struct `my_mod::MyStruct` is private
-  --> $DIR/issue-3763.rs:26:16
+  --> $DIR/issue-3763.rs:27:16
    |
 LL |     let nope = my_struct.priv_field;
    |                ^^^^^^^^^^^^^^^^^^^^
diff --git a/src/test/ui/methods/assign-to-method.rs b/src/test/ui/methods/assign-to-method.rs
new file mode 100644
index 00000000000..85beaee8df0
--- /dev/null
+++ b/src/test/ui/methods/assign-to-method.rs
@@ -0,0 +1,24 @@
+// compile-flags: -Zsave-analysis
+// Also regression test for #69409
+
+struct Cat {
+    meows : usize,
+    how_hungry : isize,
+}
+
+impl Cat {
+    pub fn speak(&self) { self.meows += 1; }
+}
+
+fn cat(in_x : usize, in_y : isize) -> Cat {
+    Cat {
+        meows: in_x,
+        how_hungry: in_y
+    }
+}
+
+fn main() {
+    let nyan : Cat = cat(52, 99);
+    nyan.speak = || println!("meow"); //~ ERROR attempted to take value of method
+    nyan.speak += || println!("meow"); //~ ERROR attempted to take value of method
+}
diff --git a/src/test/ui/assign-to-method.stderr b/src/test/ui/methods/assign-to-method.stderr
similarity index 65%
rename from src/test/ui/assign-to-method.stderr
rename to src/test/ui/methods/assign-to-method.stderr
index b9ef49acd6d..c0dd529b681 100644
--- a/src/test/ui/assign-to-method.stderr
+++ b/src/test/ui/methods/assign-to-method.stderr
@@ -1,16 +1,16 @@
 error[E0615]: attempted to take value of method `speak` on type `Cat`
-  --> $DIR/assign-to-method.rs:22:8
+  --> $DIR/assign-to-method.rs:22:10
    |
-LL |   nyan.speak = || println!("meow");
-   |        ^^^^^
+LL |     nyan.speak = || println!("meow");
+   |          ^^^^^
    |
    = help: methods are immutable and cannot be assigned to
 
 error[E0615]: attempted to take value of method `speak` on type `Cat`
-  --> $DIR/assign-to-method.rs:23:8
+  --> $DIR/assign-to-method.rs:23:10
    |
-LL |   nyan.speak += || println!("meow");
-   |        ^^^^^
+LL |     nyan.speak += || println!("meow");
+   |          ^^^^^
    |
    = help: methods are immutable and cannot be assigned to