Skip to content

Conversation

@matthiaskrgr
Copy link
Member

@matthiaskrgr matthiaskrgr commented Nov 2, 2025

Successful merges:

r? @ghost
@rustbot modify labels: rollup

Create a similar rollup

The Miri Cronjob Bot and others added 30 commits October 16, 2025 04:53
This updates the rust-version file to 402ce0e.
Pull recent changes from https://github.com/rust-lang/rust via Josh.

Upstream ref: 402ce0e
Filtered ref: 33df85ebec1b1ac6085e256a69581e3d36cfd514
Upstream diff: rust-lang/rust@28d0a4a...402ce0e

This merge was created using https://github.com/rust-lang/josh-sync.
This updates the rust-version file to 96fe3c3.
Pull recent changes from https://github.com/rust-lang/rust via Josh.

Upstream ref: 96fe3c3
Filtered ref: 376a7557c3e562036e170fb694d45d70b14951c3
Upstream diff: rust-lang/rust@402ce0e...96fe3c3

This merge was created using https://github.com/rust-lang/josh-sync.
native_call: we only support thin pointers as return type
This updates the rust-version file to 6244eff.
Pull recent changes from https://github.com/rust-lang/rust via Josh.

Upstream ref: 6244eff
Filtered ref: 2b788f903ef58db43f16530dbf73f4a0502e4452
Upstream diff: rust-lang/rust@96fe3c3...6244eff

This merge was created using https://github.com/rust-lang/josh-sync.
…cargo-toml

Avoid panicking when `Cargo.toml` is not present
This updates the rust-version file to 27050c0.
Pull recent changes from https://github.com/rust-lang/rust via Josh.

Upstream ref: 27050c0
Filtered ref: 2bccf110c70c6f6ec349ede9fbf0b4cdcf77eac6
Upstream diff: rust-lang/rust@6244eff...27050c0

This merge was created using https://github.com/rust-lang/josh-sync.
add miri magic function to configure allocation tracking at runtime
This "cleanup" function is more than a decade old, and I can't find any
evidence of modern-day bootstrap being able to pass any of these flags to
`--host-rustcflags` or `--target-rustcflags`.
There are probably plenty of tests that will check this incidentally, but it's
convenient to have a dedicated self-test.
In particular, this eliminates the cryptic `of: &TestPaths` parameters.
This method no longer returns a `TestPaths`, so the old name is no longer
appropriate.
…e-func-calls

Support `f32`/`f64` in native function calls
RalfJung and others added 12 commits November 1, 2025 06:28
weak memory: fix non-atomic read clearing store buffer
split definition and use site hidden tys

Tracking this implicitly is kinda messy and easy to get wrong.

r? ``@BoxyUwU``
compiletest: Remove `cleanup_debug_info_options`

This "cleanup" function is more than a decade old, and I can't find any evidence of modern-day bootstrap being able to pass any of these flags to `--host-rustcflags` or `--target-rustcflags`.

I thought about replacing the cleanup with an assertion, but I think it's better to delete it entirely for now, and re-add checks later if they're motivated by actual problems in practice.

In addition to deleting some old and confusing code, this also lets us remove three instances of duplicating `TestCx`, which is the biggest win.

r? jieyouxu
compiletest: Don't modify `testpaths` when creating aux contexts

Modifying `TestCx::testpaths` makes it vastly harder to reason about how compiletest is using test paths, and can be avoided without much trouble by simply passing explicit source-file paths into a small number of auxiliary-aware methods.

---

This PR was originally based on a much larger change that split `TestPaths` into multiple structs and multiple `TestCx` fields (as seen in early revisions of rust-lang#148160), but after further cleanups it turned out that very few tweaks were actually needed to avoid changes to `testpaths`.

r? jieyouxu
…ercote

Do not emit solver errors that contain error types

any follow-up errors are going to either be duplicates or often disappear if the error itself is fixed.

in this PR it mostly silences dyn-compat errors as all the other errors are already deduplicated outside of the test suite. The dyn compat errors are independent errors and I think if the dyn compatiblity depended on an error type it would not actually show, so this is PR is actually silencing independent errors, too.

I am opening this PR because I am seeing lots of `{type error}: const Trait` errors when adding more const checking. So instead of targetting just those specific errors, I wanted to try out fully avoiding such errors near the trait solver.

cc ````@rust-lang/types```` for thoughts
temporary-lifetime-extension.rs test works in all editions
…r=Noratrieb

docs: makes a note about possible building  `rustc 1.91.0 + host tools` for win7

I have make notes in docs that there is possible to build host tools for target `x86_64-win7-windows-msvc`.

<img width="668" height="331" alt="image" src="https://github.com/user-attachments/assets/0335bc72-963c-4bfd-9910-61963dbf7dd7" />

r? ``````@roblabla``````

``````@rustbot`````` label A-docs  O-windows-7

P.S. prebuilt binaries can be found [here](https://github.com/Fenex/rust-win7/releases).
…ouxu

Use --print host-tuple to get the host

`--print host-tuple` has been available since 1.84 so there's no longer a need to parse the output of `-vV`. Especially since this script is shipped with the toolchain.
@rustbot rustbot added A-compiletest Area: The compiletest test runner A-testsuite Area: The testsuite used to check the correctness of rustc 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. rollup A PR which is a rollup labels Nov 2, 2025
@matthiaskrgr
Copy link
Member Author

@bors r+ rollup=never p=5

@bors
Copy link
Collaborator

bors commented Nov 2, 2025

📌 Commit 785c4ff has been approved by matthiaskrgr

It is now in the queue for this repository.

@bors bors 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 Nov 2, 2025
@bors
Copy link
Collaborator

bors commented Nov 2, 2025

⌛ Testing commit 785c4ff with merge 6a884ad...

@bors
Copy link
Collaborator

bors commented Nov 2, 2025

☀️ Test successful - checks-actions
Approved by: matthiaskrgr
Pushing 6a884ad to master...

@bors bors added the merged-by-bors This PR was explicitly merged by bors. label Nov 2, 2025
@bors bors merged commit 6a884ad into rust-lang:master Nov 2, 2025
12 checks passed
@rustbot rustbot added this to the 1.93.0 milestone Nov 2, 2025
@rust-timer
Copy link
Collaborator

📌 Perf builds for each rolled up PR:

PR# Message Perf Build Sha
#148170 split definition and use site hidden tys 0fd9e14ddbcc1bff1a3d9c14963b334e5752f779 (link)
#148194 compiletest: Remove cleanup_debug_info_options 218c4b569c5c7dc95450118d3d10e22f4faedbae (link)
#148199 compiletest: Don't modify testpaths when creating aux con… 73318bb3bf1cac1ecca534f5b72d788d7ef55476 (link)
#148290 Do not emit solver errors that contain error types 0edde44478a7a02bc34952c0264958a2c08a4ad6 (link)
#148357 temporary-lifetime-extension.rs test works in all editions 760714cabaa4c0e8e5d09a84987343e746687d04 (link)
#148362 docs: makes a note about possible building `rustc 1.91.0 +… d41b6623e1a8e35fd1e735fe415e1ce6b217a3cc (link)
#148367 Use --print host-tuple to get the host b6e188b63f76aed7265359b05ae7ffd95b338485 (link)
#148374 miri subtree update 2486cf6e20a78db73db2ad1571fe79ad15b688ad (link)

previous master: 73e6c9ebd9

In the case of a perf regression, run the following command for each PR you suspect might be the cause: @rust-timer build $SHA

@github-actions
Copy link
Contributor

github-actions bot commented Nov 2, 2025

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 73e6c9e (parent) -> 6a884ad (this PR)

Test differences

Show 112 test diffs

Stage 1

  • [ui] tests/ui/compiletest-self-test/aux-has-props.rs: [missing] -> pass (J0)
  • [ui] tests/ui/lifetimes/temporary-lifetime-extension.rs: [missing] -> pass (J0)
  • [ui] tests/ui/lifetimes/temporary-lifetime-extension.rs#edition2021: pass -> [missing] (J0)
  • [ui] tests/ui/lifetimes/temporary-lifetime-extension.rs#edition2024: pass -> [missing] (J0)

Stage 2

  • [ui] tests/ui/compiletest-self-test/aux-has-props.rs: [missing] -> pass (J1)
  • [ui] tests/ui/lifetimes/temporary-lifetime-extension.rs: [missing] -> pass (J1)
  • [ui] tests/ui/lifetimes/temporary-lifetime-extension.rs#edition2021: pass -> [missing] (J1)
  • [ui] tests/ui/lifetimes/temporary-lifetime-extension.rs#edition2024: pass -> [missing] (J1)

Additionally, 104 doctest diffs were found. These are ignored, as they are noisy.

Job group index

Test dashboard

Run

cargo run --manifest-path src/ci/citool/Cargo.toml -- \
    test-dashboard 6a884ad1b502fe48307d363858510702429fc735 --output-dir test-dashboard

And then open test-dashboard/index.html in your browser to see an overview of all executed tests.

Job duration changes

  1. i686-msvc-2: 8144.5s -> 7244.1s (-11.1%)
  2. dist-i686-msvc: 7465.3s -> 8213.4s (+10.0%)
  3. x86_64-gnu-llvm-20-3: 5654.1s -> 6191.0s (+9.5%)
  4. x86_64-msvc-2: 6486.8s -> 7066.3s (+8.9%)
  5. dist-aarch64-msvc: 5674.5s -> 6175.6s (+8.8%)
  6. aarch64-apple: 8271.6s -> 7633.5s (-7.7%)
  7. i686-gnu-2: 5582.3s -> 5160.4s (-7.6%)
  8. dist-x86_64-windows-gnullvm: 5011.1s -> 4636.6s (-7.5%)
  9. dist-x86_64-apple: 6767.5s -> 7269.0s (+7.4%)
  10. aarch64-msvc-2: 5005.4s -> 4695.5s (-6.2%)
How to interpret the job duration changes?

Job durations can vary a lot, based on the actual runner instance
that executed the job, system noise, invalidated caches, etc. The table above is provided
mostly for t-infra members, for simpler debugging of potential CI slow-downs.

@rust-timer
Copy link
Collaborator

Finished benchmarking commit (6a884ad): comparison URL.

Overall result: no relevant changes - no action needed

@rustbot label: -perf-regression

Instruction count

This benchmark run did not return any relevant results for this metric.

Max RSS (memory usage)

This benchmark run did not return any relevant results for this metric.

Cycles

This benchmark run did not return any relevant results for this metric.

Binary size

This benchmark run did not return any relevant results for this metric.

Bootstrap: 472.641s -> 474.95s (0.49%)
Artifact size: 390.86 MiB -> 390.84 MiB (-0.00%)

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

Labels

A-compiletest Area: The compiletest test runner A-testsuite Area: The testsuite used to check the correctness of rustc merged-by-bors This PR was explicitly merged by bors. rollup A PR which is a rollup S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. 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.

Projects

None yet

Development

Successfully merging this pull request may close these issues.