Merging upstream version 1.68.2+dfsg1.

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

1 files changed, 0 insertions, 29 deletions

diff --git a/src/test/ui/nll/continue-after-missing-main.rs b/src/test/ui/nll/continue-after-missing-main.rs
deleted file mode 100644
index 778639158..000000000
--- a/src/test/ui/nll/continue-after-missing-main.rs
+++ /dev/null
@@ -1,29 +0,0 @@
-#![allow(dead_code)]
-
-struct Tableau<'a, MP> {
-    provider: &'a MP,
-}
-
-impl<'adapted_matrix_provider, 'original_data, MP>
-    Tableau<'adapted_matrix_provider, AdaptedMatrixProvider<'original_data, MP>>
-{
-    fn provider(&self) -> &'adapted_matrix_provider AdaptedMatrixProvider</*'original_data,*/ MP> {
-        self.provider
-    }
-}
-
-struct AdaptedMatrixProvider<'a, T> {
-    original_problem: &'a T,
-}
-
-impl<'a, T> AdaptedMatrixProvider<'a, T> {
-    fn clone_with_extra_bound(&self) -> Self {
-        AdaptedMatrixProvider { original_problem: self.original_problem }
-    }
-}
-
-fn create_and_solve_subproblems<'data_provider, 'original_data, MP>(
-    tableau: Tableau<'data_provider, AdaptedMatrixProvider<'original_data, MP>>,
-) {
-    let _: AdaptedMatrixProvider<'original_data, MP> = tableau.provider().clone_with_extra_bound();
-} //~ ERROR `main` function not found in crate