mirror of
https://github.com/rust-lang/rust.git
synced 2025-06-19 19:17:31 +00:00
2271c26e4a
Remove `DiagCtxt` API duplication `DiagCtxt` defines the internal API for creating and emitting diagnostics: methods like `struct_err`, `struct_span_warn`, `note`, `create_fatal`, `emit_bug`. There are over 50 methods. Some of these methods are then duplicated across several other types: `Session`, `ParseSess`, `Parser`, `ExtCtxt`, and `MirBorrowckCtxt`. `Session` duplicates the most, though half the ones it does are unused. Each duplicated method just calls forward to the corresponding method in `DiagCtxt`. So this duplication exists to (in the best case) shorten chains like `ecx.tcx.sess.parse_sess.dcx.emit_err()` to `ecx.emit_err()`. This API duplication is ugly and has been bugging me for a while. And it's inconsistent: there's no real logic about which methods are duplicated, and the use of `#[rustc_lint_diagnostic]` and `#[track_caller]` attributes vary across the duplicates. This PR removes the duplicated API methods and makes all diagnostic creation and emission go through `DiagCtxt`. It also adds `dcx` getter methods to several types to shorten chains. This approach scales *much* better than API duplication; indeed, the PR adds `dcx()` to numerous types that didn't have API duplication: `TyCtxt`, `LoweringCtxt`, `ConstCx`, `FnCtxt`, `TypeErrCtxt`, `InferCtxt`, `CrateLoader`, `CheckAttrVisitor`, and `Resolver`. These result in a lot of changes from `foo.tcx.sess.emit_err()` to `foo.dcx().emit_err()`. (You could do this with more types, but it gets into diminishing returns territory for types that don't emit many diagnostics.) After all these changes, some call sites are more verbose, some are less verbose, and many are the same. The total number of lines is reduced, mostly because of the removed API duplication. And consistency is increased, because calls to `emit_err` and friends are always preceded with `.dcx()` or `.dcx`. r? `@compiler-errors` |
||
|---|---|---|
| .. | ||
| abi | ||
| debuginfo | ||
| driver | ||
| intrinsics | ||
| optimize | ||
| allocator.rs | ||
| analyze.rs | ||
| archive.rs | ||
| base.rs | ||
| cast.rs | ||
| codegen_i128.rs | ||
| common.rs | ||
| compiler_builtins.rs | ||
| concurrency_limiter.rs | ||
| config.rs | ||
| constant.rs | ||
| discriminant.rs | ||
| global_asm.rs | ||
| inline_asm.rs | ||
| lib.rs | ||
| linkage.rs | ||
| main_shim.rs | ||
| num.rs | ||
| pointer.rs | ||
| pretty_clif.rs | ||
| toolchain.rs | ||
| trap.rs | ||
| unsize.rs | ||
| value_and_place.rs | ||
| vtable.rs | ||