diff options
| author | bors <bors@rust-lang.org> | 2024-10-10 20:25:54 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2024-10-10 20:25:54 +0000 |
| commit | 52fd9983996d9fcfb719749838336be66dee68f9 (patch) | |
| tree | 5287ac282e7dad8800887cdf918e26dbf6b84ebf /compiler/rustc_codegen_llvm/src/errors.rs | |
| parent | d0141af514abb03ee7bcf36d5419dcf5f2ce9812 (diff) | |
| parent | 8ddd3279c18d7ced79d623ec08ef6b4c125e4cc8 (diff) | |
| download | rust-52fd9983996d9fcfb719749838336be66dee68f9.tar.gz rust-52fd9983996d9fcfb719749838336be66dee68f9.zip | |
Auto merge of #131511 - matthiaskrgr:rollup-56qr0e5, r=matthiaskrgr
Rollup of 9 pull requests
Successful merges:
- #130308 (codegen_ssa: consolidate tied target checks)
- #130538 (Stabilize const `{slice,array}::from_mut`)
- #130741 (rustc_target: Add sme-b16b16 as an explicit aarch64 target feature)
- #131033 (Precise capturing in traits)
- #131442 (Match std `RUSTFLAGS` for host and target for `mir-opt` test suite to fix double std build/rebuilds)
- #131470 (add test infra to explicitely test rustc with autodiff/enzyme disabled)
- #131475 (Compiler & its UI tests: Rename remaining occurrences of "object safe" to "dyn compatible" )
- #131493 (Avoid redundant sysroot additions to `PATH` when linking)
- #131509 (Update .mailmap)
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 | 24 |
1 files changed, 0 insertions, 24 deletions
diff --git a/compiler/rustc_codegen_llvm/src/errors.rs b/compiler/rustc_codegen_llvm/src/errors.rs index bb481d2a308..0d436e1891e 100644 --- a/compiler/rustc_codegen_llvm/src/errors.rs +++ b/compiler/rustc_codegen_llvm/src/errors.rs @@ -80,30 +80,6 @@ impl<G: EmissionGuarantee> Diagnostic<'_, G> for ParseTargetMachineConfig<'_> { } } -pub(crate) struct TargetFeatureDisableOrEnable<'a> { - pub features: &'a [&'a str], - pub span: Option<Span>, - pub missing_features: Option<MissingFeatures>, -} - -#[derive(Subdiagnostic)] -#[help(codegen_llvm_missing_features)] -pub(crate) struct MissingFeatures; - -impl<G: EmissionGuarantee> Diagnostic<'_, G> for TargetFeatureDisableOrEnable<'_> { - fn into_diag(self, dcx: DiagCtxtHandle<'_>, level: Level) -> Diag<'_, G> { - let mut diag = Diag::new(dcx, level, fluent::codegen_llvm_target_feature_disable_or_enable); - if let Some(span) = self.span { - diag.span(span); - }; - if let Some(missing_features) = self.missing_features { - diag.subdiagnostic(missing_features); - } - diag.arg("features", self.features.join(", ")); - diag - } -} - #[derive(Diagnostic)] #[diag(codegen_llvm_lto_disallowed)] pub(crate) struct LtoDisallowed; |
