Skip to content
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.

Commit 1a1876c

Browse files
committedFeb 29, 2024
Auto merge of #121804 - GuillaumeGomez:rollup-jh0v3ex, r=GuillaumeGomez
Rollup of 7 pull requests Successful merges: - #119748 (Increase visibility of `join_path` and `split_paths`) - #120820 (Enable CMPXCHG16B, SSE3, SAHF/LAHF and 128-bit Atomics (in nightly) in Windows x64) - #121000 (pattern_analysis: rework how we hide empty private fields) - #121376 (Skip unnecessary comparison with half-open range patterns) - #121596 (Use volatile access instead of `#[used]` for `on_tls_callback`) - #121669 (Count stashed errors again) - #121783 (Emitter cleanups) r? `@ghost` `@rustbot` modify labels: rollup
2 parents 384d26f + 0e9f02d commit 1a1876c

File tree

66 files changed

+767
-715
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

66 files changed

+767
-715
lines changed
 

‎compiler/rustc_codegen_ssa/src/back/write.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -373,7 +373,7 @@ pub struct CodegenContext<B: WriteBackendMethods> {
373373

374374
impl<B: WriteBackendMethods> CodegenContext<B> {
375375
pub fn create_dcx(&self) -> DiagCtxt {
376-
DiagCtxt::with_emitter(Box::new(self.diag_emitter.clone()))
376+
DiagCtxt::new(Box::new(self.diag_emitter.clone()))
377377
}
378378

379379
pub fn config(&self, kind: ModuleKind) -> &ModuleConfig {

‎compiler/rustc_driver_impl/src/lib.rs

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,7 @@ use rustc_codegen_ssa::{traits::CodegenBackend, CodegenErrors, CodegenResults};
2121
use rustc_data_structures::profiling::{
2222
get_resident_set_size, print_time_passes_entry, TimePassesFormat,
2323
};
24+
use rustc_errors::emitter::stderr_destination;
2425
use rustc_errors::registry::Registry;
2526
use rustc_errors::{
2627
markdown, ColorConfig, DiagCtxt, ErrCode, ErrorGuaranteed, FatalError, PResult,
@@ -1384,11 +1385,11 @@ fn report_ice(
13841385
) {
13851386
let fallback_bundle =
13861387
rustc_errors::fallback_fluent_bundle(crate::DEFAULT_LOCALE_RESOURCES.to_vec(), false);
1387-
let emitter = Box::new(rustc_errors::emitter::HumanEmitter::stderr(
1388-
rustc_errors::ColorConfig::Auto,
1388+
let emitter = Box::new(rustc_errors::emitter::HumanEmitter::new(
1389+
stderr_destination(rustc_errors::ColorConfig::Auto),
13891390
fallback_bundle,
13901391
));
1391-
let dcx = rustc_errors::DiagCtxt::with_emitter(emitter);
1392+
let dcx = rustc_errors::DiagCtxt::new(emitter);
13921393

13931394
// a .span_bug or .bug call has already printed what
13941395
// it wants to print.

0 commit comments

Comments
 (0)
Please sign in to comment.