Skip to content

Commit 409e7f6

Browse files
committed
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
2 parents 41bafc4 + 04edb2b commit 409e7f6

File tree

6 files changed

+149
-151
lines changed

6 files changed

+149
-151
lines changed

.gitignore

-1
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,6 @@ build/
5858
\#*
5959
\#*\#
6060
.#*
61-
rustc-ice-*.txt
6261

6362
## Tags
6463
tags

compiler/rustc_hir_analysis/src/lib.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -117,7 +117,7 @@ use rustc_hir::def::DefKind;
117117
fluent_messages! { "../messages.ftl" }
118118

119119
fn require_c_abi_if_c_variadic(tcx: TyCtxt<'_>, decl: &hir::FnDecl<'_>, abi: Abi, span: Span) {
120-
const CONVENTIONS_UNSTABLE: &str = "`C`, `cdecl`, `win64`, `sysv64` or `efiapi`";
120+
const CONVENTIONS_UNSTABLE: &str = "`C`, `cdecl`, `aapcs`, `win64`, `sysv64` or `efiapi`";
121121
const CONVENTIONS_STABLE: &str = "`C` or `cdecl`";
122122
const UNSTABLE_EXPLAIN: &str =
123123
"using calling conventions other than `C` or `cdecl` for varargs functions is unstable";

0 commit comments

Comments
 (0)