Merging upstream version 1.68.2+dfsg1.

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

1 files changed, 0 insertions, 32 deletions

diff --git a/src/test/ui/inference/issue-72616.rs b/src/test/ui/inference/issue-72616.rs
deleted file mode 100644
index 69ade1a75..000000000
--- a/src/test/ui/inference/issue-72616.rs
+++ /dev/null
@@ -1,32 +0,0 @@
-// ignore-wasm32 FIXME: ignoring wasm as it suggests slightly different impls
-
-// Regression test for #72616, it used to emit incorrect diagnostics, like:
-// error[E0283]: type annotations needed for `String`
-//  --> src/main.rs:8:30
-//   |
-// 5 |         let _: String = "".to_owned().try_into().unwrap();
-//   |             - consider giving this pattern a type
-// ...
-// 8 |         if String::from("a") == "a".try_into().unwrap() {}
-//   |                              ^^ cannot infer type for struct `String`
-//   |
-//   = note: cannot satisfy `String: PartialEq<_>`
-
-use std::convert::TryInto;
-
-pub fn main() {
-    {
-        let _: String = "".to_owned().try_into().unwrap();
-    }
-    {
-        if String::from("a") == "a".try_into().unwrap() {}
-        //~^ ERROR type annotations needed
-        //~| ERROR type annotations needed
-    }
-    {
-        let _: String = match "_".try_into() {
-            Ok(a) => a,
-            Err(_) => "".into(),
-        };
-    }
-}