From 79888fd47b452c6b1fbc9eba5c25dd2c1062506a Mon Sep 17 00:00:00 2001
From: Michael Goulet <michael@errs.io>
Date: Fri, 18 Nov 2022 18:06:32 +0000
Subject: [PATCH 1/4] Delete miri test

---
 tests/pass/issues/issue-miri-2433.rs | 24 ------------------------
 1 file changed, 24 deletions(-)
 delete mode 100644 tests/pass/issues/issue-miri-2433.rs

diff --git a/tests/pass/issues/issue-miri-2433.rs b/tests/pass/issues/issue-miri-2433.rs
deleted file mode 100644
index a8281d30bac4a..0000000000000
--- a/tests/pass/issues/issue-miri-2433.rs
+++ /dev/null
@@ -1,24 +0,0 @@
-#![feature(type_alias_impl_trait)]
-
-trait T {
-    type Item;
-}
-
-type Alias<'a> = impl T<Item = &'a ()>;
-
-struct S;
-impl<'a> T for &'a S {
-    type Item = &'a ();
-}
-
-fn filter_positive<'a>() -> Alias<'a> {
-    &S
-}
-
-fn with_positive(fun: impl Fn(Alias<'_>)) {
-    fun(filter_positive());
-}
-
-fn main() {
-    with_positive(|_| ());
-}

From f4e02ce51b34e3609f7e33fc1ddd70b357077dae Mon Sep 17 00:00:00 2001
From: Lukas Markeffsky <@>
Date: Fri, 7 Oct 2022 20:57:34 +0200
Subject: [PATCH 2/4] constify `exact_div` intrinsic

---
 src/shims/intrinsics/mod.rs | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/src/shims/intrinsics/mod.rs b/src/shims/intrinsics/mod.rs
index 6004e2078ad4f..5ea82adb9c69c 100644
--- a/src/shims/intrinsics/mod.rs
+++ b/src/shims/intrinsics/mod.rs
@@ -368,11 +368,6 @@ pub trait EvalContextExt<'mir, 'tcx: 'mir>: crate::MiriInterpCxExt<'mir, 'tcx> {
             }
 
             // Other
-            "exact_div" => {
-                let [num, denom] = check_arg_count(args)?;
-                this.exact_div(&this.read_immediate(num)?, &this.read_immediate(denom)?, dest)?;
-            }
-
             "breakpoint" => {
                 let [] = check_arg_count(args)?;
                 // normally this would raise a SIGTRAP, which aborts if no debugger is connected

From 72ee09c27e8be128ad077d3e29da37dee8d5de57 Mon Sep 17 00:00:00 2001
From: Ralf Jung <post@ralfj.de>
Date: Sun, 20 Nov 2022 07:48:21 +0100
Subject: [PATCH 3/4] Preparing for merge from rustc

---
 rust-version | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/rust-version b/rust-version
index d3e139e4651e7..d007f952a67a1 100644
--- a/rust-version
+++ b/rust-version
@@ -1 +1 @@
-2f8d8040166a730d0da7bba0f2864f0ef7ff6364
+7477c1f4f7d6bef037d523099b240d22aa1b63a0

From 70fab065b7fe2b98812c48a69856b371c15c4e3f Mon Sep 17 00:00:00 2001
From: Ralf Jung <post@ralfj.de>
Date: Sun, 20 Nov 2022 08:04:36 +0100
Subject: [PATCH 4/4] fix unused warning in a test

---
 tests/pass/panic/catch_panic.rs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tests/pass/panic/catch_panic.rs b/tests/pass/panic/catch_panic.rs
index 308904406538c..5d57df4e52bfa 100644
--- a/tests/pass/panic/catch_panic.rs
+++ b/tests/pass/panic/catch_panic.rs
@@ -69,7 +69,7 @@ fn main() {
     });
 
     test(Some("align_offset: align is not a power-of-two"), |_old_val| {
-        (0usize as *const u8).align_offset(3);
+        let _ = (0usize as *const u8).align_offset(3);
         loop {}
     });