Merging upstream version 1.68.2+dfsg1.

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

1 files changed, 0 insertions, 43 deletions

diff --git a/src/test/codegen/set-discriminant-invalid.rs b/src/test/codegen/set-discriminant-invalid.rs
deleted file mode 100644
index bccb9e4c7..000000000
--- a/src/test/codegen/set-discriminant-invalid.rs
+++ /dev/null
@@ -1,43 +0,0 @@
-// compile-flags: -C opt-level=0
-#![crate_type = "lib"]
-
-pub enum ApiError {}
-#[allow(dead_code)]
-pub struct TokioError {
-    b: bool,
-}
-pub enum Error {
-    Api {
-        source: ApiError,
-    },
-    Ethereum,
-    Tokio {
-        source: TokioError,
-    },
-}
-struct Api;
-impl IntoError<Error> for Api
-{
-    type Source = ApiError;
-    // CHECK-LABEL: @into_error
-    // CHECK: llvm.trap()
-    // Also check the next two instructions to make sure we do not match against `trap`
-    // elsewhere in the code.
-    // CHECK-NEXT: load
-    // CHECK-NEXT: ret
-    #[no_mangle]
-    fn into_error(self, error: Self::Source) -> Error {
-        Error::Api {
-            source: error,
-        }
-    }
-}
-
-pub trait IntoError<E>
-{
-    /// The underlying error
-    type Source;
-
-    /// Combine the information to produce the error
-    fn into_error(self, source: Self::Source) -> E;
-}