bjoernager/rust
bjoernager/rust
1
Fork 0
Code Activity

Rename user_provided_sysroot argument of fluent_bundle

Browse source
This commit is contained in:
bjorn3 2025-03-12 13:54:41 +00:00
parent 926b5d2e4f
commit f51d1d29f7
1 changed files with 2 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

6
compiler/rustc_error_messages/src/lib.rs
View file

@ -107,7 +107,7 @@ impl From<Vec<FluentError>> for TranslationBundleError {
/// (overriding any conflicting messages). /// (overriding any conflicting messages).
#[instrument(level = "trace")] #[instrument(level = "trace")]
pub fn fluent_bundle( pub fn fluent_bundle(
user_provided_sysroot: PathBuf, sysroot: PathBuf,
sysroot_candidates: Vec<PathBuf>, sysroot_candidates: Vec<PathBuf>,
requested_locale: Option<LanguageIdentifier>, requested_locale: Option<LanguageIdentifier>,
additional_ftl_path: Option<&Path>, additional_ftl_path: Option<&Path>,
@ -142,9 +142,7 @@ pub fn fluent_bundle(
// If the user requests the default locale then don't try to load anything. // If the user requests the default locale then don't try to load anything.
if let Some(requested_locale) = requested_locale { if let Some(requested_locale) = requested_locale {
let mut found_resources = false; let mut found_resources = false;
for mut sysroot in for mut sysroot in Some(sysroot).into_iter().chain(sysroot_candidates.into_iter()) {
Some(user_provided_sysroot).into_iter().chain(sysroot_candidates.into_iter())
{
sysroot.push("share"); sysroot.push("share");
sysroot.push("locale"); sysroot.push("locale");
sysroot.push(requested_locale.to_string()); sysroot.push(requested_locale.to_string());