Merging upstream version 1.68.2+dfsg1.

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

1 files changed, 0 insertions, 28 deletions

diff --git a/src/test/ui/issues/auxiliary/issue-11225-3.rs b/src/test/ui/issues/auxiliary/issue-11225-3.rs
deleted file mode 100644
index 266e42a10..000000000
--- a/src/test/ui/issues/auxiliary/issue-11225-3.rs
+++ /dev/null
@@ -1,28 +0,0 @@
-trait PrivateTrait {
-    fn private_trait_method(&self);
-    fn private_trait_method_ufcs(&self);
-}
-
-struct PrivateStruct;
-
-impl PrivateStruct {
-    fn private_inherent_method(&self) { }
-    fn private_inherent_method_ufcs(&self) { }
-}
-
-impl PrivateTrait for PrivateStruct {
-    fn private_trait_method(&self) { }
-    fn private_trait_method_ufcs(&self) { }
-}
-
-#[inline]
-pub fn public_inlinable_function() {
-    PrivateStruct.private_trait_method();
-    PrivateStruct.private_inherent_method();
-}
-
-#[inline]
-pub fn public_inlinable_function_ufcs() {
-    PrivateStruct::private_trait_method(&PrivateStruct);
-    PrivateStruct::private_inherent_method(&PrivateStruct);
-}