Repository navigation
Rollup of 14 pull requests - #165394
Closed
JonathanBrouwer wants to merge 99 commits into
Closed
Rollup of 14 pull requests#165394JonathanBrouwer wants to merge 99 commits into
JonathanBrouwer wants to merge 99 commits into
Conversation
OpenBSD added getexecpath(3) to libc, which returns an already-canonicalized executable path directly. Replace the sysctl(KERN_PROC_ARGV)-based implementation. This was the last user of div_exact in std, so drop the exact_div feature gate.
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>
Fix rigidity assertion ICE Closes rust-lang#158773. The ICE was caused by non-rigid types reaching given depth on the code that disallowed them. We tried normalization first, according to @adwinwhite guidance, but it didn't work because the type could not be normalized at that point. What worked was preventing the non-rigid types reaching the assertion by treating non-rigid types equal to anything on an upper level. This fixed ICE and changed some diagnostics. The commits show all history: regression test, fix, and test changes. r? @adwinwhite
… r=ShoyuVanilla Refactorings in preparation for the move trait r? project-trait-system-refactor This does a couple of innocent refactorings that are necessary *both* for Forget and Move. By merging it, both the `Move` trait pr (rust-lang#161457) and work on the Forget trait can continue without conflicts, and when reviewing them, these refactorings don't need to be considered again. > [!NOTE] > I've not used an LLM for any part of this PR, or any other PR I make. This includes any related work like research.
Member
Author
|
@bors r+ p=5 force |
Contributor
Contributor
|
⌛ Testing commit a2a35e3 with merge f18cc8e... Workflow: https://github.com/rust-lang/rust/actions/runs/41617548081 |
rust-bors Bot
pushed a commit
that referenced
this pull request
Nov 3, 2026
…uwer Rollup of 14 pull requests Successful merges: - #165378 (rustfmt subtree update (v1.12.0)) - #149245 (Make inline attributes apply to the generated `poll` in async fn) - #164304 ([perf] Reuse CanonicalVarKinds if no new variables were added) - #165109 (Avoid building a region map when erasing bound regions) - #163393 (std: Use getexecpath() for current_exe() on OpenBSD) - #164896 (offload: pass the linked device image to the host pass) - #165358 (Reenable some cg_gcc tests that were disabled) - #165371 (Don't use `llvm_type` as the type of `static`s.) - #162232 (Replace `builtin #` with `k#`) - #162608 (Avoid oscillating line wrapping due to symbol indices) - #165029 (Use `MalformedLintAttributeInput` in more places) - #165203 (AIX: Implement TLS destructor guard in std and update dynamic-loading-cdylib test) - #165230 (Fix rigidity assertion ICE) - #165374 (Refactorings in preparation for the move trait)
Contributor
|
PR #165378, which is a member of this rollup, was unapproved. This rollup was thus unapproved. Auto build was cancelled due to unapproval. Cancelled workflows: |
Collaborator
|
The job Click to see the possible cause of the failure (guessed by this bot) |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Successful merges:
pollin async fn #149245 (Make inline attributes apply to the generatedpollin async fn)llvm_typeas the type ofstatics. #165371 (Don't usellvm_typeas the type ofstatics.)builtin #withk##162232 (Replacebuiltin #withk#)MalformedLintAttributeInputin more places #165029 (UseMalformedLintAttributeInputin more places)r? @ghost
Create a similar rollup