Consistent `Handler` naming #119063

nnethercote · 2023-12-18T03:15:33Z

This PR implements the renaming described in rust-lang/compiler-team#699.

r? @compiler-errors

rustbot · 2023-12-18T03:15:44Z

Some changes occurred to the CTFE / Miri engine

cc @rust-lang/miri

Some changes occurred in need_type_info.rs

cc @lcnr

Some changes occurred in src/tools/rustfmt

cc @rust-lang/rustfmt

Some changes occurred in compiler/rustc_codegen_gcc

cc @antoyo, @GuillaumeGomez

Some changes occurred to MIR optimizations

cc @rust-lang/wg-mir-opt

Some changes occurred in compiler/rustc_codegen_cranelift

cc @bjorn3

Some changes occurred in src/tools/clippy

cc @rust-lang/clippy

The Miri subtree was changed

cc @rust-lang/miri

rustc_macros::diagnostics was changed

cc @davidtwco, @compiler-errors, @TaKO8Ki

nnethercote · 2023-12-18T03:19:51Z

Apologies for the massively tedious review. I split it into lots of commits so that each commit (except the last few) does exactly one change. And I already have conflicts since I started this last night, lol.

compiler-errors

r=me after responding to some questions + one nit

compiler/rustc_codegen_cranelift/src/base.rs

compiler/rustc_query_system/src/dep_graph/graph.rs

compiler-errors · 2023-12-18T03:47:47Z

compiler/rustc_codegen_llvm/src/back/lto.rs

@@ -200,18 +200,11 @@ pub(crate) fn run_fat(
    modules: Vec<FatLtoInput<LlvmCodegenBackend>>,
    cached_modules: Vec<(SerializedModule<ModuleBuffer>, WorkProduct)>,
 ) -> Result<LtoModuleCodegen<LlvmCodegenBackend>, FatalError> {
-    let diag_handler = cgcx.create_diag_handler();
-    let (symbols_below_threshold, upstream_modules) = prepare_lto(cgcx, &diag_handler)?;
+    let dcx = cgcx.create_dcx();


I wonder if this should be create_diag_ctxt or something

I don't see why function names need to be different to variable names. Consistency is good.

It's consistent with variable names, but not the type name. I consider it more normal for a constructor function to be called create_type_name, personally.

nnethercote · 2023-12-18T04:50:39Z

Thank you for the fast review!

@bors r=compiler-errors

bors · 2023-12-18T04:50:42Z

📌 Commit 9449218 has been approved by compiler-errors

It is now in the queue for this repository.

…te_dcx`.

…s::dcx_flags`.

…veKind::Diagnostic::dcx`.

nnethercote · 2023-12-18T05:07:12Z

I fixed the rustfmt failure.

@bors r=compiler-errors p=1

High-priority because it's conflict prone.

bors · 2023-12-18T05:07:14Z

📌 Commit 1e831e3 has been approved by compiler-errors

It is now in the queue for this repository.

bors · 2023-12-18T06:03:56Z

⌛ Testing commit 1e831e3 with merge cda4736...

bors · 2023-12-18T08:02:15Z

☀️ Test successful - checks-actions
Approved by: compiler-errors
Pushing cda4736 to master...

rust-timer · 2023-12-18T10:13:24Z

Finished benchmarking commit (cda4736): comparison URL.

Overall result: no relevant changes - no action needed

@rustbot label: -perf-regression

Instruction count

This benchmark run did not return any relevant results for this metric.

Max RSS (memory usage)

Results

This is a less reliable metric that may be of interest but was not used to determine the overall result at the top of this comment.

	mean	range	count
Regressions ❌ (primary)	1.1%	[0.7%, 1.9%]	3
Regressions ❌ (secondary)	2.8%	[1.5%, 4.7%]	3
Improvements ✅ (primary)	-	-	0
Improvements ✅ (secondary)	-	-	0
All ❌✅ (primary)	1.1%	[0.7%, 1.9%]	3

Cycles

Results

This is a less reliable metric that may be of interest but was not used to determine the overall result at the top of this comment.

	mean	range	count
Regressions ❌ (primary)	0.7%	[0.7%, 0.7%]	1
Regressions ❌ (secondary)	1.7%	[1.7%, 1.7%]	1
Improvements ✅ (primary)	-0.5%	[-0.5%, -0.5%]	1
Improvements ✅ (secondary)	-	-	0
All ❌✅ (primary)	0.1%	[-0.5%, 0.7%]	2

Binary size

This benchmark run did not return any relevant results for this metric.

Bootstrap: 671.683s -> 673.091s (0.21%)
Artifact size: 312.53 MiB -> 312.52 MiB (-0.00%)

Fixes needed due to renaming of a few items: - rust-lang/rust#119063

rustbot assigned compiler-errors Dec 18, 2023

compiler-errors approved these changes Dec 18, 2023

View reviewed changes

nnethercote force-pushed the dcx branch from 2c369d7 to 9449218 Compare December 18, 2023 04:44

bors added S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. and removed S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. labels Dec 18, 2023

This comment has been minimized.

Sign in to view

nnethercote added 15 commits December 18, 2023 16:06

Rename Handler as DiagCtxt.

cde19c0

Rename HandlerInner as DiagCtxtInner.

45f3476

Rename EarlyErrorHandler as EarlyDiagCtxt.

cce1701

Rename HandlerFlags as DiagCtxtFlags.

9b1f87c

Rename ParseSess::span_diagnostic as ParseSess::dcx.

9df1576

Rename Session::span_diagnostic as Session::dcx.

09af8a6

Rename Parser::span_diagnostic as Parser::dcx.

73bac45

Rename ParseSess::with_span_handler as ParseSess::with_dcx.

d1d0896

Rename DiagnosticBuilder::handler as DiagnosticBuilder::dcx.

9f3f1ca

Rename AstValidator::err_handler as AstValidator::dcx.

5ad7144

Rename ShowSpanVisitor::span_diagnostic as ShowSpanVisitor::dcx.

dea752e

Rename CodegenContext::create_diag_handler as `CodegenContext::crea…

7c656bc

…te_dcx`.

Rename UnstableOptions::diagnostic_handler_flags as `UnstableOption…

55bafab

…s::dcx_flags`.

Rename SilentEmitter::fatal_handler as SilentEmitter::fatal_dcx.

20cb12e

Rename EarlyDiagCtxt::handler as EarlyDiagCtxt::dcx.

b107ab8

nnethercote added 9 commits December 18, 2023 16:06

Rename CollectProcMacros::handler as CollectProcMacros::dcx.

f7125f1

Rename DiagnosticDeriveKind::Diagnostic::handler as `DiagnosticDeri…

7b8644e

…veKind::Diagnostic::dcx`.

Rename new_handler as new_dcx.

e13b5c8

Rename default_handler as default_dcx.

e97d353

Rename __diagnostic_handler_sess as _sess.

4dc7fab

Rename many DiagCtxt arguments.

f422dca

Rename many EarlyDiagCtxt arguments.

d58e372

Rename many DiagCtxt and EarlyDiagCtxt locals.

f6aa418

Fix up some ui-fulldeps tests.

1e831e3

nnethercote force-pushed the dcx branch from 9449218 to 1e831e3 Compare December 18, 2023 05:06

bors added the merged-by-bors This PR was explicitly merged by bors. label Dec 18, 2023

bors merged commit cda4736 into rust-lang:master Dec 18, 2023
12 checks passed

rustbot added this to the 1.76.0 milestone Dec 18, 2023

nnethercote deleted the dcx branch December 18, 2023 08:03

This was referenced Dec 18, 2023

Stabilize --json unused-externs(-silent) #115717

Merged

Add support for shell argfiles #118680

Merged

Delay literal unescaping #118699

Closed

rustc_codegen_ssa: Don't drop IncorrectCguReuseType , make rustc_expected_cgu_reuse attr work #118973

Merged

xFrednet mentioned this pull request Dec 18, 2023

Chore: Bump nightly -> 2023-12-28 rust-marker/marker#315

Open

celinval mentioned this pull request Dec 20, 2023

Update the rust toolchain to 2023-12-20 model-checking/kani#2961

Merged

nnethercote mentioned this pull request Dec 20, 2023

Consistent Handler naming rust-lang/compiler-team#699

Closed

3 tasks

adpaco-aws pushed a commit to model-checking/kani that referenced this pull request Dec 20, 2023

Update the rust toolchain to 2023-12-20 (#2961)

c28dc5a

Fixes needed due to renaming of a few items: - rust-lang/rust#119063

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Consistent `Handler` naming #119063

Consistent `Handler` naming #119063

nnethercote commented Dec 18, 2023

rustbot commented Dec 18, 2023

nnethercote commented Dec 18, 2023 •

edited

Loading

compiler-errors left a comment

compiler-errors Dec 18, 2023

nnethercote Dec 18, 2023

compiler-errors Dec 18, 2023

nnethercote commented Dec 18, 2023

bors commented Dec 18, 2023

This comment has been minimized.

nnethercote commented Dec 18, 2023

bors commented Dec 18, 2023

bors commented Dec 18, 2023

bors commented Dec 18, 2023

rust-timer commented Dec 18, 2023

Consistent Handler naming #119063

Consistent Handler naming #119063

Conversation

nnethercote commented Dec 18, 2023

rustbot commented Dec 18, 2023

nnethercote commented Dec 18, 2023 • edited Loading

compiler-errors left a comment

Choose a reason for hiding this comment

compiler-errors Dec 18, 2023

Choose a reason for hiding this comment

nnethercote Dec 18, 2023

Choose a reason for hiding this comment

compiler-errors Dec 18, 2023

Choose a reason for hiding this comment

nnethercote commented Dec 18, 2023

bors commented Dec 18, 2023

This comment has been minimized.

nnethercote commented Dec 18, 2023

bors commented Dec 18, 2023

bors commented Dec 18, 2023

bors commented Dec 18, 2023

rust-timer commented Dec 18, 2023

Overall result: no relevant changes - no action needed

Instruction count

Max RSS (memory usage)

Cycles

Binary size

Consistent `Handler` naming #119063

Consistent `Handler` naming #119063

nnethercote commented Dec 18, 2023 •

edited

Loading