Skip to content

Rollup of 7 pull requests #138445

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wants to merge 20 commits into from
Closed
Changes from 1 commit
Commits
Show all changes
20 commits
Select commit Hold shift + click to select a range
c620d76
move naked function assembly tests to their own directory
folkertdev Feb 28, 2025
f35bda3
support XCOFF in `naked_asm!`
folkertdev Feb 28, 2025
112f7b0
make precise capturing args in rustdoc Json typed
Kohei316 Mar 2, 2025
47ba5bd
Enable `f16` tests for `powf`
tgross35 Mar 11, 2025
e185493
bump libc to 0.2.171 to fix xous
xobs Mar 11, 2025
576bcfc
Update compiletest's `has_asm_support` to match rustc
cuviper Mar 11, 2025
34de658
ci: add runners for vanilla LLVM 20
cuviper Mar 12, 2025
b54398e
Make opts.maybe_sysroot non-optional
bjorn3 Mar 7, 2025
0a67951
Avoid unnecessary argument mutation in fluent_bundle
bjorn3 Mar 7, 2025
7e8494f
Don't return an error from get_or_default_sysroot
bjorn3 Mar 7, 2025
926b5d2
Use materialize_sysroot in rustdoc
bjorn3 Mar 7, 2025
f51d1d2
Rename user_provided_sysroot argument of fluent_bundle
bjorn3 Mar 12, 2025
1543256
Remove unused host_tlib_path field
bjorn3 Mar 12, 2025
4a18fe5
Rollup merge of #137816 - folkertdev:naked-asm-xcoff, r=Noratrieb
matthiaskrgr Mar 13, 2025
acb1395
Rollup merge of #138109 - Kohei316:feat/rust-doc-precise-capturing-ar…
matthiaskrgr Mar 13, 2025
19227b0
Rollup merge of #138343 - tgross35:f16-powf, r=joboet
matthiaskrgr Mar 13, 2025
0531a09
Rollup merge of #138356 - betrusted-io:bump-libc-0.2.171, r=jhpratt
matthiaskrgr Mar 13, 2025
67ed644
Rollup merge of #138371 - cuviper:stable-asm-test, r=jieyouxu
matthiaskrgr Mar 13, 2025
ff54dcc
Rollup merge of #138380 - cuviper:ci-llvm-20, r=Kobzol
matthiaskrgr Mar 13, 2025
78e08c2
Rollup merge of #138404 - bjorn3:sysroot_handling_cleanup, r=petroche…
matthiaskrgr Mar 13, 2025
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Avoid unnecessary argument mutation in fluent_bundle
  • Loading branch information
bjorn3 committed Mar 12, 2025
commit 0a679514d41443329c183110a4142e6813bc4307
8 changes: 4 additions & 4 deletions compiler/rustc_error_messages/src/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -107,8 +107,8 @@ impl From<Vec<FluentError>> for TranslationBundleError {
/// (overriding any conflicting messages).
#[instrument(level = "trace")]
pub fn fluent_bundle(
mut user_provided_sysroot: PathBuf,
mut sysroot_candidates: Vec<PathBuf>,
user_provided_sysroot: PathBuf,
sysroot_candidates: Vec<PathBuf>,
requested_locale: Option<LanguageIdentifier>,
additional_ftl_path: Option<&Path>,
with_directionality_markers: bool,
Expand Down Expand Up @@ -142,8 +142,8 @@ pub fn fluent_bundle(
// If the user requests the default locale then don't try to load anything.
if let Some(requested_locale) = requested_locale {
let mut found_resources = false;
for sysroot in
Some(&mut user_provided_sysroot).into_iter().chain(sysroot_candidates.iter_mut())
for mut sysroot in
Some(user_provided_sysroot).into_iter().chain(sysroot_candidates.into_iter())
{
sysroot.push("share");
sysroot.push("locale");
Expand Down