Merging upstream version 1.68.2+dfsg1.

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

1 files changed, 0 insertions, 24 deletions

diff --git a/src/test/ui/inference/issue-71732.rs b/src/test/ui/inference/issue-71732.rs
deleted file mode 100644
index 8a9d2b235..000000000
--- a/src/test/ui/inference/issue-71732.rs
+++ /dev/null
@@ -1,24 +0,0 @@
-// Regression test for #71732, it used to emit incorrect diagnostics, like:
-// error[E0283]: type annotations needed
-//  --> src/main.rs:5:10
-//   |
-// 5 |         .get(&"key".into())
-//   |          ^^^ cannot infer type for struct `String`
-//   |
-//   = note: cannot satisfy `String: Borrow<_>`
-// help: consider specifying the type argument in the method call
-//   |
-// 5 |         .get::<Q>(&"key".into())
-//   |
-
-use std::collections::hash_map::HashMap;
-
-fn foo(parameters: &HashMap<String, String>) -> bool {
-    parameters
-        .get(&"key".into())
-        //~^ ERROR type annotations needed
-        .and_then(|found: &String| Some(false))
-        .unwrap_or(false)
-}
-
-fn main() {}