Merging upstream version 1.68.2+dfsg1.

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

1 files changed, 0 insertions, 34 deletions

diff --git a/src/test/ui/issues/issue-3979.rs b/src/test/ui/issues/issue-3979.rs
deleted file mode 100644
index 72949d8c7..000000000
--- a/src/test/ui/issues/issue-3979.rs
+++ /dev/null
@@ -1,34 +0,0 @@
-// run-pass
-#![allow(dead_code)]
-#![allow(non_snake_case)]
-
-trait Positioned {
-  fn SetX(&mut self, _: isize);
-  fn X(&self) -> isize;
-}
-
-trait Movable: Positioned {
-  fn translate(&mut self, dx: isize) {
-    let x = self.X();
-    self.SetX(x + dx);
-  }
-}
-
-struct Point { x: isize, y: isize }
-
-impl Positioned for Point {
-    fn SetX(&mut self, x: isize) {
-        self.x = x;
-    }
-    fn X(&self) -> isize {
-        self.x
-    }
-}
-
-impl Movable for Point {}
-
-pub fn main() {
-    let mut p = Point{ x: 1, y: 2};
-    p.translate(3);
-    assert_eq!(p.X(), 4);
-}