From 1376c5a617be5c25655d0d7cb63e3beaa5a6e026 Mon Sep 17 00:00:00 2001 From: Daniel Baumann Date: Wed, 17 Apr 2024 14:20:39 +0200 Subject: Merging upstream version 1.70.0+dfsg1. Signed-off-by: Daniel Baumann --- compiler/rustc_error_messages/locales/en-US.ftl | 1 - compiler/rustc_error_messages/messages.ftl | 1 + compiler/rustc_error_messages/src/lib.rs | 4 ++-- 3 files changed, 3 insertions(+), 3 deletions(-) delete mode 100644 compiler/rustc_error_messages/locales/en-US.ftl create mode 100644 compiler/rustc_error_messages/messages.ftl (limited to 'compiler/rustc_error_messages') diff --git a/compiler/rustc_error_messages/locales/en-US.ftl b/compiler/rustc_error_messages/locales/en-US.ftl deleted file mode 100644 index e62923744..000000000 --- a/compiler/rustc_error_messages/locales/en-US.ftl +++ /dev/null @@ -1 +0,0 @@ -# satisfy tidy lint by having a line in this file diff --git a/compiler/rustc_error_messages/messages.ftl b/compiler/rustc_error_messages/messages.ftl new file mode 100644 index 000000000..e62923744 --- /dev/null +++ b/compiler/rustc_error_messages/messages.ftl @@ -0,0 +1 @@ +# satisfy tidy lint by having a line in this file diff --git a/compiler/rustc_error_messages/src/lib.rs b/compiler/rustc_error_messages/src/lib.rs index 010e5f060..6f319b96f 100644 --- a/compiler/rustc_error_messages/src/lib.rs +++ b/compiler/rustc_error_messages/src/lib.rs @@ -1,5 +1,5 @@ #![feature(let_chains)] -#![feature(once_cell)] +#![feature(lazy_cell)] #![feature(rustc_attrs)] #![feature(type_alias_impl_trait)] #![deny(rustc::untranslatable_diagnostic)] @@ -34,7 +34,7 @@ use intl_memoizer::IntlLangMemoizer; pub use fluent_bundle::{self, types::FluentType, FluentArgs, FluentError, FluentValue}; pub use unic_langid::{langid, LanguageIdentifier}; -fluent_messages! { "../locales/en-US.ftl" } +fluent_messages! { "../messages.ftl" } pub type FluentBundle = fluent_bundle::bundle::FluentBundle; -- cgit v1.2.3