Rollup of 13 pull requests by jhpratt · Pull Request #145644 · rust-lang/rust

jhpratt · 2025-08-20T04:46:03Z

Successful merges:

Fix parameter order for _by() variants of min / max/ minmax in std::cmp #139357 (Fix parameter order for _by() variants of min / max/ minmax in std::cmp)
Rustdoc: typecheck scrape-examples.js #140314 (Rustdoc: typecheck scrape-examples.js)
mention lint group in default level lint note #140794 (mention lint group in default level lint note)
Clarify EOF handling for BufRead::skip_until #145006 (Clarify EOF handling for BufRead::skip_until)
Demote x86_64-apple-darwin to Tier 2 with host tools #145252 (Demote x86_64-apple-darwin to Tier 2 with host tools)
Fix bug where rustdoc-js tester would not pick the right search.js file if there is more than one #145359 (Fix bug where rustdoc-js tester would not pick the right search.js file if there is more than one)
Implement feature int_lowest_highest_one for integer and NonZero types #145381 (Implement feature int_lowest_highest_one for integer and NonZero types)
std_detect: RISC-V platform guide documentation #145417 (std_detect: RISC-V platform guide documentation)
Add runtime detection for APX-F and AVX10 #145531 (Add runtime detection for APX-F and AVX10)
std_detect: Use rustc-std-workspace-* to pull in compiler-builtins #145619 (std_detect: Use rustc-std-workspace-* to pull in compiler-builtins)
Remove the std workspace patch for compiler-builtins #145622 (Remove the std workspace patch for compiler-builtins)
Pretty print the name of an future from calling async closure #145623 (Pretty print the name of an future from calling async closure)
add a fallback implementation for the prefetch_* intrinsics #145626 (add a fallback implementation for the prefetch_* intrinsics )

r? @ghost
@rustbot modify labels: rollup

…n `std::cmp`

Co-authored-by: Guillaume Gomez <guillaume1.gomez@gmail.com>

This is practically a revert of a revert, making the commit e907456b2e10622ccd854a3bba8d02ce170b5dbb on `stdarch` come around again with minor fixes, enhancements and adjustments. An excerpt from the original commit message follows: Since there's no architectural feature detection on RISC-V (unlike `CPUID` on x86 architectures and some system registers on Arm/AArch64), runtime feature detection entirely depends on the platform-specific facility. As a result, availability of each feature heavily depends on the platform and its version. To help users make a decision for feature checking on a RISC-V system, this commit adds a platform guide with minimum supported platform versions.

We are moving away from `x86_64-apple-darwin`, so soon these docs won't be available.

Switch to only using aarch64 runners (implying we are now cross-compiling) and stop running tests. In the future, we could enable (some?) tests via Rosetta 2.

Implement the accepted ACP for methods that find the index of the least significant (lowest) and most significant (highest) set bit in an integer for signed, unsigned, and NonZero types. Also add unit tests for all these types.

…` file if there is more than one

rust-lang#145489 changed `std_detect` to no longer depend on `cfg-if`, which meant it no longer indirectly pulled in `rustc-std-workspace-core` via `cfg-if`. That caused it to no longer depend on `compiler-builtins`. Change `std_detect` to use `rustc-std-workspace-core` and `rustc-std-workspace-alloc`, to integrate with the rustc workspace. This also pulls in `compiler-builtins` via `rustc-std-workspace-core`. Closes: rust-lang#145594

All dependencies of `std` have dropped the crates.io dependency on `compiler-builtins`, so this patch is no longer needed. Closes: RUST-142265

The fallback is to just ignore the arguments. That is a valid implementation because this intrinsic is just a hint. I also added `miri::intrinsic_fallback_is_spec` annotation, so that miri now supports these operations. A prefetch intrinsic call is valid on any pointer.

Fix parameter order for `_by()` variants of `min` / `max`/ `minmax` in `std::cmp` We saw a regression introduced in version `1.86` that seems to be coming from switching the order of `v1` and `v2` when calling `comparison` functions in `min_by` / `max_by` / `minmax_by` (cf. this PR: rust-lang#136307) When the `compare` function is not symmetric in the arguments, this leads to false results. Apparently, the test cases do not cover this scenario currently. While asymmetric comparison may be an edge case, but current behavior is unexpected nevertheless.

…mples-typecheck, r=notriddle Rustdoc: typecheck scrape-examples.js more typechecking progress, this time we're mostly held back by the fact that `document.querySelectorAll` can't return nice types if its given a compound query (see the issue linked in a code comment). Additionally, it seems like the generated `data-locs` attribute has fields that are never used by anything? r? ```@notriddle```

…, r=davidtwco mention lint group in default level lint note ### Summary This PR updates lint diagnostics so that default-level notes now mention the lint group they belong to, if any. Fixes: rust-lang#65464. ### Example ```rust fn main() { let x = 5; } ``` Before: ``` = note: `#[warn(unused_variables)]` on by default ``` After: ``` = note: `#[warn(unused_variables)]` (part of `#[warn(unused)]`) on by default ``` ### Unchanged Cases Messages remain the same when the lint level is explicitly set, e.g.: * Attribute on the lint `#[warn(unused_variables)]`: ``` note: the lint level is defined here LL | #[warn(unused_variables)] | ^^^^^^^^^^^^^^^^ ``` * Attribute on the group `#[warn(unused)]:`: ``` = note: `#[warn(unused_variables)]` implied by `#[warn(unused)]` ``` * CLI option `-W unused`: ``` = note: `-W unused-variables` implied by `-W unused` = help: to override `-W unused` add `#[allow(unused_variables)]` ``` * CLI option `-W unused-variables`: ``` = note: requested on the command line with `-W unused-variables` ```

…aheemdev Clarify EOF handling for `BufRead::skip_until` This aligns `BufRead::skip_until`'s description more with `BufRead::read_until` in terms of how it handles EOF and extends the doctest to include this behavior.

…win-to-tier-2, r=Kobzol,madsmtm Demote x86_64-apple-darwin to Tier 2 with host tools Switch to only using aarch64 runners (implying we are now cross-compiling) and stop running tests. In the future, we could enable (some?) tests via Rosetta 2. This implements the decision from rust-lang/rfcs#3841.

jhpratt · 2025-08-20T04:46:12Z

@bors r+ rollup=never p=5

bors · 2025-08-20T04:46:15Z

📌 Commit 816f098 has been approved by jhpratt

It is now in the queue for this repository.

bors · 2025-08-20T05:15:48Z

⌛ Testing commit 816f098 with merge 22a86f8...

bors · 2025-08-20T08:25:43Z

☀️ Test successful - checks-actions
Approved by: jhpratt
Pushing 22a86f8 to master...

github-actions · 2025-08-20T08:29:04Z

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 f605b57 (parent) -> 22a86f8 (this PR)

Test differences

Show 4006 test diffs

Stage 1

nonzero::test_nonzero_highest_one: [missing] -> pass (J0)
nonzero::test_nonzero_lowest_one: [missing] -> pass (J0)
num::i128::test_highest_one: [missing] -> pass (J0)
num::i128::test_lowest_one: [missing] -> pass (J0)
num::i16::test_highest_one: [missing] -> pass (J0)
num::i16::test_lowest_one: [missing] -> pass (J0)
num::i32::test_highest_one: [missing] -> pass (J0)
num::i32::test_lowest_one: [missing] -> pass (J0)
num::i64::test_highest_one: [missing] -> pass (J0)
num::i64::test_lowest_one: [missing] -> pass (J0)
num::i8::test_highest_one: [missing] -> pass (J0)
num::i8::test_lowest_one: [missing] -> pass (J0)
num::u128::test_highest_one: [missing] -> pass (J0)
num::u128::test_lowest_one: [missing] -> pass (J0)
num::u16::test_highest_one: [missing] -> pass (J0)
num::u16::test_lowest_one: [missing] -> pass (J0)
num::u32::test_highest_one: [missing] -> pass (J0)
num::u32::test_lowest_one: [missing] -> pass (J0)
num::u64::test_highest_one: [missing] -> pass (J0)
num::u64::test_lowest_one: [missing] -> pass (J0)
num::u8::test_highest_one: [missing] -> pass (J0)
num::u8::test_lowest_one: [missing] -> pass (J0)
[ui] tests/ui/async-await/async-closures/type-name.rs: [missing] -> pass (J1)
[ui] tests/ui/lint/mention-lint-group-in-default-level-lint-note-issue-65464.rs: [missing] -> pass (J1)

Stage 2

[ui] tests/ui/async-await/async-closures/type-name.rs: [missing] -> pass (J2)
[ui] tests/ui/lint/mention-lint-group-in-default-level-lint-note-issue-65464.rs: [missing] -> pass (J2)

Additionally, 3980 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 22a86f8280becb12c34ee3efd952baf5cf086fa0 --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

dist-x86_64-apple: 12587.5s -> 6323.3s (-49.8%)
aarch64-apple: 5800.1s -> 7007.9s (20.8%)
x86_64-gnu-aux: 6492.4s -> 7289.2s (12.3%)
dist-aarch64-apple: 6700.6s -> 6042.2s (-9.8%)
x86_64-gnu-llvm-20-2: 6720.3s -> 6157.0s (-8.4%)
x86_64-gnu-tools: 3760.0s -> 3490.1s (-7.2%)
dist-riscv64-linux: 4615.0s -> 4929.9s (6.8%)
i686-gnu-2: 5802.1s -> 6163.2s (6.2%)
x86_64-gnu-llvm-19-1: 3421.2s -> 3623.9s (5.9%)
dist-loongarch64-musl: 5334.8s -> 5053.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 · 2025-08-20T08:29:28Z

📌 Perf builds for each rolled up PR:

PR#	Message	Perf Build Sha
#139357	Fix parameter order for `_by()` variants of `min` / `max`/ …	`5cf4d8a9ae897e24fa0abeacb0414698cc83ec10` (link)
#140314	Rustdoc: typecheck scrape-examples.js	`81dfbf5091ed6d2bb3548665582faabffab206cb` (link)
#140794	mention lint group in default level lint note	`1ff28227d95a2e858b9e9a8e79ec9da0b4349326` (link)
#145006	Clarify EOF handling for `BufRead::skip_until`	`34c7b060ae57f2d54eefbb9c4761885e1fcefc37` (link)
#145252	Demote x86_64-apple-darwin to Tier 2 with host tools	`d7218745a6f4d9ceeec733782ccc4c0fe616fd76` (link)
#145359	Fix bug where `rustdoc-js` tester would not pick the right …	`c8097410301d39cf257e4d248c18c90622628e2f` (link)
#145381	Implement feature `int_lowest_highest_one` for integer and …	`8743ccf14ee595193e28162881d2e2926943bfda` (link)
#145417	std_detect: RISC-V platform guide documentation	`bd4f3f2a8b89e4c58a3f577eb8e776f3ac9fb418` (link)
#145531	Add runtime detection for APX-F and AVX10	`53f1cb0e4c05a3eb92a97d605a7419d9255d0e92` (link)
#145619	`std_detect`: Use `rustc-std-workspace-*` to pull in `compi…	`38a19df4d6694ac96eb949f2d835cfccf461af4c` (link)
#145622	Remove the std workspace patch for `compiler-builtins`	`93338cdf3b7e98543ff3f5ef1faaa452d64f70de` (link)
#145623	Pretty print the name of an future from calling async closu…	`d424dc3d58dcedfea95b8ca6f5a9215deebcabee` (link)
#145626	add a fallback implementation for the `prefetch_*` intrinsi…	`d9d898b9b6c5784a8cbe8949c041bc6e594475b4` (link)

previous master: f605b57042

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-timer · 2025-08-20T09:36:10Z

Finished benchmarking commit (22a86f8): 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.2%, secondary 3.8%)

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

	mean	range	count
Regressions ❌ (primary)	1.1%	[1.1%, 1.1%]	1
Regressions ❌ (secondary)	3.8%	[3.8%, 3.8%]	1
Improvements ✅ (primary)	-1.4%	[-1.4%, -1.4%]	1
Improvements ✅ (secondary)	-	-	0
All ❌✅ (primary)	-0.2%	[-1.4%, 1.1%]	2

Cycles

Results (primary -1.5%)

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

	mean	range	count
Regressions ❌ (primary)	2.8%	[2.5%, 3.4%]	6
Regressions ❌ (secondary)	-	-	0
Improvements ✅ (primary)	-6.6%	[-7.1%, -5.6%]	5
Improvements ✅ (secondary)	-	-	0
All ❌✅ (primary)	-1.5%	[-7.1%, 3.4%]	11

Binary size

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

Bootstrap: 470.836s -> 470.428s (-0.09%)
Artifact size: 378.15 MiB -> 378.15 MiB (0.00%)

1685: some cleaning of Python code r=Hoverbear a=tshepang Found these as I was looking at why upstream FLS pulls fail 1702: bootstrap: cleaning some changes specific to Ferrocene r=Hoverbear a=tshepang See individual commits 1705: Upstream pull automation can handle `^M` in commits r=tshepang a=Hoverbear Okay this is a funny/weird one. In the commit message of rust-lang/rust@41d8d85 there is a `^M`, but if you look at rust-lang/rust#145644 that commmit looks totally fine and non-suspect. The funny part is Python enjoys interpreting this as a newline. ```python >>> import subprocess >>> out = subprocess.run(["git", "log", "--format='%H|%P|%s'", "--reverse", "-n", "1", "41d8d85549fc90967912a32b5604801bf25d8ea7"], text=True, stdout=subprocess.PIPE).stdout.strip() >>> out.split("\n") ["'41d8d85549fc90967912a32b5604801bf25d8ea7|1ddb4d0062fbe55b88e55cffc00fe8b898512536|Remove ", "hs_abs_cmp examples'"] >>> out.splitlines() ["'41d8d85549fc90967912a32b5604801bf25d8ea7|1ddb4d0062fbe55b88e55cffc00fe8b898512536|Remove ", "hs_abs_cmp examples'"] ``` Isn't that fun. Now in here we split on newlines, which, as we've seen above, `^M` is (according to Python), so it broke because we magically started getting lines with only 1 column. https://github.com/ferrocene/ferrocene/blob/e463bfc942b9535e43ece3ef77d38f5b37bed12c/ferrocene/tools/pull-upstream/generate_pr_body.py#L55-L75 So the solution is to pass `-z` to Git and split on `\0` instead. Co-authored-by: Tshepang Mbambo <tshepang.mbambo@ferrous-systems.com> Co-authored-by: Ana Hobden <operator@hoverbear.org>

miriedand others added 30 commits May 5, 2025 13:06

Fix parameter order for _by() variants of min / max/ minmax i…
1ddb4d0
…n `std::cmp`

scrape-examples.js: give each function a signature
d78e762

rustdoc js: add ScrapedLoc type
b4c77e1

rustdoc js: add rustdoc.ScrapedLoc type
35ba7dd

fix typo
8799d3d

scrape-examples.js: add another nonnull() invokation
b06113d

scrape-examples.js: fix typos
c021e7a
Co-authored-by: Guillaume Gomez <guillaume1.gomez@gmail.com>

Clarify EOF handling for BufRead::skip_until
a7e8fe7

Use aarch64-apple-darwin as the fallback doc source for -apple-
36a3820
We are moving away from `x86_64-apple-darwin`, so soon these docs won't be available.

Demote x86_64-apple-darwin to Tier 2 with host tools
c574c91
Switch to only using aarch64 runners (implying we are now cross-compiling) and stop running tests. In the future, we could enable (some?) tests via Rosetta 2.

Add runtime detection for APX-F and AVX10
40fc7df

Remove hs_abs_cmp examples
41d8d85

Merge remote-tracking branch 'upstream/master'
36d309e

Fix bug where rustdoc-js tester would not pick the right `search.js…
77d6ee0
…` file if there is more than one

Strenghten rustdoc js tester file macthing regex
2ebe679

Update lockfile for changes to std_detect
4c948bc

Remove the std workspace patch for compiler-builtins
988092e
All dependencies of `std` have dropped the crates.io dependency on `compiler-builtins`, so this patch is no longer needed. Closes: RUST-142265

Pretty print the name of an future from calling async closure
ab6f4d6

mention lint group in default level lint note
9a29e16

bless tests with new lint messages
d14b83e

make prefetch intrinsics safe
d25910e

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 Aug 20, 2025

bors added the merged-by-bors This PR was explicitly merged by bors. label Aug 20, 2025

bors merged commit 22a86f8 into rust-lang:masterAug 20, 2025
11 checks passed

rustbot added this to the 1.91.0 milestone Aug 20, 2025

jhpratt deleted the rollup-ypo3zcd branch August 20, 2025 08:26

This was referenced Aug 20, 2025
Perform unused assignment and unused variables lints on MIR. #142390
Merged
Constify Eq, Ord, PartialOrd #144847
Merged

This was referenced Aug 20, 2025
Resolver: Batched Import Resolution #145108
Merged
Constify conversion traits (part 1) #145279
Merged
Rehome tests/ui/issues/ tests to other subdirectories under tests/ui/#145332
Closed

Hoverbear mentioned this pull request Aug 27, 2025
Upstream pull automation can handle ^M in commits ferrocene/ferrocene#1705
Merged

Navigation Menu

Uh oh!

Uh oh!

Rollup of 13 pull requests - #145644

Rollup of 13 pull requests#145644
bors merged 38 commits into
rust-lang:masterfrom
jhpratt:rollup-ypo3zcd

jhpratt commented Aug 20, 2025•
edited by rustbot
Loading

Uh oh!

jhpratt commented Aug 20, 2025

Uh oh!

bors commented Aug 20, 2025

Uh oh!

bors commented Aug 20, 2025

Uh oh!

bors commented Aug 20, 2025

Uh oh!

Uh oh!

github-actionsBot commented Aug 20, 2025

Stage 1

Stage 2

Uh oh!

rust-timer commented Aug 20, 2025

Uh oh!

rust-timer commented Aug 20, 2025

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

17 participants

Uh oh!

Uh oh!

Conversation

jhpratt commented Aug 20, 2025• edited by rustbot Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

jhpratt commented Aug 20, 2025

Uh oh!

bors commented Aug 20, 2025

Uh oh!

bors commented Aug 20, 2025

Uh oh!

bors commented Aug 20, 2025

Uh oh!

Uh oh!

github-actionsBot commented Aug 20, 2025

Test differences

Stage 1

Stage 2

Job duration changes

Uh oh!

rust-timer commented Aug 20, 2025

Uh oh!

rust-timer commented Aug 20, 2025

Overall result: no relevant changes - no action needed

Instruction count

Max RSS (memory usage)

Cycles

Binary size

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

17 participants

jhpratt commented Aug 20, 2025•
edited by rustbot
Loading