Repository navigation
rustfmt subtree update (v1.12.0) - #165378
Conversation
The main thing here is to be more explicit on assertions: e.g. to answer are we expecting something to be printed to stdout or stderr? I thought about rewriting the existing macro to handle this case too, but couldn't find a good approach for that, and decided that the plain code, while more lines, was more readable.
Firstly, Simplify the directory structure: we only need a single package here, so drag everything up for that. Secondly, make it more explicit exactly which config we expect to read by setting up configs with different options, rather than just ignoring all formatting. Also add tests for other existing behaviour: searching in `HOME` and `XDG_CONFIG_HOME` when no config is given nor found.
…est-updates Integration test updates
Fix `cfg_if!` error count leaks
So we can assert that `rustfmt` exits how we expect.
Allow `llm-assisted` label to be set by users without write access
I.e. do not try to use `{{ ... }}` concise double-block formatting if
there are comments in-between the outer/inner braces.
…omments Don't lose comments and attributes between `cfg_select!` predicates, outer/inner blocks, arm body and trailing commas
Based on rustfmt issue 7215 it seems that we missed handling different kinds of string literals. Before trying to address that issue I thought it would be best if we refactored the match to be exhaustive.
…ontrol-brace-style Have `cfg_select!` double-brace concise formatting respect `control_brace_style`
Signed-off-by: hashcatHitman <155700084+hashcatHitman@users.noreply.github.com>
Signed-off-by: hashcatHitman <155700084+hashcatHitman@users.noreply.github.com>
Signed-off-by: hashcatHitman <155700084+hashcatHitman@users.noreply.github.com>
Signed-off-by: hashcatHitman <155700084+hashcatHitman@users.noreply.github.com>
Signed-off-by: hashcatHitman <155700084+hashcatHitman@users.noreply.github.com>
Signed-off-by: hashcatHitman <155700084+hashcatHitman@users.noreply.github.com>
Signed-off-by: hashcatHitman <155700084+hashcatHitman@users.noreply.github.com>
|
Okay, the rollup failed, so let's do this first. |
This comment has been minimized.
This comment has been minimized.
rustfmt subtree update (v1.12.0) Subtree update of `rustfmt` to rust-lang/rustfmt@4408c4c. Closes rust-lang/rustfmt#7225. Created using https://github.com/rust-lang/josh-sync. [See the CHANGELOG for all notable changes going out as part of `v1.12.0`](https://github.com/rust-lang/rustfmt/blob/main/CHANGELOG.md#1120-2026-12-24) r? @jieyouxu
|
What do I need to change in my PR once the rustfmt sync has happened? |
Raced 😆 I left a comment in your PR :D |
|
Assuming CI is green is there a simple patch we can apply to #162232 to make it work with this PR? |
|
💔 Test for fc7fbf5 failed: CI. Failed job:
|
|
@bors retry |
This comment has been minimized.
This comment has been minimized.
|
The job Click to see the possible cause of the failure (guessed by this bot) |
What is this?This is an experimental post-merge analysis report that shows differences in test outcomes between the merged PR and its parent PR.Comparing 6a98084 (parent) -> a94dce0 (this PR) Test differencesShow 15 test diffsStage 1
Additionally, 2 doctest diffs were found. These are ignored, as they are noisy. Job group index Test dashboardRun cargo run --manifest-path src/ci/citool/Cargo.toml -- \
test-dashboard a94dce0bbb3aab81bfdcc30e8a55d7dc95bc644d --output-dir test-dashboardAnd then open Job duration changes
How to interpret the job duration changes?Job durations can vary a lot, based on the actual runner instance |
|
Finished benchmarking commit (a94dce0): comparison URL. Overall result: no relevant changes - no action needed@rustbot label: -perf-regression Instruction countThis perf run didn't have relevant results for this metric. Max RSS (memory usage)Results (secondary -2.0%)A less reliable metric. May be of interest, but not used to determine the overall result above.
CyclesResults (primary -3.0%)A less reliable metric. May be of interest, but not used to determine the overall result above.
Binary sizeThis perf run didn't have relevant results for this metric. Bootstrap: 482.475s -> 484.08s (0.33%) |
View all comments
Subtree update of
rustfmtto rust-lang/rustfmt@4408c4c.Closes rust-lang/rustfmt#7225.
Created using https://github.com/rust-lang/josh-sync.
See the CHANGELOG for all notable changes going out as part of
v1.12.0r? @jieyouxu