Merging upstream version 1.68.2+dfsg1.

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

1 files changed, 0 insertions, 15 deletions

diff --git a/src/test/ui/issues/auxiliary/issue-3979-traits.rs b/src/test/ui/issues/auxiliary/issue-3979-traits.rs
deleted file mode 100644
index 5d03a0e9e..000000000
--- a/src/test/ui/issues/auxiliary/issue-3979-traits.rs
+++ /dev/null
@@ -1,15 +0,0 @@
-#![crate_name="issue_3979_traits"]
-
-#![crate_type = "lib"]
-
-pub trait Positioned {
-  fn SetX(&mut self, _: isize);
-  fn X(&self) -> isize;
-}
-
-pub trait Movable: Positioned {
-  fn translate(&mut self, dx: isize) {
-    let x = self.X() + dx;
-    self.SetX(x);
-  }
-}