Merging upstream version 1.76.0+dfsg1.

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

1 files changed, 0 insertions, 28 deletions

diff --git a/tests/ui/traits/new-solver/try-example.rs b/tests/ui/traits/new-solver/try-example.rs
deleted file mode 100644
index e826f3a00..000000000
--- a/tests/ui/traits/new-solver/try-example.rs
+++ /dev/null
@@ -1,28 +0,0 @@
-// check-pass
-// compile-flags: -Ztrait-solver=next
-
-use std::error::Error;
-
-fn main() -> Result<(), Box<dyn Error>> {
-    let x: i32 = parse()?;
-    Ok(())
-}
-
-trait Parse {}
-
-impl Parse for i32 {}
-
-#[derive(Debug)]
-struct ParseError;
-
-impl std::fmt::Display for ParseError {
-    fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
-        write!(f, "ParseError")
-    }
-}
-
-impl Error for ParseError {}
-
-fn parse<T: Parse>() -> Result<T, ParseError> {
-    todo!()
-}