From 688852047c812007280ad4abb08323bc4a5d44d3 Mon Sep 17 00:00:00 2001
From: Isaac van Bakel <ivb@vanbakel.io>
Date: Thu, 27 Jul 2017 02:43:11 +0100
Subject: [PATCH] Added tests for new loop borrow message

One set of tests is to ensure the current message is correct.
The other set is to check the messages are generated correctly for every
type of loop.
---
 src/test/ui/borrowck/mut-borrow-in-loop.rs    | 40 +++++++++++++++++++
 .../ui/borrowck/mut-borrow-in-loop.stderr     | 29 ++++++++++++++
 .../ui/borrowck/mut-borrow-outside-loop.rs    | 26 ++++++++++++
 .../borrowck/mut-borrow-outside-loop.stderr   | 23 +++++++++++
 4 files changed, 118 insertions(+)
 create mode 100644 src/test/ui/borrowck/mut-borrow-in-loop.rs
 create mode 100644 src/test/ui/borrowck/mut-borrow-in-loop.stderr
 create mode 100644 src/test/ui/borrowck/mut-borrow-outside-loop.rs
 create mode 100644 src/test/ui/borrowck/mut-borrow-outside-loop.stderr

diff --git a/src/test/ui/borrowck/mut-borrow-in-loop.rs b/src/test/ui/borrowck/mut-borrow-in-loop.rs
new file mode 100644
index 00000000000..addda427753
--- /dev/null
+++ b/src/test/ui/borrowck/mut-borrow-in-loop.rs
@@ -0,0 +1,40 @@
+// Copyright 2017 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.
+
+// produce special borrowck message inside all kinds of loops
+
+struct FuncWrapper<'a, T : 'a> {
+    func : fn(&'a mut T) -> ()
+}
+
+impl<'a, T : 'a> FuncWrapper<'a, T> {
+    fn in_loop(self, arg : &'a mut T) {
+        loop {
+            (self.func)(arg)
+        }
+    }
+
+    fn in_while(self, arg : &'a mut T) {
+        while true {
+            (self.func)(arg)
+        }
+    }
+
+    fn in_for(self, arg : &'a mut T) {
+        let v : Vec<()> = vec![];
+        for _ in v.iter() {
+            (self.func)(arg)
+        }
+    }
+}
+
+fn main() {
+}
+
diff --git a/src/test/ui/borrowck/mut-borrow-in-loop.stderr b/src/test/ui/borrowck/mut-borrow-in-loop.stderr
new file mode 100644
index 00000000000..a34d524d28f
--- /dev/null
+++ b/src/test/ui/borrowck/mut-borrow-in-loop.stderr
@@ -0,0 +1,29 @@
+error[E0499]: cannot borrow `*arg` as mutable more than once at a time
+  --> $DIR/mut-borrow-in-loop.rs:20:25
+   |
+20 |             (self.func)(arg)
+   |                         ^^^ mutable borrow starts here in previous iteration of loop
+21 |         }
+22 |     }
+   |     - mutable borrow ends here
+
+error[E0499]: cannot borrow `*arg` as mutable more than once at a time
+  --> $DIR/mut-borrow-in-loop.rs:26:25
+   |
+26 |             (self.func)(arg)
+   |                         ^^^ mutable borrow starts here in previous iteration of loop
+27 |         }
+28 |     }
+   |     - mutable borrow ends here
+
+error[E0499]: cannot borrow `*arg` as mutable more than once at a time
+  --> $DIR/mut-borrow-in-loop.rs:33:25
+   |
+33 |             (self.func)(arg)
+   |                         ^^^ mutable borrow starts here in previous iteration of loop
+34 |         }
+35 |     }
+   |     - mutable borrow ends here
+
+error: aborting due to 3 previous errors
+
diff --git a/src/test/ui/borrowck/mut-borrow-outside-loop.rs b/src/test/ui/borrowck/mut-borrow-outside-loop.rs
new file mode 100644
index 00000000000..97092b7f9d7
--- /dev/null
+++ b/src/test/ui/borrowck/mut-borrow-outside-loop.rs
@@ -0,0 +1,26 @@
+// Copyright 2017 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.
+
+// ensure borrowck messages are correct outside special case
+
+fn main() {
+    let mut void = ();
+
+    let first = &mut void;
+    let second = &mut void;
+
+    loop {
+        let mut inner_void = ();
+
+        let inner_first = &mut inner_void;
+        let inner_second = &mut inner_void;
+    }
+}
+
diff --git a/src/test/ui/borrowck/mut-borrow-outside-loop.stderr b/src/test/ui/borrowck/mut-borrow-outside-loop.stderr
new file mode 100644
index 00000000000..02b32dc363a
--- /dev/null
+++ b/src/test/ui/borrowck/mut-borrow-outside-loop.stderr
@@ -0,0 +1,23 @@
+error[E0499]: cannot borrow `void` as mutable more than once at a time
+  --> $DIR/mut-borrow-outside-loop.rs:17:23
+   |
+16 |     let first = &mut void;
+   |                      ---- first mutable borrow occurs here
+17 |     let second = &mut void;
+   |                       ^^^^ second mutable borrow occurs here
+...
+25 | }
+   | - first borrow ends here
+
+error[E0499]: cannot borrow `inner_void` as mutable more than once at a time
+  --> $DIR/mut-borrow-outside-loop.rs:23:33
+   |
+22 |         let inner_first = &mut inner_void;
+   |                                ---------- first mutable borrow occurs here
+23 |         let inner_second = &mut inner_void;
+   |                                 ^^^^^^^^^^ second mutable borrow occurs here
+24 |     }
+   |     - first borrow ends here
+
+error: aborting due to 2 previous errors
+
-- 
GitLab