diff options
| author | bors <bors@rust-lang.org> | 2023-12-15 00:14:11 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2023-12-15 00:14:11 +0000 |
| commit | 03515c6a2278aba8d64def5c522fb146e721368f (patch) | |
| tree | a9b096290e84558dc5cf7b628dac00e97fceadf4 /compiler/rustc_codegen_llvm/src/errors.rs | |
| parent | de686cbc65478db53e3d51c52497685e852cc092 (diff) | |
| parent | 9648c485de28befa0e010cedbdb46ee965d8143d (diff) | |
| download | rust-03515c6a2278aba8d64def5c522fb146e721368f.tar.gz rust-03515c6a2278aba8d64def5c522fb146e721368f.zip | |
Auto merge of #118957 - workingjubilee:rollup-2hcwnp3, r=workingjubilee
Rollup of 4 pull requests Successful merges: - #118908 (Add all known `target_feature` configs to check-cfg) - #118933 (Cleanup errors handlers even more) - #118943 (update `measureme` to 10.1.2 to deduplicate `parking_lot`) - #118948 (Use the `Waker::noop` API in tests) r? `@ghost` `@rustbot` modify labels: rollup
Diffstat (limited to 'compiler/rustc_codegen_llvm/src/errors.rs')
| -rw-r--r-- | compiler/rustc_codegen_llvm/src/errors.rs | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/compiler/rustc_codegen_llvm/src/errors.rs b/compiler/rustc_codegen_llvm/src/errors.rs index 57ea13ddcd6..e6e37a02335 100644 --- a/compiler/rustc_codegen_llvm/src/errors.rs +++ b/compiler/rustc_codegen_llvm/src/errors.rs @@ -107,7 +107,8 @@ impl IntoDiagnostic<'_, FatalError> for ParseTargetMachineConfig<'_> { let (message, _) = diag.styled_message().first().expect("`LlvmError` with no message"); let message = handler.eagerly_translate_to_string(message.clone(), diag.args()); - let mut diag = handler.struct_diagnostic(fluent::codegen_llvm_parse_target_machine_config); + let mut diag = + handler.struct_almost_fatal(fluent::codegen_llvm_parse_target_machine_config); diag.set_arg("error", message); diag } |