Skip to content

Rollup of 12 pull requests #140565

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 52 commits into from
May 2, 2025
Merged

Conversation

GuillaumeGomez
Copy link
Member

Successful merges:

r? @ghost
@rustbot modify labels: rollup

Create a similar rollup

pudongair and others added 30 commits March 26, 2025 15:28
If you want to logically split an iterator after `n` items, you might first
discover `take`. Before this change, you'd find that `take` consumes the
iterator, and you'd probably be stuck. The answer involves `by_ref`, but that's
hard to discover, especially since `by_ref` is a bit abstract and `Iterator`
has many methods.

After this change, you'd see the example showing `take` along with `by_ref`,
which allows you to continue using the rest of the iterator. `by_ref` had a
good example involving `take` already, so this change just duplicates that
existing example under `take`.
* "while until either" could also be changed to "for a while until either", but I just deleted "while".
* fixed sentence with incorrect "at" and "has/have".
* linked [*currently allocated*] similar to other methods.
I found "Rustc dev guide subtree update awkward"
It was observed that some people were missing the `edition20xx` rustdoc
attribute. Although this probably won't solve that problem, I'd still
like to highlight it as something to be aware of.
…rary

Based on lessons learned from 2024. There's probably still more details
to say here since it was a ton of work. These are the major points that
I remember.
This updates to the latest version of mdbook which has had a variety
of fixes of new features since the last update.

Changelog: https://github.com/rust-lang/mdBook/blob/master/CHANGELOG.md#mdbook-0448
This adds documentation on how to stabilize the edition in the compiler.
Refactor the dependency structure from a nested unordered list to a single-level ordered list.

IMO, this is clearer, but happy to close this PR without merging, if the change is not desired.
Also, these are normal Rust things (crates/packages), so remove the word *normal*.
rustc-dev-guide subtree update

r? ``@ghost``
… r=fee1-dead

Clean up "const" situation in format_args!().

This cleans up the "const" situation in the format_args!() expansion/lowering.

Rather than marking the Argument::new_display etc. functions as non-const, this marks the Arguments::new_v1 functions as non-const.

Example expansion/lowering of format_args!() in const:

```rust
// Error: cannot call non-const formatting macro in constant functions
const {
    fmt::Arguments::new_v1( // Now the error is produced here.
        &["Hello, ", "!\n"],
        &[
            fmt::Argument::new_display(&world) // The error used to be produced here.
        ],
    )
}
```
…d_internal_symbol, r=bjorn3

allow `#[rustc_std_internal_symbol]` in combination with `#[naked]`

The need for this came up in rust-lang/compiler-builtins#897, but in general this seems useful and valid to allow.

Based on a quick scan, I don't think changes to the generated assembly are needed.

cc ``@bjorn3``
…-tool-error-output, r=clubby789

Improve error output in case `nodejs` or `npm` is not installed for rustdoc-gui test suite

Fixes rust-lang#138134.

It now looks like this:

![Screenshot From 2025-05-01 17-41-12](https://github.com/user-attachments/assets/ae7f2b37-3619-47ff-941d-5d9a7cdd9b6b)

cc ``@kpreid``
@rustbot rustbot added A-attributes Area: Attributes (`#[…]`, `#![…]`) 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-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. T-rustdoc Relevant to the rustdoc team, which will review and decide on the PR/issue. rollup A PR which is a rollup labels May 1, 2025
@GuillaumeGomez
Copy link
Member Author

@bors r+ p=5 rollup=never

@bors
Copy link
Collaborator

bors commented May 1, 2025

📌 Commit d42e3ac has been approved by GuillaumeGomez

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 May 1, 2025
@bors
Copy link
Collaborator

bors commented May 2, 2025

⌛ Testing commit d42e3ac with merge cb0d6e7...

VlaDexa added a commit to VlaDexa/rust that referenced this pull request May 2, 2025
…uillaumeGomez

Rollup of 12 pull requests

Successful merges:

 - rust-lang#138703 (chore: remove redundant words in comment)
 - rust-lang#139186 (Refactor `diy_float`)
 - rust-lang#139780 (docs: Add example to `Iterator::take` with `by_ref`)
 - rust-lang#139802 (Fix some grammar errors and hyperlinks in doc for `trait Allocator`)
 - rust-lang#140034 (simd_select_bitmask: the 'padding' bits in the mask are just ignored)
 - rust-lang#140062 (std: mention `remove_dir_all` can emit `DirectoryNotEmpty` when concurrently written into)
 - rust-lang#140420 (rustdoc: Fix doctest heuristic for main fn wrapping)
 - rust-lang#140460 (Fix handling of LoongArch target features not supported by LLVM 19)
 - rust-lang#140538 (rustc-dev-guide subtree update)
 - rust-lang#140544 (Clean up "const" situation in format_args!(). )
 - rust-lang#140552 (allow `#[rustc_std_internal_symbol]` in combination with `#[naked]`)
 - rust-lang#140556 (Improve error output in case `nodejs` or `npm` is not installed for rustdoc-gui test suite)

r? `@ghost`
`@rustbot` modify labels: rollup
@rust-highfive
Copy link
Contributor

📣 Toolstate changed by #140565!

Tested on commit cb0d6e7.
Direct link to PR: #140565

🎉 reference on windows: test-fail → test-pass (cc @ehuss).
🎉 reference on linux: test-fail → test-pass (cc @ehuss).

rust-highfive added a commit to rust-lang-nursery/rust-toolstate that referenced this pull request May 2, 2025
Tested on commit rust-lang/rust@cb0d6e7.
Direct link to PR: <rust-lang/rust#140565>

🎉 reference on windows: test-fail → test-pass (cc @ehuss).
🎉 reference on linux: test-fail → test-pass (cc @ehuss).
@bors
Copy link
Collaborator

bors commented May 2, 2025

☀️ Test successful - checks-actions
Approved by: GuillaumeGomez
Pushing cb0d6e7 to master...

@bors bors added the merged-by-bors This PR was explicitly merged by bors. label May 2, 2025
@bors bors merged commit cb0d6e7 into rust-lang:master May 2, 2025
7 checks passed
@rustbot rustbot added this to the 1.88.0 milestone May 2, 2025
Copy link

github-actions bot commented May 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 3350c1e (parent) -> cb0d6e7 (this PR)

Test differences

Show 592 test diffs

Stage 1

  • [ui] tests/rustdoc-ui/doctest/macro-after-main.rs: pass -> [missing] (J0)
  • [ui] tests/rustdoc-ui/doctest/main-alongside-macro-calls.rs#fail: [missing] -> pass (J0)
  • [ui] tests/rustdoc-ui/doctest/main-alongside-macro-calls.rs#pass: [missing] -> pass (J0)
  • [ui] tests/rustdoc-ui/doctest/main-alongside-stmts.rs: [missing] -> pass (J0)
  • [ui] tests/rustdoc-ui/doctest/test-main-alongside-exprs.rs: pass -> [missing] (J0)
  • [ui] tests/ui/abi/compatibility.rs#loongarch64: ignore (ignored when the LLVM version 19.1.1 is older than 20.0.0) -> pass (J2)
  • [ui] tests/ui/asm/loongarch/bad-reg.rs#loongarch64_lp64d: ignore (ignored when the LLVM version 19.1.1 is older than 20.0.0) -> pass (J2)
  • [ui] tests/ui/asm/loongarch/bad-reg.rs#loongarch64_lp64s: ignore (ignored when the LLVM version 19.1.1 is older than 20.0.0) -> pass (J2)

Stage 2

  • [ui] tests/rustdoc-ui/doctest/macro-after-main.rs: pass -> [missing] (J1)
  • [ui] tests/rustdoc-ui/doctest/main-alongside-macro-calls.rs#fail: [missing] -> pass (J1)
  • [ui] tests/rustdoc-ui/doctest/main-alongside-macro-calls.rs#pass: [missing] -> pass (J1)
  • [ui] tests/rustdoc-ui/doctest/main-alongside-stmts.rs: [missing] -> pass (J1)
  • [ui] tests/rustdoc-ui/doctest/test-main-alongside-exprs.rs: pass -> [missing] (J1)
  • [ui] tests/ui/abi/compatibility.rs#loongarch64: ignore (ignored when the LLVM version 19.1.1 is older than 20.0.0) -> pass (J3)
  • [ui] tests/ui/asm/loongarch/bad-reg.rs#loongarch64_lp64d: ignore (ignored when the LLVM version 19.1.1 is older than 20.0.0) -> pass (J3)
  • [ui] tests/ui/asm/loongarch/bad-reg.rs#loongarch64_lp64s: ignore (ignored when the LLVM version 19.1.1 is older than 20.0.0) -> pass (J3)

Additionally, 576 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 cb0d6e76d0515b19d249c0147d246296b9d3d124 --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-aarch64-apple: 4716.4s -> 6130.0s (30.0%)
  2. x86_64-apple-1: 10451.1s -> 8883.0s (-15.0%)
  3. x86_64-apple-2: 5306.3s -> 6091.1s (14.8%)
  4. dist-x86_64-apple: 8097.6s -> 9049.7s (11.8%)
  5. dist-apple-various: 7142.7s -> 6344.9s (-11.2%)
  6. x86_64-msvc-ext3: 6994.2s -> 7602.8s (8.7%)
  7. i686-msvc-2: 7873.5s -> 7273.4s (-7.6%)
  8. dist-loongarch64-linux: 6609.0s -> 6194.0s (-6.3%)
  9. dist-aarch64-linux: 5244.5s -> 5544.2s (5.7%)
  10. aarch64-gnu-debug: 4170.4s -> 3947.5s (-5.3%)
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

📌 Perf builds for each rolled up PR:

PR# Message Perf Build Sha
#138703 chore: remove redundant words in comment c7e64709db5100b4daf984b3a1de896b58e665d7 (link)
#139186 Refactor diy_float d50c1841c6c3aa20ab9650d3e59f80bbc525f8c4 (link)
#139780 docs: Add example to Iterator::take with by_ref b7b96fddbbaaa36f3f42a9c62577e0c297bdbdc5 (link)
#139802 Fix some grammar errors and hyperlinks in doc for `trait Al… 0c39c334a9231fcd8a6dedb7c228383239b680d3 (link)
#140034 simd_select_bitmask: the 'padding' bits in the mask are jus… 12f4cdc64cdc73d763985dbd5d64af4ddf0c6743 (link)
#140062 std: mention remove_dir_all can emit DirectoryNotEmpty 40ea8e921f89ef7140f1a611676dbb23c17d0b11 (link)
#140420 rustdoc: Fix doctest heuristic for main fn wrapping 47693fc7975b97fb4c2ea5f13bbb9ca0980808fb (link)
#140460 Fix handling of LoongArch target features not supported by … 67ee7128a73e99f3b868f375756b8b7b4ea6a137 (link)
#140538 rustc-dev-guide subtree update 2e2bb32c99504df010ce41f2c25aca9ab73053e2 (link)
#140544 Clean up "const" situation in format_args!(). 1ccd7654cd4d19b2d24526a9708f888a84bbe7e5 (link)
#140552 allow #[rustc_std_internal_symbol] in combination with `#… b38d66cce9b4dc38929aae5c571ee97b52213c4b (link)
#140556 Improve error output in case nodejs or npm is not insta… a414f4ba41aad997a8633c99131daf3321ee631e (link)

previous master: 3350c1eb3f

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

@GuillaumeGomez GuillaumeGomez deleted the rollup-gv4ed14 branch May 2, 2025 08:40
@rust-timer
Copy link
Collaborator

Finished benchmarking commit (cb0d6e7): 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 (primary -0.4%)

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)
1.4% [0.4%, 3.2%] 4
Regressions ❌
(secondary)
- - 0
Improvements ✅
(primary)
-0.8% [-2.9%, -0.4%] 16
Improvements ✅
(secondary)
- - 0
All ❌✅ (primary) -0.4% [-2.9%, 3.2%] 20

Cycles

Results (primary -0.1%)

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.6% [0.4%, 1.0%] 7
Regressions ❌
(secondary)
- - 0
Improvements ✅
(primary)
-0.8% [-1.5%, -0.4%] 7
Improvements ✅
(secondary)
- - 0
All ❌✅ (primary) -0.1% [-1.5%, 1.0%] 14

Binary size

Results (primary -0.0%, secondary -0.0%)

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.0% [0.0%, 0.0%] 16
Regressions ❌
(secondary)
0.0% [0.0%, 0.0%] 3
Improvements ✅
(primary)
-0.1% [-0.1%, -0.1%] 4
Improvements ✅
(secondary)
-0.0% [-0.0%, -0.0%] 6
All ❌✅ (primary) -0.0% [-0.1%, 0.0%] 20

Bootstrap: 767.941s -> 768.128s (0.02%)
Artifact size: 365.55 MiB -> 365.57 MiB (0.01%)

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
A-attributes Area: Attributes (`#[…]`, `#![…]`) 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 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. T-rustdoc Relevant to the rustdoc team, which will review and decide on the PR/issue.
Projects
None yet
Development

Successfully merging this pull request may close these issues.