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/traits/static-method-generic-inference.rs b/src/test/ui/traits/static-method-generic-inference.rs
deleted file mode 100644
index f4e94c4f7..000000000
--- a/src/test/ui/traits/static-method-generic-inference.rs
+++ /dev/null
@@ -1,28 +0,0 @@
-// Issue #3902. We are (at least currently) unable to infer `Self`
-// based on `T`, even though there is only a single impl, because of
-// the possibility of associated types and other things (basically: no
-// constraints on `Self` here at all).
-
-mod base {
-    pub trait HasNew<T> {
-        fn new() -> T;
-        fn dummy(&self) { }
-    }
-
-    pub struct Foo {
-        dummy: (),
-    }
-
-    impl HasNew<Foo> for Foo {
-        fn new() -> Foo {
-            Foo { dummy: () }
-        }
-    }
-}
-
-pub fn foo() {
-    let _f: base::Foo = base::HasNew::new();
-    //~^ ERROR E0790
-}
-
-fn main() { }