Skip to content

Rollup of 6 pull requests - #161113

Merged
rust-bors[bot] merged 12 commits into
rust-lang:mainfrom
JonathanBrouwer:rollup-SBl74tq
Aug 15, 2026
Merged

Rollup of 6 pull requests#161113
rust-bors[bot] merged 12 commits into
rust-lang:mainfrom
JonathanBrouwer:rollup-SBl74tq

Conversation

@JonathanBrouwer

Copy link
Copy Markdown
Contributor

Successful merges:

r? @ghost

Create a similar rollup

Lfan-ke and others added 12 commits August 4, 2026 23:01
Signed-off-by: 林晨 (Leo Cheng) <leo-cheng@vip.qq.com>
Signed-off-by: HNO3Miracle <xiangao.or@isrc.iscas.ac.cn>
…ator, r=jhpratt,dtolnay

core: implement FusedIterator for StepBy

Implements the accepted ACP rust-lang/libs-team#757.

`StepBy` yields no more items once its underlying iterator is exhausted, so it is fused whenever the underlying iterator is fused. `StepBy` was added in 1.28.0, just after the batch of `FusedIterator` impls stabilized in 1.26.0 (`Map`, `Skip`, `Take`, `Enumerate`, ...), so it was left out.

```rust
impl<I: FusedIterator> FusedIterator for StepBy<I> {}
```

This is insta-stable, matching the sibling adapter impls, so it needs a libs-api FCP.

Motivation from the ACP: crates with traits refined on top of `FusedIterator` (e.g. `range-set-blaze`'s `SortedStarts`) cannot cover `StepBy` today, even though it would always be valid.

A `test_step_by_fused` regression test is added.
…ions, r=traviscross

tests/ui/union: add annotations for reference rules

r? lang-docs
…=clubby789

cargotest: replace Servo with standalone Stylo

The Servo entry in `cargotest` pins a 2019 checkout and only tests the
`selectors` package. Cargo still has to resolve the old Servo workspace,
including its large graph of Git dependencies, even though most of that
workspace is not covered by the test.

Both `selectors` and the `stylo` CSS engine now live in the standalone
[`servo/stylo`](https://github.com/servo/stylo) repository. This PR replaces
the old Servo checkout with a recent Stylo revision and runs both
`cargo test -p selectors` and `cargo test -p stylo` from the same checkout.

Stylo's unit tests previously failed under the default Servo configuration
because shared tests used pseudo-elements that were only available in Gecko.
This was fixed in [`servo/stylo#436`](servo/stylo#436),
and this PR pins the resulting revision.

The `cargotest` documentation is updated to list Stylo instead of Servo.

Tests:

- `cargo test --manifest-path src/tools/cargotest/Cargo.toml`
- `target/debug/cargotest "$(command -v cargo)" /tmp/cargotest-stylo stylo`
- `./x test tidy --set build.submodules=false`

Closes rust-lang#79404.
…st-2018, r=traviscross

tests/ui/rust-2018: add annotations for reference rules
…anBrouwer

Revert "Add regression test for const fn returning Vec of boxed dyn Any"

Reverts rust-lang#161010 as requested, it was a feature stabilized not a bug
r? @chenyukang
rustc.1: `-O` is `-C opt-level=3`

This was changed back in 1.86, rust-lang#135439.
@rust-bors rust-bors Bot added the rollup A PR which is a rollup label Aug 14, 2026
@rustbot rustbot added A-rustc-dev-guide Area: rustc-dev-guide 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-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. labels Aug 14, 2026
@JonathanBrouwer

Copy link
Copy Markdown
Contributor Author

@bors r+ p=5

@rust-bors

rust-bors Bot commented Aug 14, 2026

Copy link
Copy Markdown
Contributor

📌 Commit 2445948 has been approved by JonathanBrouwer

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

This comment has been minimized.

@rust-bors rust-bors Bot added merged-by-bors This PR was explicitly merged by bors. and removed S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. labels Aug 15, 2026
@rust-bors

rust-bors Bot commented Aug 15, 2026

Copy link
Copy Markdown
Contributor

☀️ Test successful - CI
Approved by: JonathanBrouwer
Duration: 3h 11m 57s
Pushing 68c677a to main...

@rust-bors
rust-bors Bot merged commit 68c677a into rust-lang:main Aug 15, 2026
14 checks passed
@rustbot rustbot added this to the 1.99.0 milestone Aug 15, 2026
@rust-timer

Copy link
Copy Markdown
Collaborator

📌 Perf builds for each rolled up PR:

PR# Message Perf Build Sha
#159963 core: implement FusedIterator for StepBy 5f48e6a46881fe8251e8e5e20f25fad1c4a09309 (link)
#152826 tests/ui/union: add annotations for reference rules fad79bc41225415c83e77aa6fd17c95362101d74 (link)
#160556 cargotest: replace Servo with standalone Stylo 6828bbc776fb29c726def2b2641e2e279bf7b071 (link)
#161011 tests/ui/rust-2018: add annotations for reference rules 088bed99ef661d76f1fce69608678828f1aa2eb0 (link)
#161083 Revert "Add regression test for const fn returning Vec of b… beb89e70ea77172d20e4309d211eff8762e66c75 (link)
#161112 rustc.1: -O is -C opt-level=3 5362fc5f7b167b6929607fd89a075ac047867d88 (link)

previous master: d453bdd8f0

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

@rust-bors

rust-bors Bot commented Aug 15, 2026

Copy link
Copy Markdown
Contributor

📌 Perf builds for each rolled up PR:

PR# Message Perf Build Sha
#159963 core: implement FusedIterator for StepBy ❌ build failed
#152826 tests/ui/union: add annotations for reference rules ❌ build failed
#160556 cargotest: replace Servo with standalone Stylo ❌ build failed
#161011 tests/ui/rust-2018: add annotations for reference rules ❌ build failed
#161083 Revert "Add regression test for const fn returning Vec of b… ❌ build failed
#161112 rustc.1: -O is -C opt-level=3 ❌ build failed

parent commit: d453bdd8f0

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
Copy Markdown
Contributor
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 d453bdd (parent) -> 68c677a (this PR)

Test differences

Show 7 test diffs

Stage 1

  • iter::adapters::step_by::test_step_by_fused: [missing] -> pass (J0)
  • [ui] tests/ui/consts/const-fn-vec-box-dyn-any-84170.rs: pass -> [missing] (J1)
  • [ui (polonius)] tests/ui/consts/const-fn-vec-box-dyn-any-84170.rs: pass -> [missing] (J3)

Stage 2

  • iter::adapters::step_by::test_step_by_fused: [missing] -> pass (J2)
  • [ui] tests/ui/consts/const-fn-vec-box-dyn-any-84170.rs: pass -> [missing] (J4)

Additionally, 2 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 68c677ac3f013d2e587f47e198c92e551716191e --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. x86_64-gnu-stdlib-semver-check: 10m 50s -> 4m 26s (-58.9%)
  2. x86_64-rust-for-linux: 46m 42s -> 28m 43s (-38.5%)
  3. dist-x86_64-freebsd: 1h 3m -> 1h 26m (+35.9%)
  4. x86_64-gnu-miri: 1h 26m -> 55m 25s (-35.8%)
  5. x86_64-gnu-tools: 59m 48s -> 39m 6s (-34.6%)
  6. i686-gnu-nopt-2: 2h 9m -> 1h 26m (-33.5%)
  7. x86_64-gnu-nopt: 1h 36m -> 2h 8m (+32.6%)
  8. x86_64-msvc-ext2: 1h 14m -> 1h 36m (+29.6%)
  9. x86_64-gnu-debug: 1h 56m -> 1h 24m (-27.3%)
  10. x86_64-gnu-llvm-21-3: 1h 53m -> 1h 24m (-26.0%)
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
Copy Markdown
Collaborator

Finished benchmarking commit (68c677a): comparison URL.

Overall result: no relevant changes - no action needed

@rustbot label: -perf-regression

Instruction count

This perf run didn't have relevant results for this metric.

Max RSS (memory usage)

Results (primary -6.1%)

A less reliable metric. May be of interest, but not used to determine the overall result above.

mean range count
Regressions ❌
(primary)
- - 0
Regressions ❌
(secondary)
- - 0
Improvements ✅
(primary)
-6.1% [-6.1%, -6.1%] 1
Improvements ✅
(secondary)
- - 0
All ❌✅ (primary) -6.1% [-6.1%, -6.1%] 1

Cycles

Results (secondary 8.0%)

A less reliable metric. May be of interest, but not used to determine the overall result above.

mean range count
Regressions ❌
(primary)
- - 0
Regressions ❌
(secondary)
10.4% [2.4%, 22.2%] 5
Improvements ✅
(primary)
- - 0
Improvements ✅
(secondary)
-4.1% [-4.1%, -4.1%] 1
All ❌✅ (primary) - - 0

Binary size

This perf run didn't have relevant results for this metric.

Bootstrap: 461.184s -> 459.748s (-0.31%)
Artifact size: 396.50 MiB -> 396.48 MiB (-0.01%)

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

Labels

A-rustc-dev-guide Area: rustc-dev-guide 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 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.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

8 participants