From 952be8e88673f5ea023bbd7974c69d392e740ddb Mon Sep 17 00:00:00 2001
From: Ralf Jung <post@ralfj.de>
Date: Wed, 15 Oct 2025 21:58:02 +0200
Subject: [PATCH] fix genmc build

---
 src/tools/miri/src/concurrency/genmc/global_allocations.rs | 2 +-
 src/tools/miri/src/concurrency/genmc/run.rs                | 1 +
 src/tools/miri/src/concurrency/genmc/scheduling.rs         | 3 ++-
 3 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/src/tools/miri/src/concurrency/genmc/global_allocations.rs b/src/tools/miri/src/concurrency/genmc/global_allocations.rs
index 272f8d248403..7f34c60dcdaf 100644
--- a/src/tools/miri/src/concurrency/genmc/global_allocations.rs
+++ b/src/tools/miri/src/concurrency/genmc/global_allocations.rs
@@ -6,7 +6,7 @@ use rand::SeedableRng;
 use rand::rngs::StdRng;
 use rustc_const_eval::interpret::{AllocId, AllocInfo, InterpResult, interp_ok};
 use rustc_data_structures::fx::FxHashMap;
-use tracing::debug;
+use rustc_log::tracing::debug;
 
 use crate::alloc_addresses::AddressGenerator;
 
diff --git a/src/tools/miri/src/concurrency/genmc/run.rs b/src/tools/miri/src/concurrency/genmc/run.rs
index 6721a38c683f..6eb51e1b50cb 100644
--- a/src/tools/miri/src/concurrency/genmc/run.rs
+++ b/src/tools/miri/src/concurrency/genmc/run.rs
@@ -3,6 +3,7 @@ use std::sync::Arc;
 use std::time::Instant;
 
 use genmc_sys::EstimationResult;
+use rustc_log::tracing;
 use rustc_middle::ty::TyCtxt;
 
 use super::GlobalState;
diff --git a/src/tools/miri/src/concurrency/genmc/scheduling.rs b/src/tools/miri/src/concurrency/genmc/scheduling.rs
index 6ccbaf4f2482..0703e0595b33 100644
--- a/src/tools/miri/src/concurrency/genmc/scheduling.rs
+++ b/src/tools/miri/src/concurrency/genmc/scheduling.rs
@@ -1,4 +1,5 @@
 use genmc_sys::{ActionKind, ExecutionState};
+use rustc_data_structures::either::Either;
 use rustc_middle::mir::TerminatorKind;
 use rustc_middle::ty::{self, Ty};
 
@@ -38,7 +39,7 @@ fn get_next_instruction_kind<'tcx>(
     let Some(frame) = thread_manager.active_thread_stack().last() else {
         return interp_ok(NonAtomic);
     };
-    let either::Either::Left(loc) = frame.current_loc() else {
+    let Either::Left(loc) = frame.current_loc() else {
         // We are unwinding, so the next step is definitely not atomic.
         return interp_ok(NonAtomic);
     };