Skip to content

Conversation

matthiaskrgr
Copy link
Member

Successful merges:

r? @ghost
@rustbot modify labels: rollup

Create a similar rollup

ruancomelli and others added 19 commits April 13, 2025 09:15
The current use of `RustfmtState` doesn't serve its main purpose as it
never does the lazy evaulation since `Build::build` forces it to be ready
on the early stage. If we want rustfmt to be ready on the early stage, we
don't need to have `RustfmtState` complexity at all.

Signed-off-by: onur-ozkan <work@onurozkan.dev>
…pin/fix-typo-necessarily-to-necessary, r=joboet

docs(library/core/src/pin): fix typo "necessarily" -> "necessary"

Fix a typo in [`library/core/src/pin.rs`](https://github.com/ruancomelli/rust/blob/14662fabeb69fe5ab6c6e68051bf9f80d4aaaa35/library/core/src/pin.rs), from

> As we'll see later, this is **necessarily** from the time the value is first pinned until the end of its lifespan.

to

> As we'll see later, this is **necessary** from the time the value is first pinned until the end of its lifespan.

(my emphasis).
Simplify `Vec::as_non_null` implementation and make it `const`

Tracking issue: rust-lang#130364.
…piler-errors

normalization: avoid incompletely constraining GAT args

We need to copy the behavior of rust-lang#125214 in the new solver. This fixes rust-lang/trait-system-refactor-initiative#202 which seems to be the cause of the regression in `deptypes`.

r? ```@compiler-errors```
Improve `dangerous_implicit_aurorefs` diagnostic output

This PR *greatly* improves the `dangerous_implicit_aurorefs` lint diagnostic output.

Kind of related to rust-lang#140721.

r? ```@jieyouxu``` (maybe)
Flush errors before deep normalize in `dropck_outlives`

Deep normalization doesn't allow the ocx to have pending obligations, so process them before deeply normalizing.

Fixes rust-lang#140931
Fixes rust-lang#140462
VxWorks: updates from recent libc versions

Vxworks changes. Required changes were added to libc in pr rust-lang/libc#4407 and rust-lang/libc#4337
…ization, r=albertlarsan68

remove `RustfmtState` to reduce `initial_rustfmt` complexity

The current use of `RustfmtState` doesn't serve its main purpose as it never does the lazy evaulation since `Build::build` forces it to be ready on the early stage. If we want rustfmt to be ready on the early stage, we don't need to have `RustfmtState` complexity at all.
@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-libs Relevant to the library team, which will review and decide on the PR/issue. WG-trait-system-refactor The Rustc Trait System Refactor Initiative (-Znext-solver) rollup A PR which is a rollup labels May 15, 2025
@matthiaskrgr
Copy link
Member Author

@bors r+ rollup=never p=5

@bors
Copy link
Collaborator

bors commented May 15, 2025

📌 Commit 3e6a286 has been approved by matthiaskrgr

It is now in the queue for this repository.

@bors bors removed the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label May 15, 2025
@bors bors added the S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. label May 15, 2025
@bors
Copy link
Collaborator

bors commented May 15, 2025

⌛ Testing commit 3e6a286 with merge 6d1875f...

@bors
Copy link
Collaborator

bors commented May 16, 2025

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

@bors bors added the merged-by-bors This PR was explicitly merged by bors. label May 16, 2025
@bors bors merged commit 6d1875f into rust-lang:master May 16, 2025
1 check passed
@rustbot rustbot added this to the 1.89.0 milestone May 16, 2025
@rust-timer
Copy link
Collaborator

📌 Perf builds for each rolled up PR:

PR# Message Perf Build Sha
#139749 docs(library/core/src/pin): fix typo "necessarily" -> "nece… 72a41d355db0f2c709b029cd9dd0c7dbcf19b80e (link)
#140685 Simplify Vec::as_non_null implementation and make it `con… 5a83c6fddf93e2784345e37d24c7620e5408bcb1 (link)
#140712 normalization: avoid incompletely constraining GAT args 47913175a3d21fffb114b913127c0d46791f682a (link)
#140768 Improve dangerous_implicit_aurorefs diagnostic output ea5056f4427963ad16739ddf1812e10b35d7aa12 (link)
#140947 Flush errors before deep normalize in dropck_outlives 87936467b29e73813572643654145a41674828e3 (link)
#140990 VxWorks: updates from recent libc versions e142a981a70a39a566751faf910018b3e56f9ade (link)
#141027 remove RustfmtState to reduce initial_rustfmt complexity a11e14bfe150f6b7c1af7b58e0803221764b87aa (link)

previous master: d97326eabf

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

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 d97326e (parent) -> 6d1875f (this PR)

Test differences

Show 32 test diffs

Stage 1

  • [ui] tests/ui/drop/dropck-normalize-errors.rs: [missing] -> pass (J1)
  • [ui] tests/ui/generic-associated-types/guide-inference-in-gat-arg-deeper.rs: pass -> [missing] (J1)
  • [ui] tests/ui/generic-associated-types/guide-inference-in-gat-arg-deeper.rs#current: [missing] -> pass (J1)
  • [ui] tests/ui/generic-associated-types/guide-inference-in-gat-arg-deeper.rs#next: [missing] -> pass (J1)
  • [ui] tests/ui/generic-associated-types/no-incomplete-gat-arg-inference.rs#current: [missing] -> pass (J1)
  • [ui] tests/ui/generic-associated-types/no-incomplete-gat-arg-inference.rs#next: [missing] -> pass (J1)

Stage 2

  • [ui] tests/ui/drop/dropck-normalize-errors.rs: [missing] -> pass (J0)
  • [ui] tests/ui/generic-associated-types/guide-inference-in-gat-arg-deeper.rs: pass -> [missing] (J0)
  • [ui] tests/ui/generic-associated-types/guide-inference-in-gat-arg-deeper.rs#current: [missing] -> pass (J0)
  • [ui] tests/ui/generic-associated-types/guide-inference-in-gat-arg-deeper.rs#next: [missing] -> pass (J0)
  • [ui] tests/ui/generic-associated-types/no-incomplete-gat-arg-inference.rs#current: [missing] -> pass (J0)
  • [ui] tests/ui/generic-associated-types/no-incomplete-gat-arg-inference.rs#next: [missing] -> pass (J0)

Additionally, 20 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 6d1875f99b2d5c1499410505f4233fbf8dbdc23b --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-apple-various: 8726.9s -> 6099.5s (-30.1%)
  2. dist-x86_64-apple: 10727.5s -> 9167.5s (-14.5%)
  3. dist-armv7-linux: 5970.2s -> 5260.1s (-11.9%)
  4. dist-arm-linux: 5212.5s -> 4624.6s (-11.3%)
  5. dist-armhf-linux: 5248.2s -> 4912.7s (-6.4%)
  6. dist-aarch64-apple: 5829.9s -> 5459.5s (-6.4%)
  7. x86_64-gnu-tools: 6207.1s -> 5846.8s (-5.8%)
  8. x86_64-gnu-llvm-20-2: 6277.3s -> 5930.8s (-5.5%)
  9. x86_64-gnu-llvm-19-1: 5228.2s -> 5492.3s (5.1%)
  10. x86_64-gnu-llvm-19-3: 6816.7s -> 7086.2s (4.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
Collaborator

Finished benchmarking commit (6d1875f): 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)

Results (secondary 4.6%)

This is a less reliable metric that may be of interest but was not used to determine the overall result at the top of this comment.

mean range count
Regressions ❌
(primary)
- - 0
Regressions ❌
(secondary)
4.6% [2.8%, 5.6%] 3
Improvements ✅
(primary)
- - 0
Improvements ✅
(secondary)
- - 0
All ❌✅ (primary) - - 0

Cycles

Results (secondary -2.6%)

This is a less reliable metric that may be of interest but was not used to determine the overall result at the top of this comment.

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

Binary size

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

Bootstrap: 773.215s -> 772.375s (-0.11%)
Artifact size: 365.48 MiB -> 365.48 MiB (-0.00%)

github-actions bot pushed a commit to model-checking/verify-rust-std that referenced this pull request May 21, 2025
…iaskrgr

Rollup of 7 pull requests

Successful merges:

 - rust-lang#139749 (docs(library/core/src/pin): fix typo "necessarily" -> "necessary")
 - rust-lang#140685 (Simplify `Vec::as_non_null` implementation and make it `const`)
 - rust-lang#140712 (normalization: avoid incompletely constraining GAT args)
 - rust-lang#140768 (Improve `dangerous_implicit_aurorefs` diagnostic output)
 - rust-lang#140947 (Flush errors before deep normalize in `dropck_outlives`)
 - rust-lang#140990 (VxWorks: updates from recent libc versions)
 - rust-lang#141027 (remove `RustfmtState` to reduce `initial_rustfmt` complexity)

r? `@ghost`
`@rustbot` modify labels: rollup
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
A-testsuite Area: The testsuite used to check the correctness of rustc merged-by-bors This PR was explicitly merged by bors. O-unix Operating system: Unix-like 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-libs Relevant to the library 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.