diff options
| author | bors <bors@rust-lang.org> | 2023-09-16 14:55:47 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2023-09-16 14:55:47 +0000 |
| commit | 409e7f6f21f9728fa1a4a277ed7d5618ba83cfb2 (patch) | |
| tree | dc0e0a150597320e97442852bd97a7a6c9e1bb2c /compiler/rustc_hir_analysis/src/lib.rs | |
| parent | 41bafc4ff3eb6a73aa40e60c3bd4494302c7ec57 (diff) | |
| parent | 04edb2bab83321b2f0aa5d6580fb50488c8afc28 (diff) | |
Auto merge of #115894 - matthiaskrgr:rollup-pe5efh4, r=matthiaskrgr
Rollup of 3 pull requests Successful merges: - #115860 (Enable varargs support for AAPCS calling convention) - #115867 (coverage: Simplify internal representation of debug types) - #115885 (don't globally ignore rustc-ice files) Failed merges: - #115873 (Make `TyKind::Adt`'s `Debug` impl be more pretty) - #115884 (make ty::Const debug printing less verbose) r? `@ghost` `@rustbot` modify labels: rollup
Diffstat (limited to 'compiler/rustc_hir_analysis/src/lib.rs')
| -rw-r--r-- | compiler/rustc_hir_analysis/src/lib.rs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/compiler/rustc_hir_analysis/src/lib.rs b/compiler/rustc_hir_analysis/src/lib.rs index b0f333b79ca..ef788935efb 100644 --- a/compiler/rustc_hir_analysis/src/lib.rs +++ b/compiler/rustc_hir_analysis/src/lib.rs @@ -117,7 +117,7 @@ use rustc_hir::def::DefKind; fluent_messages! { "../messages.ftl" } fn require_c_abi_if_c_variadic(tcx: TyCtxt<'_>, decl: &hir::FnDecl<'_>, abi: Abi, span: Span) { - const CONVENTIONS_UNSTABLE: &str = "`C`, `cdecl`, `win64`, `sysv64` or `efiapi`"; + const CONVENTIONS_UNSTABLE: &str = "`C`, `cdecl`, `aapcs`, `win64`, `sysv64` or `efiapi`"; const CONVENTIONS_STABLE: &str = "`C` or `cdecl`"; const UNSTABLE_EXPLAIN: &str = "using calling conventions other than `C` or `cdecl` for varargs functions is unstable"; |