Skip to content

Rollup of 7 pull requests #142242

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 31 commits into from
Jun 9, 2025
Merged

Rollup of 7 pull requests #142242

merged 31 commits into from
Jun 9, 2025

Conversation

matthiaskrgr
Copy link
Member

@matthiaskrgr matthiaskrgr commented Jun 9, 2025

Successful merges:

r? @ghost
@rustbot modify labels: rollup

Create a similar rollup

devnexen and others added 30 commits August 15, 2024 13:40
to stabilise the quickack part for now, tcp_deferaccept had been added at a
later stage.
rustdoc: Further improve chapters and sections on testing
I couldn't find existing tests that for this behavior, so this should
make sure it doesn't accidentally change.
remove the archived ICE ping groups
So that we can make sure that they are reproducible locally.
This allows us to reuse its cache on PR CI jobs.
Signed-off-by: onur-ozkan <work@onurozkan.dev>
…ayer, r=tgross35

Stabilize `tcp_quickack`

to stabilise the quickack part for now, tcp_deferaccept had been added at a later stage.

The related API calls are the following

```rust
// std::os::linux::net

// sealed trait, implemented for std::net::TcpStream
pub trait TcpStreamExt: Sealed{
  fn quickack(&self) -> io::Result<bool>;
  fn set_quickack(&self, quickack: bool) -> io::Result<()>;
}
```

Closes: rust-lang#96256
…=tgross35

De-duplicate f16 & f128 doctest attributes

Now that rustdoc supports `#[doc(test(attr(...)))]` at every level, thanks to rust-lang#140560, we can de-duplicate the f16 & f128 doctest attributes.

Unfortunately we can de-duplicate the `cfg`s attribute as rustdoc would complain about missing `main`, but it's already much better than before.

Addresses https://github.com/rust-lang/rust/pull/140323/files#r2062702761
r? `@tgross35`
…e-tests, r=Nadrieril

add tests for pattern binding drop order edge cases

This adds tests for rust-lang#142163, rust-lang#142057, and rust-lang#142056. I'm using these tests to help make sure I don't commit breaking changes when implementing match lowering for guard patterns, but I think it makes sense to add them separately. They don't directly have anything to do with guard patterns.

r? `@Nadrieril` or reassign
Dont make `ObligationCtxt`s with diagnostics unnecessarily

just a nit, shouldn't affect perf b/c `ObligationCtxt::new_with_diagnostics` should only be more expensive in the new trait solver, and I don't expect either of these to encounter errors today anyways.

r? oli-obk
rustc-dev-guide subtree update

r? `@ghost`
Run `calculate_matrix` job on `master` to cache citool builds

As discussed in https://rust-lang.zulipchat.com/#narrow/channel/242791-t-infra/topic/PR.20ci.20seems.20much.20to.20slow/with/523028903, the current `rust-cache` solution for `citool` doesn't work, because we don't ever write to the cache from `master`, so the cache is empty on PR CI jobs.

This PR runs the `calculate_matrix` job on `master`, with the only motivation to actually prime the cache.

r? `@marcoieni`
add `Cargo.lock` to CI-rustc allowed list for non-CI env

Changes to dependencies usually require modifying `Cargo.toml`, which would already invalidate the CI-rustc cache if done in non-allowed paths. On non-CI environment, it should be safe to add `Cargo.lock` to the list of allowed paths as there is no real risk aside from a very rare false positive in cases like minor bumps to non-allowed path dependencies without modifying the `Cargo.toml` files.

Fixes rust-lang#141986
@rustbot rustbot added A-rustc-dev-guide Area: rustc-dev-guide A-testsuite Area: The testsuite used to check the correctness of rustc O-android Operating system: Android O-linux Operating system: Linux 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. rollup A PR which is a rollup labels Jun 9, 2025
@matthiaskrgr
Copy link
Member Author

@bors r+ rollup=never p=5

@bors
Copy link
Collaborator

bors commented Jun 9, 2025

📌 Commit 8daa8ef 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 Jun 9, 2025
@bors
Copy link
Collaborator

bors commented Jun 9, 2025

⌛ Testing commit 8daa8ef with merge 14863ea...

@bors
Copy link
Collaborator

bors commented Jun 9, 2025

☀️ Test successful - checks-actions
Approved by: matthiaskrgr
Pushing 14863ea to master...

@bors bors added the merged-by-bors This PR was explicitly merged by bors. label Jun 9, 2025
@bors bors merged commit 14863ea into rust-lang:master Jun 9, 2025
11 checks passed
@rustbot rustbot added this to the 1.89.0 milestone Jun 9, 2025
@rust-timer
Copy link
Collaborator

📌 Perf builds for each rolled up PR:

PR# Message Perf Build Sha
#129121 Stabilize tcp_quickack c3daca4a0b593a1d55422c61e8d7149a67626709 (link)
#142192 De-duplicate f16 & f128 doctest attributes a4e9df9ae68c6a4a8baf4b544a7dec2b1203db7c (link)
#142193 add tests for pattern binding drop order edge cases 266148c030e48a39696f8cada9337836af7a1251 (link)
#142222 Dont make ObligationCtxts with diagnostics unnecessarily 32434e1039fb501e522ed11d749d16262fa7dc89 (link)
#142228 rustc-dev-guide subtree update fbe8854b9062ced25c53b3b2685d4a7fd6a3fbc6 (link)
#142231 Run calculate_matrix job on master to cache citool buil… 1328df9e9ce5cd2d640b68633502e6040d155653 (link)
#142232 add Cargo.lock to CI-rustc allowed list for non-CI env 3faec4221dbea1d942b47d18760f32493acf6ccd (link)

previous master: 7c10378e1f

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

Copy link
Contributor

github-actions bot commented Jun 9, 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 7c10378 (parent) -> 14863ea (this PR)

Test differences

Show 190 test diffs

Stage 1

  • [ui] tests/ui/drop/or-pattern-drop-order.rs: [missing] -> pass (J1)
  • [ui] tests/ui/dropck/eager-by-ref-binding-for-guards.rs: [missing] -> pass (J1)
  • [ui] tests/ui/dropck/let-else-more-permissive.rs: [missing] -> pass (J1)

Stage 2

  • [ui] tests/ui/drop/or-pattern-drop-order.rs: [missing] -> pass (J0)
  • [ui] tests/ui/dropck/eager-by-ref-binding-for-guards.rs: [missing] -> pass (J0)
  • [ui] tests/ui/dropck/let-else-more-permissive.rs: [missing] -> pass (J0)

Additionally, 184 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 14863ea0777c68348b3e6e7a8472423d273a52af --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. dist-x86_64-apple: 11984.8s -> 8387.1s (-30.0%)
  2. mingw-check-tidy: 95.9s -> 74.5s (-22.4%)
  3. aarch64-apple: 5294.8s -> 4161.4s (-21.4%)
  4. x86_64-apple-1: 7579.2s -> 6051.5s (-20.2%)
  5. dist-apple-various: 8411.5s -> 6719.2s (-20.1%)
  6. dist-i686-mingw: 9316.6s -> 7970.5s (-14.4%)
  7. dist-x86_64-solaris: 5036.5s -> 5552.1s (10.2%)
  8. dist-arm-linux-musl: 6348.0s -> 5744.2s (-9.5%)
  9. aarch64-gnu-debug: 3914.9s -> 3615.8s (-7.6%)
  10. mingw-check-2: 1925.0s -> 2071.4s (7.6%)
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.

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. O-android Operating system: Android O-linux Operating system: Linux 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. 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.