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/borrowck/issue-82126-mismatched-subst-and-hir.rs b/src/test/ui/borrowck/issue-82126-mismatched-subst-and-hir.rs
deleted file mode 100644
index dd0320bc5..000000000
--- a/src/test/ui/borrowck/issue-82126-mismatched-subst-and-hir.rs
+++ /dev/null
@@ -1,24 +0,0 @@
-// Regression test for #82126. Checks that mismatched lifetimes and types are
-// properly handled.
-
-// edition:2018
-
-use std::sync::Mutex;
-
-struct MarketMultiplier {}
-
-impl MarketMultiplier {
-    fn buy(&mut self) -> &mut usize {
-        todo!()
-    }
-}
-
-async fn buy_lock(generator: &Mutex<MarketMultiplier>) -> LockedMarket<'_> {
-    //~^ ERROR this struct takes 0 lifetime arguments but 1 lifetime argument was supplied
-    //~^^ ERROR this struct takes 1 generic argument but 0 generic arguments were supplied
-    LockedMarket(generator.lock().unwrap().buy())
-}
-
-struct LockedMarket<T>(T);
-
-fn main() {}