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/impl-trait/auxiliary/extra-item.rs     |  1 -
 .../auxiliary/no_method_suggested_traits.rs        | 36 ----------------------
 src/test/ui/impl-trait/auxiliary/xcrate.rs         | 23 --------------
 3 files changed, 60 deletions(-)
 delete mode 100644 src/test/ui/impl-trait/auxiliary/extra-item.rs
 delete mode 100644 src/test/ui/impl-trait/auxiliary/no_method_suggested_traits.rs
 delete mode 100644 src/test/ui/impl-trait/auxiliary/xcrate.rs

(limited to 'src/test/ui/impl-trait/auxiliary')

diff --git a/src/test/ui/impl-trait/auxiliary/extra-item.rs b/src/test/ui/impl-trait/auxiliary/extra-item.rs
deleted file mode 100644
index 8eaeafa52..000000000
--- a/src/test/ui/impl-trait/auxiliary/extra-item.rs
+++ /dev/null
@@ -1 +0,0 @@
-pub trait MyTrait {}
diff --git a/src/test/ui/impl-trait/auxiliary/no_method_suggested_traits.rs b/src/test/ui/impl-trait/auxiliary/no_method_suggested_traits.rs
deleted file mode 100644
index cefb17e0f..000000000
--- a/src/test/ui/impl-trait/auxiliary/no_method_suggested_traits.rs
+++ /dev/null
@@ -1,36 +0,0 @@
-pub use reexport::Reexported;
-
-pub struct Foo;
-pub enum Bar { X }
-
-pub mod foo {
-    pub trait PubPub {
-        fn method(&self) {}
-
-        fn method3(&self) {}
-    }
-
-    impl PubPub for u32 {}
-    impl PubPub for i32 {}
-}
-pub mod bar {
-    trait PubPriv {
-        fn method(&self);
-    }
-}
-mod qux {
-    pub trait PrivPub {
-        fn method(&self);
-    }
-}
-mod quz {
-    trait PrivPriv {
-        fn method(&self);
-    }
-}
-
-mod reexport {
-    pub trait Reexported {
-        fn method(&self);
-    }
-}
diff --git a/src/test/ui/impl-trait/auxiliary/xcrate.rs b/src/test/ui/impl-trait/auxiliary/xcrate.rs
deleted file mode 100644
index ac016258b..000000000
--- a/src/test/ui/impl-trait/auxiliary/xcrate.rs
+++ /dev/null
@@ -1,23 +0,0 @@
-// NOTE commented out due to issue #45994
-//pub fn fourway_add(a: i32) -> impl Fn(i32) -> impl Fn(i32) -> impl Fn(i32) -> i32 {
-//    move |b| move |c| move |d| a + b + c + d
-//}
-
-fn some_internal_fn() -> u32 {
-    1
-}
-
-fn other_internal_fn() -> u32 {
-    1
-}
-
-// See #40839
-pub fn return_closure_accessing_internal_fn() -> impl Fn() -> u32 {
-    || {
-        some_internal_fn() + 1
-    }
-}
-
-pub fn return_internal_fn() -> impl Fn() -> u32 {
-    other_internal_fn
-}
-- 
cgit v1.2.3