From 700147916c690efed677e5d29557f8ad6d188adb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jonathan=20D=C3=B6nszelmann?= <jonathan@donsz.nl>
Date: Fri, 13 Dec 2024 14:47:11 +0100
Subject: [PATCH 1/2] rename rustc_attr to rustc_attr_parsing and create
 rustc_attr_data_structures

---
 src/lib.rs     | 2 +-
 src/machine.rs | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/lib.rs b/src/lib.rs
index 85c896563d..e02d51afce 100644
--- a/src/lib.rs
+++ b/src/lib.rs
@@ -58,7 +58,7 @@ extern crate tracing;
 extern crate rustc_abi;
 extern crate rustc_apfloat;
 extern crate rustc_ast;
-extern crate rustc_attr;
+extern crate rustc_attr_parsing;
 extern crate rustc_const_eval;
 extern crate rustc_data_structures;
 extern crate rustc_errors;
diff --git a/src/machine.rs b/src/machine.rs
index ac26feb345..ad8a7ea166 100644
--- a/src/machine.rs
+++ b/src/machine.rs
@@ -11,7 +11,7 @@ use std::{fmt, process};
 use rand::rngs::StdRng;
 use rand::{Rng, SeedableRng};
 use rustc_abi::{Align, ExternAbi, Size};
-use rustc_attr::InlineAttr;
+use rustc_attr_parsing::InlineAttr;
 use rustc_data_structures::fx::{FxHashMap, FxHashSet};
 #[allow(unused)]
 use rustc_data_structures::static_assert_size;

From 3d1700553579001607468bf5ef22f74b3ecf76b2 Mon Sep 17 00:00:00 2001
From: The Miri Cronjob Bot <miri@cron.bot>
Date: Wed, 18 Dec 2024 04:56:05 +0000
Subject: [PATCH 2/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 68131efa38..bc92d07323 100644
--- a/rust-version
+++ b/rust-version
@@ -1 +1 @@
-7caf35b2e5401d7740fdc567fdc388059208150b
+52890e82153cd8716d97a96f47fb6ac99dec65be