Merging upstream version 1.68.2+dfsg1.

Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>

1 files changed, 0 insertions, 26 deletions

diff --git a/src/test/ui/borrowck/issue-25793.rs b/src/test/ui/borrowck/issue-25793.rs
deleted file mode 100644
index 6c8dacc22..000000000
--- a/src/test/ui/borrowck/issue-25793.rs
+++ /dev/null
@@ -1,26 +0,0 @@
-#![feature(rustc_attrs)]
-macro_rules! width(
-    ($this:expr) => {
-        $this.width.unwrap()
-        //~^ ERROR cannot use `self.width` because it was mutably borrowed
-    }
-);
-
-struct HasInfo {
-    width: Option<usize>
-}
-
-impl HasInfo {
-    fn get_size(&mut self, n: usize) -> usize {
-        n
-    }
-
-    fn get_other(&mut self) -> usize {
-        let r = &mut *self;
-        r.get_size(width!(self))
-    }
-    // Above is like `self.get_size(width!(self))`, but it
-    // deliberately avoids NLL's two phase borrow feature.
-}
-
-fn main() { }