From db0e7d970eff8905722f1a4fa3254ca325021715 Mon Sep 17 00:00:00 2001
From: The Miri Conjob Bot <miri@cron.bot>
Date: Sun, 22 Oct 2023 05:29:24 +0000
Subject: [PATCH 1/2] Preparing for merge from rustc

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

diff --git a/rust-version b/rust-version
index bc3882bcf2..0335ad3c1d 100644
--- a/rust-version
+++ b/rust-version
@@ -1 +1 @@
-249624b5043013d18c00f0401ca431c1a6baa8cd
+9e3f784eb2c7c847b6c3578b373c0e0bc9233ca3

From 2321aebdc1f1051b9d82be62a9d5e19c09ce5c5a Mon Sep 17 00:00:00 2001
From: Ralf Jung <post@ralfj.de>
Date: Sun, 22 Oct 2023 08:40:37 +0200
Subject: [PATCH 2/2] clippy

---
 src/shims/backtrace.rs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/shims/backtrace.rs b/src/shims/backtrace.rs
index 08b26f5fe8..48dafc40c6 100644
--- a/src/shims/backtrace.rs
+++ b/src/shims/backtrace.rs
@@ -37,7 +37,7 @@ pub trait EvalContextExt<'mir, 'tcx: 'mir>: crate::MiriInterpCxExt<'mir, 'tcx> {
         let this = self.eval_context_mut();
         let tcx = this.tcx;
 
-        let flags = if let Some(flags_op) = args.get(0) {
+        let flags = if let Some(flags_op) = args.first() {
             this.read_scalar(flags_op)?.to_u64()?
         } else {
             throw_ub_format!("expected at least 1 argument")