Merging upstream version 1.68.2+dfsg1.

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

1 files changed, 0 insertions, 48 deletions

diff --git a/src/test/ui/impl-trait/cross-return-site-inference.rs b/src/test/ui/impl-trait/cross-return-site-inference.rs
deleted file mode 100644
index 00aed2ad9..000000000
--- a/src/test/ui/impl-trait/cross-return-site-inference.rs
+++ /dev/null
@@ -1,48 +0,0 @@
-// edition:2021
-
-fn foo(b: bool) -> impl std::fmt::Debug {
-    if b {
-        return vec![42]
-    }
-    [].into_iter().collect()
-}
-
-fn bar(b: bool) -> impl std::fmt::Debug {
-    if b {
-        return [].into_iter().collect()
-    }
-    vec![42]
-}
-
-fn bak(b: bool) -> impl std::fmt::Debug {
-    if b {
-        return std::iter::empty().collect()
-    }
-    vec![42]
-}
-
-fn baa(b: bool) -> impl std::fmt::Debug {
-    if b {
-        return [42].into_iter().collect()
-    }
-    vec![]
-}
-
-fn muh() -> Result<(), impl std::fmt::Debug> {
-    Err("whoops")?;
-    Ok(())
-    //~^ ERROR type annotations needed
-}
-
-fn muh2() -> Result<(), impl std::fmt::Debug> {
-    return Err(From::from("foo"));
-    //~^ ERROR type annotations needed
-    Ok(())
-}
-
-fn muh3() -> Result<(), impl std::fmt::Debug> {
-    Err(From::from("foo"))
-    //~^ ERROR type annotations needed
-}
-
-fn main() {}