Merge pull request #2240 from rust-lang/rustc-pull

rust-lang · Feb 3, 2025 · 3b8d88d · 3b8d88d
2 parents 9350966 + 37fe574
commit 3b8d88d
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 5 deletions.
diff --git a/examples/rustc-interface-getting-diagnostics.rs b/examples/rustc-interface-getting-diagnostics.rs
@@ -10,15 +10,15 @@ extern crate rustc_interface;
 extern crate rustc_session;
 extern crate rustc_span;
 
+use std::sync::{Arc, Mutex};
+
 use rustc_errors::emitter::Emitter;
 use rustc_errors::registry::{self, Registry};
 use rustc_errors::translation::Translate;
 use rustc_errors::{DiagCtxt, DiagInner, FluentBundle};
 use rustc_session::config;
 use rustc_span::source_map::SourceMap;
 
-use std::sync::{Arc, Mutex};
-
 struct DebugEmitter {
     source_map: Arc<SourceMap>,
     diagnostics: Arc<Mutex<Vec<DiagInner>>>,
@@ -67,10 +67,10 @@ fn main() {
         locale_resources: rustc_driver::DEFAULT_LOCALE_RESOURCES.to_owned(),
         lint_caps: rustc_hash::FxHashMap::default(),
         psess_created: Some(Box::new(|parse_sess| {
-            parse_sess.set_dcx(DiagCtxt::new(Box::new(DebugEmitter {
+            parse_sess.dcx().set_emitter(Box::new(DebugEmitter {
                 source_map: parse_sess.clone_source_map(),
                 diagnostics,
-            })));
+            }));
         })),
         register_lints: None,
         override_queries: None,

diff --git a/rust-version b/rust-version
@@ -1 +1 @@
-8239a37f9c0951a037cfc51763ea52a20e71e6bd
+613bdd49978298648ed05ace086bd1ecad54b44a
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		8239a37f9c0951a037cfc51763ea52a20e71e6bd
		613bdd49978298648ed05ace086bd1ecad54b44a