Skip to content

Commit e8d0d00

Browse files
Rollup merge of rust-lang#136993 - dpaoliello:cleanllvm4, r=workingjubilee
[cg_llvm] Remove dead error message Part of rust-lang#135502 Discovered a dead error message in rustc_codegen_llvm, so removing it. r? ``@Zalathar``
2 parents e961aac + bfdc961 commit e8d0d00

File tree

2 files changed

+0
-8
lines changed

2 files changed

+0
-8
lines changed

compiler/rustc_codegen_llvm/messages.ftl

-3
Original file line numberDiff line numberDiff line change
@@ -38,9 +38,6 @@ codegen_llvm_lto_proc_macro = lto cannot be used for `proc-macro` crate type wit
3838
codegen_llvm_mismatch_data_layout =
3939
data-layout for target `{$rustc_target}`, `{$rustc_layout}`, differs from LLVM target's `{$llvm_target}` default layout, `{$llvm_layout}`
4040
41-
codegen_llvm_multiple_source_dicompileunit = multiple source DICompileUnits found
42-
codegen_llvm_multiple_source_dicompileunit_with_llvm_err = multiple source DICompileUnits found: {$llvm_err}
43-
4441
codegen_llvm_parse_bitcode = failed to parse bitcode for LTO module
4542
codegen_llvm_parse_bitcode_with_llvm_err = failed to parse bitcode for LTO module: {$llvm_err}
4643

compiler/rustc_codegen_llvm/src/errors.rs

-5
Original file line numberDiff line numberDiff line change
@@ -131,8 +131,6 @@ pub enum LlvmError<'a> {
131131
LoadBitcode { name: CString },
132132
#[diag(codegen_llvm_write_thinlto_key)]
133133
WriteThinLtoKey { err: std::io::Error },
134-
#[diag(codegen_llvm_multiple_source_dicompileunit)]
135-
MultipleSourceDiCompileUnit,
136134
#[diag(codegen_llvm_prepare_thin_lto_module)]
137135
PrepareThinLtoModule,
138136
#[diag(codegen_llvm_parse_bitcode)]
@@ -155,9 +153,6 @@ impl<G: EmissionGuarantee> Diagnostic<'_, G> for WithLlvmError<'_> {
155153
PrepareThinLtoContext => fluent::codegen_llvm_prepare_thin_lto_context_with_llvm_err,
156154
LoadBitcode { .. } => fluent::codegen_llvm_load_bitcode_with_llvm_err,
157155
WriteThinLtoKey { .. } => fluent::codegen_llvm_write_thinlto_key_with_llvm_err,
158-
MultipleSourceDiCompileUnit => {
159-
fluent::codegen_llvm_multiple_source_dicompileunit_with_llvm_err
160-
}
161156
PrepareThinLtoModule => fluent::codegen_llvm_prepare_thin_lto_module_with_llvm_err,
162157
ParseBitcode => fluent::codegen_llvm_parse_bitcode_with_llvm_err,
163158
PrepareAutoDiff { .. } => fluent::codegen_llvm_prepare_autodiff_with_llvm_err,

0 commit comments

Comments
 (0)