Rollup of 17 pull requests#158389
Closed
JonathanBrouwer wants to merge 50 commits into
Closed
Conversation
…impl Send + dyn Trait Add a regression test covering the case where a type uses PhantomData<*mut ()> to opt out of Sync, restores Send via an unsafe impl, and is then captured across an .await point with a trait object type parameter (Box<dyn Trait>). The compiler currently erases lifetimes in MIR coroutine witnesses, losing the 'static bound needed to apply the unsafe impl Send. The test verifies this is fixed by -Zhigher-ranked-assumptions and documents the PhantomData<Cell<()>> workaround as a comparison. See the PR description for links to the relevant issues. Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
There will still be one for things that aren't just scalars or scalar pairs.
When emitting a `memcpy` for a scalable vector, the size computed by rustc (`num_vectors * element_count * element_ty`), since rust-lang#157915, needs to be multiplied by `vscale`.
Currently, rustc can emit a FatalError diagnostic during parsing of literals and tokenstreams. These are handled under the hood as a panic, which means that proc-macro code needed to catch_unwind if it wanted to fallibly parse some code. These still emit diagnostics, so in practice this isn't a full fix, but it at least makes the interface on the macro side a bit more uniform. This is primarily motivated by wasm proc macros which can't use catch_unwind and so this lets the test's output be the same with and without them.
And remove redundant const fn
While it would be reasonable to expect the Windows linker to handle linker args in the .drectve section identical to cli arguments, as it turns out exporting weak symbols only works when the /EXPORT is in the .drectve section, not when it is a linker argument or when a .DEF file is used.
- const, async, and unsafe functions - const generics, complex types, and where clauses (including impl Tuple)
…ity.md The sentence in `src/doc/unstable-book/src/compiler-flags/default-visibility.md` contained the misspelling "earier" where "earlier" was meant. ``` -shared objects earier in the load order. +shared objects earlier in the load order. ``` This is detected by the project's typos configuration; `./x test tidy --extra-checks=spellcheck` would flag it on the next run. Signed-off-by: Dodothereal <129273127+Dodothereal@users.noreply.github.com>
The new normalization regex is taken from many existing test cases, see: https://github.com/search?q=repo%3Arust-lang%2Frust+%2Fthread+%27rustc%27%5C.%5C*panicked%2F&type=code which includes files such as `tests/ui/treat-err-as-bug/span_delayed_bug.rs` or `tests/ui/treat-err-as-bug/err.rs`
Fixup the refactoring errors in rust-lang#156246 r? @lcnr
Contributor
Author
Contributor
Contributor
|
⌛ Trying commit 7418fd5 with merge 029f50a… To cancel the try build, run the command Workflow: https://github.com/rust-lang/rust/actions/runs/28151766626 |
rust-bors Bot
pushed a commit
that referenced
this pull request
Jun 25, 2026
Rollup of 17 pull requests try-job: dist-various-1 try-job: test-various try-job: x86_64-gnu-aux try-job: x86_64-gnu-llvm-21-3 try-job: x86_64-msvc-1 try-job: aarch64-apple try-job: x86_64-mingw-1 try-job: i686-msvc-2
Collaborator
|
The job Click to see the possible cause of the failure (guessed by this bot) |
Contributor
|
PR #158327, which is a member of this rollup, was unapproved. This rollup was thus unapproved. |
Contributor
Author
|
@bors try cancel |
Contributor
|
Try build cancelled. Cancelled workflows: |
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:
vscale#158253 (codegen_ssa: multiply scalable vec size byvscale)transmute_neoinassume_init#158345 (Usetransmute_neoinassume_init)resume_unwindis called inside the panic hook #158369 (std: abort whenresume_unwindis called inside the panic hook)bootstrap.tomlconfig changes" #158380 (Revert "rebuild LLVM whenbootstrap.tomlconfig changes")stdtocore#158327 (Move attribute and keyword docs fromstdtocore)tests/ui/issues[14/N] #158338 (Reorganizetests/ui/issues[14/N])Item::const_stabilityinfo in rustdoc JSON. #158343 (IncludeItem::const_stabilityinfo in rustdoc JSON.)RerunNonErasederror type mirroringNoSolution, to better track when we're bailing #156246)Failed merges:
r? @ghost
Create a similar rollup