diff --git a/cc_bindings_from_rs/cmdline.rs b/cc_bindings_from_rs/cmdline.rs
index 114f565..8335410 100644
--- a/cc_bindings_from_rs/cmdline.rs
+++ b/cc_bindings_from_rs/cmdline.rs
@@ -11,7 +11,7 @@
 use anyhow::{bail, ensure, Result};
 use clap::Parser;
 use rustc_session::config::ErrorOutputType;
-use rustc_session::EarlyErrorHandler;
+use rustc_session::EarlyDiagCtxt;
 use std::path::PathBuf;
 
 #[derive(Debug, Parser)]
@@ -71,7 +71,7 @@
         );
         let exe_name = args[0].clone();
 
-        let early_error_handler = EarlyErrorHandler::new(ErrorOutputType::default());
+        let early_error_handler = EarlyDiagCtxt::new(ErrorOutputType::default());
 
         // Ensure that `@file` expansion also covers *our* args.
         //
diff --git a/cc_bindings_from_rs/run_compiler.rs b/cc_bindings_from_rs/run_compiler.rs
index dfe35ef..631cf46 100644
--- a/cc_bindings_from_rs/run_compiler.rs
+++ b/cc_bindings_from_rs/run_compiler.rs
@@ -20,7 +20,7 @@
 use rustc_interface::Queries;
 use rustc_middle::ty::TyCtxt; // See also <internal link>/ty.html#import-conventions
 use rustc_session::config::ErrorOutputType;
-use rustc_session::EarlyErrorHandler;
+use rustc_session::EarlyDiagCtxt;
 
 /// Wrapper around `rustc_driver::RunCompiler::run` that exposes a
 /// simplified API:
@@ -46,7 +46,7 @@
     // `tracing::subscriber::set_global_default` always succeeds.
     use once_cell::sync::Lazy;
     static ENV_LOGGER_INIT: Lazy<()> = Lazy::new(|| {
-        let early_error_handler = EarlyErrorHandler::new(ErrorOutputType::default());
+        let early_error_handler = EarlyDiagCtxt::new(ErrorOutputType::default());
         rustc_driver::init_logger(
             &early_error_handler,
             rustc_log::LoggerConfig::from_env("CRUBIT_LOG"),