From 218caa410aa38c29984be31a5229b9fa717560ee Mon Sep 17 00:00:00 2001
From: Daniel Baumann <daniel.baumann@progress-linux.org>
Date: Wed, 17 Apr 2024 14:19:13 +0200
Subject: Merging upstream version 1.68.2+dfsg1.

Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>
---
 src/test/ui/methods/auxiliary/ambig_impl_2_lib.rs  |  4 --
 .../ui/methods/auxiliary/macro-in-other-crate.rs   |  9 ----
 src/test/ui/methods/auxiliary/method_self_arg1.rs  | 35 ---------------
 src/test/ui/methods/auxiliary/method_self_arg2.rs  | 52 ----------------------
 4 files changed, 100 deletions(-)
 delete mode 100644 src/test/ui/methods/auxiliary/ambig_impl_2_lib.rs
 delete mode 100644 src/test/ui/methods/auxiliary/macro-in-other-crate.rs
 delete mode 100644 src/test/ui/methods/auxiliary/method_self_arg1.rs
 delete mode 100644 src/test/ui/methods/auxiliary/method_self_arg2.rs

(limited to 'src/test/ui/methods/auxiliary')

diff --git a/src/test/ui/methods/auxiliary/ambig_impl_2_lib.rs b/src/test/ui/methods/auxiliary/ambig_impl_2_lib.rs
deleted file mode 100644
index 0ed68bf69..000000000
--- a/src/test/ui/methods/auxiliary/ambig_impl_2_lib.rs
+++ /dev/null
@@ -1,4 +0,0 @@
-pub trait Me {
-    fn me(&self) -> usize;
-}
-impl Me for usize { fn me(&self) -> usize { *self } }
diff --git a/src/test/ui/methods/auxiliary/macro-in-other-crate.rs b/src/test/ui/methods/auxiliary/macro-in-other-crate.rs
deleted file mode 100644
index feda08463..000000000
--- a/src/test/ui/methods/auxiliary/macro-in-other-crate.rs
+++ /dev/null
@@ -1,9 +0,0 @@
-#[macro_export]
-macro_rules! mac {
-    ($ident:ident) => { let $ident = 42; }
-}
-
-#[macro_export]
-macro_rules! inline {
-    () => ()
-}
diff --git a/src/test/ui/methods/auxiliary/method_self_arg1.rs b/src/test/ui/methods/auxiliary/method_self_arg1.rs
deleted file mode 100644
index f89019fe5..000000000
--- a/src/test/ui/methods/auxiliary/method_self_arg1.rs
+++ /dev/null
@@ -1,35 +0,0 @@
-#![crate_type = "lib"]
-
-static mut COUNT: u64 = 1;
-
-pub fn get_count() -> u64 { unsafe { COUNT } }
-
-#[derive(Copy, Clone)]
-pub struct Foo;
-
-impl Foo {
-    pub fn foo(self, x: &Foo) {
-        unsafe { COUNT *= 2; }
-        // Test internal call.
-        Foo::bar(&self);
-        Foo::bar(x);
-
-        Foo::baz(self);
-        Foo::baz(*x);
-
-        Foo::qux(Box::new(self));
-        Foo::qux(Box::new(*x));
-    }
-
-    pub fn bar(&self) {
-        unsafe { COUNT *= 3; }
-    }
-
-    pub fn baz(self) {
-        unsafe { COUNT *= 5; }
-    }
-
-    pub fn qux(self: Box<Foo>) {
-        unsafe { COUNT *= 7; }
-    }
-}
diff --git a/src/test/ui/methods/auxiliary/method_self_arg2.rs b/src/test/ui/methods/auxiliary/method_self_arg2.rs
deleted file mode 100644
index 967254562..000000000
--- a/src/test/ui/methods/auxiliary/method_self_arg2.rs
+++ /dev/null
@@ -1,52 +0,0 @@
-#![crate_type = "lib"]
-
-static mut COUNT: u64 = 1;
-
-pub fn get_count() -> u64 { unsafe { COUNT } }
-
-#[derive(Copy, Clone)]
-pub struct Foo;
-
-impl Foo {
-    pub fn run_trait(self) {
-        unsafe { COUNT *= 17; }
-        // Test internal call.
-        Bar::foo1(&self);
-        Bar::foo2(self);
-        Bar::foo3(Box::new(self));
-
-        Bar::bar1(&self);
-        Bar::bar2(self);
-        Bar::bar3(Box::new(self));
-    }
-}
-
-pub trait Bar : Sized {
-    fn foo1(&self);
-    fn foo2(self);
-    fn foo3(self: Box<Self>);
-
-    fn bar1(&self) {
-        unsafe { COUNT *= 7; }
-    }
-    fn bar2(self) {
-        unsafe { COUNT *= 11; }
-    }
-    fn bar3(self: Box<Self>) {
-        unsafe { COUNT *= 13; }
-    }
-}
-
-impl Bar for Foo {
-    fn foo1(&self) {
-        unsafe { COUNT *= 2; }
-    }
-
-    fn foo2(self) {
-        unsafe { COUNT *= 3; }
-    }
-
-    fn foo3(self: Box<Foo>) {
-        unsafe { COUNT *= 5; }
-    }
-}
-- 
cgit v1.2.3