Rollup of 8 pull requests #140608

matthiaskrgr · 2025-05-03T06:45:06Z

Successful merges:

Change signature of File::try_lock and File::try_lock_shared #139343 (Change signature of File::try_lock and File::try_lock_shared)
linker: Quote symbol names in .def files #140505 (linker: Quote symbol names in .def files)
PassWrapper: adapt for llvm/llvm-project@f137c3d592e96330e450a8fd63ef… #140534 (PassWrapper: adapt for llvm/llvm-project@f137c3d592e96330e450a8fd63ef…)
Remove backtrace dep from anyhow in features status dump tool #140546 (Remove backtrace dep from anyhow in features status dump tool)
Emit user type annotations for free consts in pattern position #140548 (Emit user type annotations for free consts in pattern position)
Use present indicative tense in std::io::pipe() API docs #140564 (Use present indicative tense in std::io::pipe() API docs)
Add regression test for #140545 #140568 (Add regression test for Erroneous compile errors when returning impl trait #140545)
Improve hir pretty printing #140606 (Improve hir pretty printing)

r? @ghost
@rustbot modify labels: rollup

According to `anyhow`'s Cargo.toml: > On compilers older than 1.65, features=["backtrace"] may be used to enable > backtraces via the `backtrace` crate. This feature has no effect on 1.65+ > besides bringing in an unused dependency, as `std::backtrace` is always > preferred. So this is just bringing in an unused dependency.

@rustbot

In LLVM 21 PR llvm/llvm-project#130940 `TargetRegistry::createTargetMachine` was changed to take a `const Triple&` and has deprecated the old `StringRef` method. @rustbot label llvm-main

The inline documentation for all other free functions in the `std::io` module use the phrase "creates a" instead of "create a", except for the currently nightly-only `std::io::pipe()` function. This commit updates the text to align with the predominant wording in the `std::io` module. I recognize this PR is quite a minuscule nitpick, so feel free to ignore and close if you disagree and/or there are bigger fish to fry. :smile:

These methods now return Result<(), TryLockError> instead of Result<bool, Error> to make their use less errorprone

To support weird symbol names, including dots in particular.

for rust-lang#140545

They don't appear to do anything -- no test output is affected -- and no other pretty-printing code looks like this.

As far as I can tell, this code is not actually reachable.

One of the boxes isn't closed, and this causes everything after it to be over-indented.

All the box open/close issues have been fixed.

…kingjubilee Change signature of File::try_lock and File::try_lock_shared These methods now return Result<(), TryLockError> instead of Result<bool, Error> to make their use less errorprone These methods are unstable under the "file_lock" feature. The related tracking issue is rust-lang#130999 and this PR changes the signatures as discussed by libs-api: rust-lang#130994 (comment)

linker: Quote symbol names in .def files To support weird symbol names, including dots in particular. cc [rust-lang#134767](rust-lang#134767 (comment))

PassWrapper: adapt for llvm/llvm-project@f137c3d592e96330e450a8fd63ef… …7e8877fc1908 In LLVM 21 PR llvm/llvm-project#130940 `TargetRegistry::createTargetMachine` was changed to take a `const Triple&` and has deprecated the old `StringRef` method. ``@rustbot`` label llvm-main

Remove backtrace dep from anyhow in features status dump tool According to `anyhow`'s Cargo.toml: > On compilers older than 1.65, features=["backtrace"] may be used to enable > backtraces via the `backtrace` crate. This feature has no effect on 1.65+ > besides bringing in an unused dependency, as `std::backtrace` is always > preferred. So this is just bringing in an unused dependency.

…ation, r=compiler-errors Emit user type annotations for free consts in pattern position This previously wasnt done because free consts couldn't have any generic parameters that need to be preserved for borrowck. This is no longer the case with `feature(generic_const_items)` r? fmease

…in-std-io-pipe-docs, r=tgross35 Use present indicative tense in std::io::pipe() API docs The inline documentation for all other free functions in the `std::io` module use the phrase "creates a" instead of "create a", except for the currently nightly-only `std::io::pipe()` function. This commit updates the text to align with the predominant wording in the `std::io` module. I recognize this PR is quite a minuscule nitpick, so feel free to ignore and close if you disagree and/or there are bigger fish to fry. Thanks in advance! :smile: Relates to rust-lang#127154.

Add regression test for rust-lang#140545 Closes rust-lang#140545 I am not very knowledgable about the typesystem internals, so I couldn't come up with a good name for the test. But I'm happy to move it to a more appropriate place if there is one (`tests/ui/impl-trait/non-defining-uses` maybe?) r? types (or reroll as appropriate if this is not actually a T-types issue; i'm clueless)

Improve hir pretty printing It's currently pretty bad, so a few small improvements can make a big difference. r? `@dtolnay`

matthiaskrgr · 2025-05-03T06:46:09Z

@bors r+ rollup=never p=5

bors · 2025-05-03T06:46:12Z

📌 Commit 185f9e0 has been approved by matthiaskrgr

It is now in the queue for this repository.

bors · 2025-05-03T07:20:36Z

⌛ Testing commit 185f9e0 with merge 5fe04cb...

bors · 2025-05-03T10:42:30Z

☀️ Test successful - checks-actions
Approved by: matthiaskrgr
Pushing 5fe04cb to master...

github-actions · 2025-05-03T10:44:05Z

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 2ad5f86 (parent) -> 5fe04cb (this PR)

Test differences

Show 289 test diffs

Stage 1

[ui] tests/ui/generic-const-items/user_type_annotations_pattern.rs: [missing] -> pass (J1)
[ui] tests/ui/impl-trait/non-defining-uses/double-wrap-with-defining-use.rs: [missing] -> pass (J1)
[ui] tests/ui/linking/weird-export-names.rs: [missing] -> pass (J1)

Stage 2

[ui] tests/ui/generic-const-items/user_type_annotations_pattern.rs: [missing] -> pass (J0)
[ui] tests/ui/impl-trait/non-defining-uses/double-wrap-with-defining-use.rs: [missing] -> pass (J0)
[ui] tests/ui/linking/weird-export-names.rs: [missing] -> pass (J2)
[ui] tests/ui/linking/weird-export-names.rs: [missing] -> ignore (skipping test as target does not support all of the crate types ["cdylib"]) (J3)

Additionally, 282 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 5fe04cbebd593c6530a21cd7bd0e8e9503b1ffe4 --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

x86_64-apple-2: 4901.1s -> 7202.8s (47.0%)
dist-aarch64-apple: 4685.1s -> 5442.0s (16.2%)
aarch64-apple: 3648.7s -> 4165.8s (14.2%)
x86_64-apple-1: 7309.2s -> 6460.1s (-11.6%)
dist-x86_64-freebsd: 5051.4s -> 4743.3s (-6.1%)
dist-armv7-linux: 5731.3s -> 5402.1s (-5.7%)
dist-various-2: 3188.1s -> 3368.5s (5.7%)
dist-apple-various: 6561.6s -> 6216.6s (-5.3%)
i686-msvc-1: 9347.3s -> 9801.7s (4.9%)
x86_64-mingw-2: 6835.7s -> 7145.9s (4.5%)

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-05-03T10:44:44Z

📌 Perf builds for each rolled up PR:

PR#	Message	Perf Build Sha
#139343	Change signature of File::try_lock and File::try_lock_shared	`b84c98a5597b6c9d12d18c782dc1a119e3afac8d` (link)
#140505	linker: Quote symbol names in .def files	`46763a6059c70104d0d2b100175fa70942ec265e` (link)
#140534	PassWrapper: adapt for llvm/llvm-project@`f137c3d592e96330e4`…	`05a669b5e90c131883709ea35250a2e84aba912e` (link)
#140546	Remove backtrace dep from anyhow in features status dump to…	`16e9c5c22eebe382fd21a5e3d771cbbc4eb7142e` (link)
#140548	Emit user type annotations for free consts in pattern posit…	`de09c433ce46b4ff2ded2252650c78e8f5398293` (link)
#140564	Use present indicative tense in std::io::pipe() API docs	`da5f58056f657ae89d4ab9bfed947caf8a9a13e8` (link)
#140568	Add regression test for #140545	`5dd04a2b0f59e691aa530a76467914a38d76de50` (link)
#140606	Improve hir pretty printing	`e0a24ad6ddb24860363d30fb36fb5ff00fc711b1` (link)

previous master: 2ad5f8607d

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-05-03T12:19:17Z

Finished benchmarking commit (5fe04cb): comparison URL.

Overall result: ✅ improvements - no action needed

@rustbot label: -perf-regression

Instruction count

This is the most reliable metric that we have; it was used to determine the overall result at the top of this comment. However, even this metric can sometimes exhibit noise.

	mean	range	count
Regressions ❌ (primary)	-	-	0
Regressions ❌ (secondary)	-	-	0
Improvements ✅ (primary)	-	-	0
Improvements ✅ (secondary)	-0.4%	[-0.6%, -0.2%]	3
All ❌✅ (primary)	-	-	0

Max RSS (memory usage)

Results (primary -0.1%, secondary 0.5%)

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.9%	[0.4%, 1.4%]	6
Regressions ❌ (secondary)	2.0%	[2.0%, 2.0%]	2
Improvements ✅ (primary)	-0.9%	[-3.2%, -0.4%]	8
Improvements ✅ (secondary)	-2.5%	[-2.5%, -2.5%]	1
All ❌✅ (primary)	-0.1%	[-3.2%, 1.4%]	14

Cycles

Results (primary -0.6%, secondary -1.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.5%	[0.4%, 0.6%]	3
Regressions ❌ (secondary)	2.7%	[2.7%, 2.7%]	1
Improvements ✅ (primary)	-0.8%	[-1.4%, -0.4%]	29
Improvements ✅ (secondary)	-1.9%	[-2.1%, -1.6%]	4
All ❌✅ (primary)	-0.6%	[-1.4%, 0.6%]	32

Binary size

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

Bootstrap: 769.364s -> 769.318s (-0.01%)
Artifact size: 365.54 MiB -> 365.50 MiB (-0.01%)

LegNeato and others added 23 commits May 1, 2025 07:45

User type annotations for free consts in pattern position

bfe3d54

PassWrapper: adapt for llvm/llvm-project@f137c3d

951412e

In LLVM 21 PR llvm/llvm-project#130940 `TargetRegistry::createTargetMachine` was changed to take a `const Triple&` and has deprecated the old `StringRef` method. @rustbot label llvm-main

Change signature of File::try_lock and File::try_lock_shared

042a556

These methods now return Result<(), TryLockError> instead of Result<bool, Error> to make their use less errorprone

Implement error::Error for TryLockError

1d11ee2

linker: Quote symbol names in .def files

842858f

To support weird symbol names, including dots in particular.

Add a regression test

dcee18b

for rust-lang#140545

Remove fake BoxMarkers.

882c74d

They don't appear to do anything -- no test output is affected -- and no other pretty-printing code looks like this.

Remove opaque type printing.

3896ad0

As far as I can tell, this code is not actually reachable.

Fix hir pretty-printing of global_asm!.

760cf8d

One of the boxes isn't closed, and this causes everything after it to be over-indented.

Enable BoxMarker drop checking.

aa7bb1c

All the box open/close issues have been fixed.

Improve hir pretty-printing of attributes.

e1a177b

Fix some hir pretty-printing over-indenting.

809e5b5

Avoid an indent for labelled loops.

9af0842

Rollup merge of rust-lang#140505 - petrochenkov:expquote, r=bjorn3

ca67f4d

linker: Quote symbol names in .def files To support weird symbol names, including dots in particular. cc [rust-lang#134767](rust-lang#134767 (comment))

Rollup merge of rust-lang#140606 - nnethercote:hir-pp, r=dtolnay

185f9e0

Improve hir pretty printing It's currently pretty bad, so a few small improvements can make a big difference. r? `@dtolnay`

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 3, 2025

bors added the merged-by-bors This PR was explicitly merged by bors. label May 3, 2025

bors merged commit 5fe04cb into rust-lang:master May 3, 2025
7 checks passed

rustbot added this to the 1.88.0 milestone May 3, 2025

This was referenced May 3, 2025

dirfd: preliminary unix and windows implementations #139514

Open

Fix linking statics on Arm64EC #140176

Open

Weekly cargo update #140353

Merged

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Rollup of 8 pull requests #140608

Rollup of 8 pull requests #140608

matthiaskrgr commented May 3, 2025

matthiaskrgr commented May 3, 2025

bors commented May 3, 2025

bors commented May 3, 2025

bors commented May 3, 2025

github-actions bot commented May 3, 2025

Stage 1

Stage 2

rust-timer commented May 3, 2025

rust-timer commented May 3, 2025

Rollup of 8 pull requests #140608

Rollup of 8 pull requests #140608

Conversation

matthiaskrgr commented May 3, 2025

matthiaskrgr commented May 3, 2025

bors commented May 3, 2025

bors commented May 3, 2025

bors commented May 3, 2025

github-actions bot commented May 3, 2025

Test differences

Stage 1

Stage 2

Job duration changes

rust-timer commented May 3, 2025

rust-timer commented May 3, 2025

Overall result: ✅ improvements - no action needed

Instruction count

Max RSS (memory usage)

Cycles

Binary size