Skip to content

Commit 771cfa5

Browse files
authored
Rollup merge of #104543 - JhonnyBillM:migrate-codegen-ssa-to-diagnostics-structs-pt3, r=davidtwco
Migrate `codegen_ssa` to diagnostics structs - [Part 3] Completes migrating `codegen_ssa` module except 2 outstanding errors that depend on other crates: 1. [`rustc_middle::mir::interpret::InterpError`](https://github.com/rust-lang/rust/blob/b6097f2e1b2ca62e188ba53cf43bd66b06b36915/compiler/rustc_middle/src/mir/interpret/error.rs#L475): I saw `rustc_middle` is unassigned, I am open to take this work. 2. `codegen_llvm`'s use of `fn span_invalid_monomorphization_error`, which I started to replace in the [last commit](9a31b3c) of this PR, but would like to know the team's preference on how we should keep replacing the other macros: 2.1. Update macros to expect a `Diagnostic` 2.2. Remove macros and expand the code on each use. See [some examples of the different options in this experimental commit](JhonnyBillM@64aee83) _Part 2 - https://github.com/rust-lang/rust/pull/103792_ r? ``@davidtwco`` Cc ``@compiler-errors``
2 parents 08653c8 + 4d63d7d commit 771cfa5

File tree

15 files changed

+920
-341
lines changed

15 files changed

+920
-341
lines changed

Cargo.lock

+2
Original file line numberDiff line numberDiff line change
@@ -3890,6 +3890,7 @@ dependencies = [
38903890
"rustc_span",
38913891
"rustc_symbol_mangling",
38923892
"rustc_target",
3893+
"rustc_type_ir",
38933894
"serde_json",
38943895
"smallvec",
38953896
"snap",
@@ -4024,6 +4025,7 @@ dependencies = [
40244025
"rustc_serialize",
40254026
"rustc_span",
40264027
"rustc_target",
4028+
"rustc_type_ir",
40274029
"serde",
40284030
"serde_json",
40294031
"termcolor",

0 commit comments

Comments
 (0)