Skip to content

Rollup of 30 pull requests - #160721

Closed
jhpratt wants to merge 138 commits into
rust-lang:mainfrom
jhpratt:rollup-1MnfOQE
Closed

Rollup of 30 pull requests#160721
jhpratt wants to merge 138 commits into
rust-lang:mainfrom
jhpratt:rollup-1MnfOQE

Conversation

@jhpratt

@jhpratt jhpratt commented Aug 7, 2026

Copy link
Copy Markdown
Member

Successful merges:

r? @ghost

Create a similar rollup

sjwang05 and others added 30 commits June 12, 2026 22:03
Proving `T::Assoc<_>: Sized` while a where-clause bound `T::Assoc<u8>: Sized`
was in scope used to over-eagerly infer the unconstrained argument to `u8`,
causing a spurious "mismatched types" error. It should compile; lock that in.
Add tests for generic function pointers
Change FnPtr tests to use assert_eq!() rather than println!()
don't force intrinsic results into memory
This updates the rust-version file to 7218ebe.
Move command-result printing into a helper and keep CLI loop control at the call site.
Consume Priroda's --dap flag before handing arguments to rustc_driver::run_compiler, then dispatch the freshly-created PrirodaContext to either the existing CLI loop or a new DAP loop stub.
Add FirstUserSourceLocation ResumeMode variant that stops when the
interpreter reaches a user-relevant frame with a source location.
This gives the DAP frontend an entry-stop primitive that skips
Miri-internal and std frames.
@rustbot rustbot added A-testsuite Area: The testsuite used to check the correctness of rustc O-unix Operating system: Unix-like S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. T-bootstrap Relevant to the bootstrap subteam: Rust's build system (x.py and src/bootstrap) T-compiler Relevant to the compiler team, which will review and decide on the PR/issue. T-infra Relevant to the infrastructure team, which will review and decide on the PR/issue. T-libs Relevant to the library team, which will review and decide on the PR/issue. T-rustdoc Relevant to the rustdoc team, which will review and decide on the PR/issue. WG-trait-system-refactor The Rustc Trait System Refactor Initiative (-Znext-solver) labels Aug 7, 2026
@jhpratt

jhpratt commented Aug 7, 2026

Copy link
Copy Markdown
Member Author

@bors r+ p=5

@bors try jobs=dist-various-1,test-various,x86_64-gnu-aux,x86_64-gnu-llvm-21-3,x86_64-msvc-1,aarch64-apple-,x86_64-mingw-1,i686-msvc-

@rust-bors

rust-bors Bot commented Aug 7, 2026

Copy link
Copy Markdown
Contributor

📌 Commit 56427be 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 Aug 7, 2026
@rust-bors

This comment has been minimized.

rust-bors Bot pushed a commit that referenced this pull request Aug 7, 2026
Rollup of 30 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-*
@JonathanBrouwer

Copy link
Copy Markdown
Contributor

@jhpratt fyi the hang on #160682 (comment) seems real, I haven't had time to debug it yet

@jhpratt

jhpratt commented Aug 7, 2026

Copy link
Copy Markdown
Member Author

@bors p=0

In case the current PR being tested fails. Set back once it's figured out.

I saw it was a timeout; is that not typically spurious?

@JonathanBrouwer

JonathanBrouwer commented Aug 7, 2026

Copy link
Copy Markdown
Contributor

Both the try job and test job stalled on the same job so I expected it to be real

@JonathanBrouwer

Copy link
Copy Markdown
Contributor

Could just be very unlucky tho, so let's see what the try job on this rollup does

@jhpratt

jhpratt commented Aug 7, 2026

Copy link
Copy Markdown
Member Author

Hmm...well this rollup is here even if something else has to be scheduled ahead of it. We'll see what happens with the current PR.

@rust-log-analyzer

Copy link
Copy Markdown
Collaborator

The job tidy failed! Check out the build log: (web) (plain enhanced) (plain)

Click to see the possible cause of the failure (guessed by this bot)
#14 3.018 Building wheels for collected packages: reuse
#14 3.020   Building wheel for reuse (pyproject.toml): started
#14 3.253   Building wheel for reuse (pyproject.toml): finished with status 'done'
#14 3.254   Created wheel for reuse: filename=reuse-4.0.3-cp310-cp310-manylinux_2_35_x86_64.whl size=132857 sha256=6a78a69541e3df9c7c106367722bab90241125ee6b7cdb81c5e40637268f85a9
#14 3.255   Stored in directory: /tmp/pip-ephem-wheel-cache-2ymne7iv/wheels/3d/8d/0a/e0fc6aba4494b28a967ab5eaf951c121d9c677958714e34532
#14 3.257 Successfully built reuse
#14 3.257 Installing collected packages: boolean-py, binaryornot, tomlkit, reuse, python-debian, markupsafe, license-expression, jinja2, chardet, attrs
#14 3.687 Successfully installed attrs-23.2.0 binaryornot-0.4.4 boolean-py-4.0 chardet-5.2.0 jinja2-3.1.4 license-expression-30.3.0 markupsafe-2.1.5 python-debian-0.1.49 reuse-4.0.3 tomlkit-0.13.0
#14 3.688 WARNING: Running pip as the 'root' user can result in broken permissions and conflicting behaviour with the system package manager. It is recommended to use a virtual environment instead: https://pip.pypa.io/warnings/venv
#14 4.329 Collecting virtualenv
---
finished building tool typos
error: `Trivally` should be `Trivially`
   ╭▸ compiler/rustc_const_eval/src/interpret/call.rs:79:16
   │
79 │             // Trivally trivial-ABI types (because Rust makes no promises about their ABI).
   ╰╴               ━━━━━━━━
rerun with `--bless` to fix typos: `./x.py test tidy --extra-checks=spellcheck --bless`
tidy [extra_checks:spellcheck]: checks with external tool 'typos' failed
tidy [extra_checks:spellcheck]: FAIL
yarn install v1.22.22
warning package.json: No license field
warning ../../package.json: License should be a valid SPDX license expression
warning No license field
[1/4] Resolving packages...
---
Running eslint on rustdoc JS files
info: ES-Check: checking 7 files...
info: ✓ ES-Check passed! All files are ES10 compatible.
typechecking javascript files
tidy: The following check failed: extra_checks:spellcheck
Command `/checkout/obj/build/x86_64-unknown-linux-gnu/stage1-tools-bin/rust-tidy --root-path=/checkout --cargo-path=/checkout/obj/build/x86_64-unknown-linux-gnu/stage0/bin/cargo --output-dir=/checkout/obj/build --concurrency=4 --npm-path=/node/bin/yarn --ci=true --extra-checks=py,cpp,js,spellcheck` failed with exit code 1
Created at: src/bootstrap/src/core/build_steps/tool.rs:1605:23
Executed at: src/bootstrap/src/core/build_steps/test.rs:1660:29

Command has failed. Rerun with -v to see more details.
Bootstrap failed while executing `test src/tools/tidy tidyselftest --extra-checks=py,cpp,js,spellcheck`
Currently active steps:
test::Tidy {  } at src/bootstrap/src/core/build_steps/test.rs:1582
Build completed unsuccessfully in 0:02:51
  local time: Fri Aug  7 20:30:53 UTC 2026

@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 Aug 7, 2026
@rust-bors

rust-bors Bot commented Aug 7, 2026

Copy link
Copy Markdown
Contributor

PR #160658, which is a member of this rollup, was unapproved.

This rollup was thus unapproved.

@rust-bors rust-bors Bot removed the S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. label Aug 7, 2026
@rustbot rustbot removed the S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. label Aug 7, 2026
@JonathanBrouwer

Copy link
Copy Markdown
Contributor

Since the try jobs succeeded here I guess we did just get unlucky twice on the same job, lol

@rust-bors

rust-bors Bot commented Aug 7, 2026

Copy link
Copy Markdown
Contributor

☀️ Try build successful (CI)
Build commit: 5ea643a (5ea643a310db50d926213cf092036cf0fefc04fc)
Base parent: 65bcac4 (65bcac45b3d8a8b2126e5cc844cf6fff5795d32a)

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

A-attributes Area: Attributes (`#[…]`, `#![…]`) A-CI Area: Our Github Actions CI A-LLVM Area: Code generation parts specific to LLVM. Both correctness bugs and optimization-related issues. A-run-make Area: port run-make Makefiles to rmake.rs A-rustdoc-json Area: Rustdoc JSON backend A-testsuite Area: The testsuite used to check the correctness of rustc O-unix Operating system: Unix-like rollup A PR which is a rollup T-bootstrap Relevant to the bootstrap subteam: Rust's build system (x.py and src/bootstrap) T-compiler Relevant to the compiler team, which will review and decide on the PR/issue. T-infra Relevant to the infrastructure team, which will review and decide on the PR/issue. T-libs Relevant to the library team, which will review and decide on the PR/issue. T-rustdoc Relevant to the rustdoc 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.