Skip to content

Rollup of 4 pull requests#156821

Closed
jhpratt wants to merge 9 commits into
rust-lang:mainfrom
jhpratt:rollup-si1xPsa
Closed

Rollup of 4 pull requests#156821
jhpratt wants to merge 9 commits into
rust-lang:mainfrom
jhpratt:rollup-si1xPsa

Conversation

@jhpratt
Copy link
Copy Markdown
Member

@jhpratt jhpratt commented May 22, 2026

Successful merges:

r? @ghost

Create a similar rollup

Walnut356 and others added 9 commits April 27, 2026 01:03
…ulacrum

[Debug Info] Gracefully handle invalid `String`/`Vec`

Somewhat related to rust-lang#150392.

Currently the handling can throw an exception, which we should absolutely not do. It causes issues with debugger adapters (e.g. CodeLLDB will hang forever. Trying to stop the debugger via vscode's interface causes a CodeLLDB to leak memory constantly until RAM is depleted and the OS starts killing processes). The exception has been replaced with a printed error message and a placeholder value.

Additionally, if a String/Vec is in an "invalid" state due to niche optimization (`capacity >= (1 << 63)`, common with `Option<String>`/`Option<Vec<T>>`), the pointer and length values will be meaningless, but are not guaranteed to be 0'd. The debugger will happily proceed as if they are useful values, and often do things like \<try to read multiple GB of data from the debugee\>.

I added simple checks to ensure that the capacity and length are within bounds, and that the pointer is non-null. If any check fails, the string/vec just acts as if it's empty.

Eventually this problem will be solved on LLDB's end via llvm/llvm-project#188487 or similar, but preventing issues on our end in the short term will help a lot.

---

try-job: aarch64-apple
…-compiler-doc-comments, r=jackh726

compiler: fix duplicated "the" in two doc-comments

Two one-line typo fixes for duplicated "the" in compiler doc-comments:
- `compiler/rustc_type_ir/src/solve/mod.rs` — "only if any of the the opaques in the opaque type storage has a hidden type" → "...any of the opaques in..."
- `compiler/rustc_borrowck/src/diagnostics/var_name.rs` — "/// Find the the name and span of the variable corresponding to the given region." → "/// Find the name and span of the variable corresponding to the given region."

No code/behavior change.
…diagnostic, r=jackh726

Remove stale RTN FIXME for assoc item constraint fallback

The old FIXME suggested that this diagnostic path should emit a `return_type_notation` feature-gate diagnostic.

That is no longer correct: RTN associated item constraints now use `(..)`, so a form like `Trait<method(): Bound>` is not made valid by enabling `return_type_notation`.

This PR removes the stale FIXME without changing the diagnostic behavior.
@rust-bors rust-bors Bot added the rollup A PR which is a rollup label May 22, 2026
@rustbot rustbot added S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. T-compiler Relevant to the compiler team, which will review and decide on the PR/issue. WG-trait-system-refactor The Rustc Trait System Refactor Initiative (-Znext-solver) labels May 22, 2026
@jhpratt
Copy link
Copy Markdown
Member Author

jhpratt commented May 22, 2026

@bors r+ rollup=never p=5

@rust-bors
Copy link
Copy Markdown
Contributor

rust-bors Bot commented May 22, 2026

📌 Commit c6083a0 has been approved by jhpratt

It is now in the queue for this repository.

@rust-bors rust-bors Bot added S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. and removed S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. labels May 22, 2026
@rust-bors

This comment has been minimized.

rust-bors Bot pushed a commit that referenced this pull request May 22, 2026
Rollup of 4 pull requests

Successful merges:

 - #155509 ([Debug Info] Gracefully handle invalid `String`/`Vec`)
 - #156560 (compiler: fix duplicated "the" in two doc-comments)
 - #156725 (Remove stale RTN FIXME for assoc item constraint fallback)
 - #156818 (Privacy: enqueue type alias)
@rust-log-analyzer
Copy link
Copy Markdown
Collaborator

The job dist-arm-linux-musl failed! Check out the build log: (web) (plain enhanced) (plain)

Click to see the possible cause of the failure (guessed by this bot)
[TIMING:end] builder::Libdir { compiler: Compiler { stage: 0, host: x86_64-unknown-linux-gnu, forced_compiler: false }, target: x86_64-unknown-linux-gnu } -- 0.000
[TIMING:end] compile::StdLink { compiler: Compiler { stage: 0, host: x86_64-unknown-linux-gnu, forced_compiler: false }, target_compiler: Compiler { stage: 0, host: x86_64-unknown-linux-gnu, forced_compiler: false }, target: x86_64-unknown-linux-gnu, crates: [], force_recompile: false } -- 0.001
##[group]Building stage1 compiler artifacts (stage0 -> stage1, x86_64-unknown-linux-gnu)
    Updating crates.io index
error: failed to get `thorin-dwp` as a dependency of package `rustc_codegen_ssa v0.0.0 (/checkout/compiler/rustc_codegen_ssa)`

Caused by:
  failed to load source for dependency `thorin-dwp`

Caused by:
  unable to update registry `crates-io`

Caused by:
  download of th/or/thorin-dwp failed

Caused by:
  curl failed

Caused by:

@rust-bors rust-bors Bot added S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. and removed S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. labels May 22, 2026
@rust-bors
Copy link
Copy Markdown
Contributor

rust-bors Bot commented May 22, 2026

💔 Test for 9d1cfa8 failed: CI. Failed job:

@rust-bors rust-bors Bot added the S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. label May 22, 2026
@rustbot rustbot removed the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label May 22, 2026
@rust-bors
Copy link
Copy Markdown
Contributor

rust-bors Bot commented May 22, 2026

This pull request was unapproved due to being closed.

@jhpratt jhpratt deleted the rollup-si1xPsa branch May 22, 2026 13:34
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

rollup A PR which is a rollup S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. T-compiler Relevant to the compiler team, which will review and decide on the PR/issue. WG-trait-system-refactor The Rustc Trait System Refactor Initiative (-Znext-solver)

Projects

None yet

Development

Successfully merging this pull request may close these issues.

8 participants