1
Fork 0

Rollup merge of #118158 - nnethercote:reduce-fluent-boilerplate, r=compiler-errors

Reduce fluent boilerplate

Best reviewed one commit at a time.

r? `@davidtwco`
This commit is contained in:
Michael Goulet 2023-11-25 17:23:33 -05:00 committed by GitHub
commit 3b2f33ee28
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
51 changed files with 305 additions and 418 deletions

View file

@ -99,8 +99,6 @@ pub mod structured_errors;
mod variance;
use rustc_errors::ErrorGuaranteed;
use rustc_errors::{DiagnosticMessage, SubdiagnosticMessage};
use rustc_fluent_macro::fluent_messages;
use rustc_hir as hir;
use rustc_middle::middle;
use rustc_middle::query::Providers;
@ -115,7 +113,7 @@ use astconv::{AstConv, OnlySelfBounds};
use bounds::Bounds;
use rustc_hir::def::DefKind;
fluent_messages! { "../messages.ftl" }
rustc_fluent_macro::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`, `aapcs`, `win64`, `sysv64` or `efiapi`";